Fixes #1 & #3. The bg color wasn't properly being set, causing crashe…

…s and rendering issues.
nemosupremo · Jul 31, 2013 · c58e2ec · c58e2ec
1 parent a8b157b
commit c58e2ec
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 3 deletions.
diff --git a/assets/five.gif b/assets/five.gif
diff --git a/assets/six.gif b/assets/six.gif
diff --git a/jni/libgifdrawable.c b/jni/libgifdrawable.c
@@ -100,7 +100,6 @@ void drawFrame(GifFileType* gif, AndroidBitmapInfo*  info, int* pixels, int fram
 
   width = gif->SWidth;
   height = gif->SHeight;
-  bg = &gif->SColorMap[gif->SBackGroundColor];
 
   frame = &(gif->SavedImages[frame_no]);
   frameInfo = &(frame->ImageDesc);
@@ -110,6 +109,8 @@ void drawFrame(GifFileType* gif, AndroidBitmapInfo*  info, int* pixels, int fram
       colorMap = gif->SColorMap;
   }
 
+  bg = &colorMap->Colors[gif->SBackGroundColor];
+
   for (j=0; j<frame->ExtensionBlockCount; j++) {
     if (frame->ExtensionBlocks[j].Function == GRAPHICS_EXT_FUNC_CODE) {
       ext = &(frame->ExtensionBlocks[j]);
@@ -147,7 +148,7 @@ void drawFrame(GifFileType* gif, AndroidBitmapInfo*  info, int* pixels, int fram
         }
 
         color = (ext && frame->RasterBits[loc] == trans_index(ext)) ? bg : &colorMap->Colors[frame->RasterBits[loc]];
-        if (color && color->Red && color->Green && color->Blue)
+        if (color)
           line[x] = argb(255, color->Red, color->Green, color->Blue);
       }
       px = (char*)px + info->stride*inc;
@@ -183,7 +184,8 @@ void drawFrame(GifFileType* gif, AndroidBitmapInfo*  info, int* pixels, int fram
           continue;
         }
         color = (ext && frame->RasterBits[loc] == trans_index(ext)) ? bg : &colorMap->Colors[frame->RasterBits[loc]];
-        line[x] = argb(255, color->Red, color->Green, color->Blue);
+        if (color)
+        	line[x] = argb(255, color->Red, color->Green, color->Blue);
       }
       px = (char*)px + info->stride;
     }

diff --git a/res/layout/activity_main.xml b/res/layout/activity_main.xml
@@ -48,6 +48,20 @@
             android:layout_height="wrap_content"
             android:tag="four.gif"
             android:text="Four" />
+
+        <Button
+            android:id="@+id/button5"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:tag="five.gif"
+            android:text="Five" />
+
+        <Button
+            android:id="@+id/button6"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:tag="six.gif"
+            android:text="Six" />
 
     </LinearLayout>
 

diff --git a/src/com/droidtools/example/MainActivity.java b/src/com/droidtools/example/MainActivity.java
@@ -56,6 +56,8 @@ public void onCreate(Bundle savedInstanceState) {
         ((Button) findViewById(R.id.button2)).setOnClickListener(this);
         ((Button) findViewById(R.id.button3)).setOnClickListener(this);
         ((Button) findViewById(R.id.button4)).setOnClickListener(this);
+        ((Button) findViewById(R.id.button5)).setOnClickListener(this);
+        ((Button) findViewById(R.id.button6)).setOnClickListener(this);
 
 
         /* You should always load images in the background */