#50 fixed

koral-- · Apr 10, 2014 · d13b649 · d13b649
1 parent 3c99f4d
commit d13b649
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 3 deletions.
diff --git a/jni/gif.c b/jni/gif.c
@@ -14,6 +14,9 @@
 //#define  LOG_TAG    "libgif"
 //#define  LOGE(...)  __android_log_print(ANDROID_LOG_ERROR,LOG_TAG,__VA_ARGS__)
 
+/**
+ * Decoding error - no frames
+ */
 #define D_GIF_ERR_NO_FRAMES     	1000
 #define D_GIF_ERR_INVALID_SCR_DIMS 	1001
 #define D_GIF_ERR_INVALID_IMG_DIMS 	1002
@@ -586,16 +589,16 @@ static jint open(GifFileType *GifFileIn, int Error, int startPos,
 		D_GIF_ERR_NOT_ENOUGH_MEM, env, metaData);
 		return (jint) NULL;
 	}
-
-	if (DDGifSlurp(GifFileIn, info, false) == GIF_ERROR)
-		Error = GifFileIn->Error;
 	if (GifFileIn->SColorMap == NULL
 			|| GifFileIn->SColorMap->ColorCount
 					!= (1 << GifFileIn->SColorMap->BitsPerPixel))
 	{
 		GifFreeMapObject(GifFileIn->SColorMap);
 		GifFileIn->SColorMap = defaultCmap;
 	}
+	if (DDGifSlurp(GifFileIn, info, false) == GIF_ERROR)
+		Error = GifFileIn->Error;
+
 	int imgCount = GifFileIn->ImageCount;
 	//TODO add leniency support
 	if (imgCount < 1)

diff --git a/libs/armeabi-v7a/libgif.so b/libs/armeabi-v7a/libgif.so
diff --git a/libs/armeabi/libgif.so b/libs/armeabi/libgif.so
diff --git a/libs/mips/libgif.so b/libs/mips/libgif.so
diff --git a/libs/x86/libgif.so b/libs/x86/libgif.so