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

diff --git a/base-images/poky-logo.png b/base-images/poky-logo.png
new file mode 100644 (file)
index 0000000..6452078
Binary files /dev/null and b/base-images/poky-logo.png differ

diff --git a/base-images/poky-logo2.png b/base-images/poky-logo2.png
new file mode 100644 (file)
index 0000000..5dfb995
Binary files /dev/null and b/base-images/poky-logo2.png differ

diff --git a/psplash-fb.c b/psplash-fb.c
index 5671676..a28c42e 100644 (file)
--- 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;
            }