psplash: Fix image byte order, add master copy of underlying logo image

git-svn-id: http://svn.o-hand.com/repos/misc/trunk/psplash@420 f5eea0f0-44ea-0310-b729-df5b855dafe5
srobo-legacy · May 19, 2009 · d4c9812 · d4c9812
1 parent 82c22be
commit d4c9812
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/base-images/poky-logo.png b/base-images/poky-logo.png
diff --git a/base-images/poky-logo2.png b/base-images/poky-logo2.png
diff --git a/psplash-fb.c b/psplash-fb.c
@@ -322,8 +322,8 @@ psplash_fb_draw_image (PSplashFB    *fb,
 
 	  do
 	    {
-              if (*(p+3))
-	      psplash_fb_plot_pixel (fb, x+dx, y+dy, *(p+2), *(p+1), *(p));
+	      if (img_bytes_per_pixel < 4 || *(p+3))
+	        psplash_fb_plot_pixel (fb, x+dx, y+dy, *(p), *(p+1), *(p+2));
 	      if (++dx >= img_width) { dx=0; dy++; }
 	    }
 	  while (--len && (p - rle_data) < total_len);
@@ -336,8 +336,8 @@ psplash_fb_draw_image (PSplashFB    *fb,
 
 	  do
 	    {
-              if (*(p+3))
-	      psplash_fb_plot_pixel (fb, x+dx, y+dy, *(p+2), *(p+1), *(p));
+	      if (img_bytes_per_pixel < 4 || *(p+3))
+	        psplash_fb_plot_pixel (fb, x+dx, y+dy, *(p), *(p+1), *(p+2));
 	      if (++dx >= img_width) { dx=0; dy++; }
 	      p += img_bytes_per_pixel;
 	    }