[oe-commits] Jeremy Lainé : psplash: fix 1bpp support

[GIT User account]

Module: openembedded.git
Branch: org.openembedded.dev
Commit: bf0dbdfc144cfecdaa8b3ee23cc837c96155ef95
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=bf0dbdfc144cfecdaa8b3ee23cc837c96155ef95

Author: Jeremy Lainé <jeremy.laine at m4x.org>
Date:   Wed Jan 14 19:29:04 2009 +0100

psplash: fix 1bpp support

---

 packages/psplash/files/psplash_1bpp.patch |    9 +++++----
 packages/psplash/psplash_svn.bb           |    2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/packages/psplash/files/psplash_1bpp.patch b/packages/psplash/files/psplash_1bpp.patch
index e5324f6..3fcc0f7 100644
--- a/packages/psplash/files/psplash_1bpp.patch
+++ b/packages/psplash/files/psplash_1bpp.patch
@@ -1,5 +1,6 @@
---- orig/psplash-fb.c	(revision 249)
-+++ new/psplash-fb.c	(working copy)
+diff -urN psplash.orig/psplash-fb.c psplash/psplash-fb.c
+--- psplash.orig/psplash-fb.c	2007-08-29 20:27:49.000000000 +0200
++++ psplash/psplash-fb.c	2009-01-14 19:14:15.000000000 +0100
 @@ -62,7 +62,7 @@
        goto fail;
      }
@@ -23,10 +24,10 @@
  	= ((red >> 3) << 11) | ((green >> 2) << 5) | (blue >> 3);
        break;
 +    case 1:
-+      if ((red + green + blue) > 384)
++      if (((11*red + 16*green + 5*blue) >> 5) >= 128)
 +        *(fb->data + (off >> 3)) |= (1 << (7 - (off & 0x07)));
 +      else
-+        *(fb->data + (off >> 3)) ^= (1 << (7 - (off & 0x07)));
++        *(fb->data + (off >> 3)) &= ~(1 << (7 - (off & 0x07)));
 +      break;
      default:
        /* depth not supported yet */
diff --git a/packages/psplash/psplash_svn.bb b/packages/psplash/psplash_svn.bb
index 603f1e0..7c4d0a0 100644
--- a/packages/psplash/psplash_svn.bb
+++ b/packages/psplash/psplash_svn.bb
@@ -3,7 +3,7 @@ require psplash-ua.inc
 
 ALTERNATIVE_PRIORITY = "10"
 
-PR = "r14"
+PR = "r15"
 
 SRC_URI = "svn://svn.o-hand.com/repos/misc/trunk;module=psplash;proto=http \
           file://psplash-hand-img.h \