bugfix bmp2splash

sakuramilk · Apr 24, 2012 · 947bcb7 · 947bcb7
1 parent 78cc125
commit 947bcb7
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/_build.sh b/_build.sh
@@ -4,10 +4,6 @@ KERNEL_DIR=$PWD
 INITRAMFS_SRC_DIR=../sc02c_initramfs
 INITRAMFS_TMP_DIR=/tmp/sc02c_initramfs
 
-echo "1=$1"
-echo "2=$2"
-echo "3=$3"
-
 
 cpoy_initramfs()
 {

diff --git a/release-tools/bmp2splash/bmp2splash.cpp b/release-tools/bmp2splash/bmp2splash.cpp
@@ -166,10 +166,12 @@ int main(int argc, char** argv)
         goto exit;
     }
 
+    uint8_t *pLine;
     printf("const unsigned long LOGO_RGB24[] = {\n");
     for (uint32_t h = 0; h < bmpInfoHeader.biHeight; h++) {
+        pLine = pBmpData + (bmpInfoHeader.biHeight - h - 1) * bmpInfoHeader.biWidth * 3;
         for (uint32_t w = 0; w < bmpInfoHeader.biWidth; w++) {
-            uint32_t rgba = read_3byte(pBmpData);
+            uint32_t rgba = read_3byte(pLine);
             printf("0x%08x,", rgba);
             if ((++count % 10) == 0) {
                 printf("\n");