* psplash-fb.c:

* psplash-poky-img.h:
* psplash.c
* Makefile.am:
Fix colour read order from RLE images (R & B swapped)
Add handling for alpha channel in images
Update the Poky RLE image
Change the OpenedHand logo for the Poky one



git-svn-id: http://svn.o-hand.com/repos/misc/trunk/psplash@419 f5eea0f0-44ea-0310-b729-df5b855dafe5

ChangeLog

@@ -1,3 +1,14 @@
+2009-05-19  Richard Purdie <[email protected]>
+
+	* psplash-fb.c:
+	* psplash-poky-img.h:
+	* psplash.c
+	* Makefile.am:
+	Fix colour read order from RLE images (R & B swapped)
+	Add handling for alpha channel in images
+	Update the Poky RLE image
+	Change the OpenedHand logo for the Poky one
+
 2008-11-10  Samuel Ortiz  <[email protected]>
 
 	* psplash.c:

Makefile.am

@@ -4,7 +4,7 @@ AM_CFLAGS = $(GCC_FLAGS) -D_GNU_SOURCE
 
 psplash_SOURCES = psplash.c psplash.h psplash-fb.c psplash-fb.h \
                   psplash-console.c psplash-console.h           \
-		  psplash-hand-img.h psplash-bar-img.h radeon-font.h
+		  psplash-poky-img.h psplash-bar-img.h radeon-font.h
 
 psplash_write_SOURCES = psplash-write.c psplash.h
 

psplash-fb.c

@@ -322,7 +322,8 @@ psplash_fb_draw_image (PSplashFB    *fb,
 
 	  do
 	    {
-	      psplash_fb_plot_pixel (fb, x+dx, y+dy, *p, *(p+1), *(p+2));
+              if (*(p+3))
+	      psplash_fb_plot_pixel (fb, x+dx, y+dy, *(p+2), *(p+1), *(p));
 	      if (++dx >= img_width) { dx=0; dy++; }
 	    }
 	  while (--len && (p - rle_data) < total_len);
@@ -335,7 +336,8 @@ psplash_fb_draw_image (PSplashFB    *fb,
 
 	  do
 	    {
-	      psplash_fb_plot_pixel (fb, x+dx, y+dy, *p, *(p+1), *(p+2));
+              if (*(p+3))
+	      psplash_fb_plot_pixel (fb, x+dx, y+dy, *(p+2), *(p+1), *(p));
 	      if (++dx >= img_width) { dx=0; dy++; }
 	      p += img_bytes_per_pixel;
 	    }