Breakup jpeg_decode into parsing and displaying phases.

Split the screen display code out of the jpeg parsing code.

Allow ability for caller to obtain jpeg dimensions.

1 files changed, 7 insertions, 2 deletions

diff --git a/src/bootsplash.c b/src/bootsplash.c
index 2c45406..b381935 100644
--- a/src/bootsplash.c
+++ b/src/bootsplash.c
@@ -187,12 +187,17 @@ void enable_vga_console(void)
     dprintf(8, "Copying boot splash screen...\n");
     cbfs_copyfile(file, jpeg, filesize);
     dprintf(8, "Decompressing boot splash screen...\n");
-    int ret = jpeg_decode(jpeg, picture, CONFIG_BOOTSPLASH_X,
-                          CONFIG_BOOTSPLASH_Y, CONFIG_BOOTSPLASH_DEPTH, decdata);
+    int ret = jpeg_decode(decdata, jpeg);
     if (ret) {
         dprintf(1, "jpeg_decode failed with return code %d...\n", ret);
         goto gotext;
     }
+    ret = jpeg_show(decdata, picture, CONFIG_BOOTSPLASH_X, CONFIG_BOOTSPLASH_Y
+                    , CONFIG_BOOTSPLASH_DEPTH);
+    if (ret) {
+        dprintf(1, "jpeg_show failed with return code %d...\n", ret);
+        goto gotext;
+    }
 
     /* Show the picture */
     iomemcpy(framebuffer, picture, imagesize);