From d13b649d3aed438ef9acde3b770b68f52ced494e Mon Sep 17 00:00:00 2001 From: koral-- <koral--@users.noreply.github.com> Date: Fri, 11 Apr 2014 01:20:14 +0200 Subject: [PATCH] #50 fixed --- jni/gif.c | 9 ++++++--- libs/armeabi-v7a/libgif.so | Bin 25724 -> 25724 bytes libs/armeabi/libgif.so | Bin 29816 -> 29816 bytes libs/mips/libgif.so | Bin 72864 -> 72864 bytes libs/x86/libgif.so | Bin 29848 -> 29848 bytes 5 files changed, 6 insertions(+), 3 deletions(-) diff --git a/jni/gif.c b/jni/gif.c index 89f28bbd..9fa7f552 100644 --- 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,9 +589,6 @@ 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)) @@ -596,6 +596,9 @@ static jint open(GifFileType *GifFileIn, int Error, int startPos, 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 index 6ff68e7c46f9a8d14180a4a806117af68a7d4a62..5cadb60fb5e36005b86c95c24fdec779dd5e190b 100755 GIT binary patch delta 160 zcmV;R0AK(7$N~Jw0kF6q0h5!tA1eWUljR>L0cn#BAZvd!;Am+uu>m4OXcGDZ^8#p^ zLIuzP@GATjOM65cXlr38Mj=K3A^;};_d5Onxh`z2X&^=;YXB|Szfbgfc9=&9xhAmy z;ASQuM*sIE{STW!MoC60M$PyDpaGLJM*sH%{{SuwzaT~cAO*0!=<ttjPXGWd>F`eh OA`EB+Mv1fcAcaE^V?V(F delta 123 zcmV->0EGYi$N~Jw0kF6q0g{usA1eWTljR>L0cevAAZso%;3!5RMlweK_e%Z%xh`yI zX)v(?B132r`UCR<XqrL=&;jrx{1QuhL>p*pVUwsJ9499I51T+nNk%G0&G-PI0h2RE d|Mvv{04@x_AVvTn1+cy7@Q(n$V6*8UlSAx#F{A(h diff --git a/libs/armeabi/libgif.so b/libs/armeabi/libgif.so index 80dce300e0df630cfb3cf9b3e3e05f5593acb4aa..a3c004a5ce813220c5a07248dd9a69f9d4dc55c3 100755 GIT binary patch delta 133 zcmV;00DAxU=mGfX0k8-q0hW^qB`*PflQ|_N0cw+9C1*G{;BaXGC<f3&XaORcKocAS zXqrL=&;jr}{1;1mL>p*xVK5vi8~`H!_bL7WC%8fY(Kl?gX#gyf{3RSG4E+q64Vwa( n0FnWd1DPTmI~@P_3jY8ghe80+C>#f{@V)5+0017dK_)j&Et4)( delta 133 zcmV;00DAxU=mGfX0k8-q0hN;pB`*PelQ|_N0cn$8C1*A^;4mC196B8T_c{ImC;-tn zY;b7+C<f3&XaORcKocASXqrL=&;jr>{1Z!iL>p*xVYX=iE|dNx94QU`44Ms_0+;}j n0h0rnG8{V`|Mv_303e4#0MRHM2e9zHz((l<000iNK_)j&LJ=;V diff --git a/libs/mips/libgif.so b/libs/mips/libgif.so index f176c391ce9b2e83193f7def0d1e496b674312a8..35d55da6ec75ffe0275f4c8082504bf40a51201b 100755 GIT binary patch delta 1407 zcmY*ZZERCz6h7znc5G0v+d3$$v-fT-ZP&qSCZtGV-CDjJGO}sZWYHP70EsBdK2WD? zaLM@5bu0(G;lnr$DnuFR#lXzeP6&!_S`w!4gJdK%Y9vBpO-jOiJ$KX}yve;!&U2pk zeB689cX(7D9+gkqWz5oIxmI;V08Rry5#+%Y8Ne0=NayUY5I~_<WoKba9e|xJLp5#! zu+j;+7O&DDa%0ivl>oP;d%i~2-1X6;<_9rDJIqdXg2Qjjg==O}kj1u~{Vm%eI$^Fx z3tcleVw!w;&(>wR07p*Y=Tw%p028_JcNjCPxs;rJi_`Vh0JP@pDsG@dzmzv`iTfK! z$}Mna@H`9~`CtTNR@ED0;oET;4#p+#)GM8IN2$Qis7&qey$s3X04x}>K{SyEF)Koz zONPC1fVbjuc0Ck8uhkLTHyDl`8muoY<V5@xU~DiH>mN*6({bK6V)#`hEU8|Q9QMWT zeKUo!8UT<WJX=E;niF<tN(5kWqH=2y{BA06sR~F1S%sYC=D7;%jF?WKrlrdr7Fh4H zn4V6kiozjdhRmb}0aPnUq$~|kRe2jeLPO;d>4uelF88>C$HA}sCfyP-+a9iSc7rlJ zTj#@&JQZbbfYgcz_UP>u&B(2fx+3@_&A1xSq;GQ1L9?Mr(zT^8;S_E1`0;z{^f(Km z;$8>i^p0o4Lm&PNRxSbz?Q8S7NACG`!D+yqxX3;m=i0)y4O&MK9H9)Ac#mK&ed^tS zzv_3q^AKe+R~|tVy;teSUHW8YHS!S5_;o{7<;R=)^{NI5r*&WTHpG4!3N+%M`i;QH z5|=(u^9y1VwXdkfFX)36r|^va#L8_F-li{u{dj@atvZG8>;J5pBcVl~Sv`n2Mgwd5 zF{78PeE{(<a@RKCVg2RWzY&k=?RAR~<Mc-TM^bt-y;;AILXl~_NoCOne1>*JHAjBK zQI9%($P|k0o&Ej0^TC?3MtL*<bo;vWvfiH0g=phhec`MSeT;3RLL6h<KPJR?jG3em z8OF!Y3t{8YInHRz>KJ2~@so=}Y-en{Bm_?<^!y;iX~vB|3Xx*m&X{J5F=iPj7%gT# zs6PqeHNz5!r-X<y5xOiyD`OvH2jh1A;O<%pV>H$2K`YI4I&qrHx}129)^t^1lAi1G z^F=VgOps1?Eh_2wnkzIK<K^O~l@Ck@UF-5-h_Jf?Q{?9N1=`f@^zGtm6+_62|2@du zVGncmS>_&RXD&uV-Nj|+3=f}I*t#J2)PB>D^e%#-+{lVEG~Qi`VY=R3T5^SZH*O4L z8U6$8&!_o&N-?GT_B?+WE!sd4I;FclEm4Gg&uEi|sZ?uQ*p&KewB?0Nr?q9pOb1s| zAucQ^<3LV+HfuYX#gH~&Kt?-hfJK`$q*ud+bngGs?ER*-?!G`R+G94}+M(@akQ@>1 ZMH?rdh}<W#X_JOG8#UOoatR)t^B<g^m2Ch3 delta 1384 zcmY*Ze@t6d6h7zi__e`&g(BSm+efJ_lnoR|z%eMcb5nG%keF#S7R3yc;dE|L{!kkw zgC#(>oXr;;X5dVeIDVKnGl@i4G;TzvT>?>(E#VJLP-DQTSxMNg=d$_-H+k>N`ObI0 zd+vSb-N6ZUa6%ooskla4)f(O52N(x{3`l}m6~Gn%Sd7PCBR~OlsCG-RmNOhl)s+MQ zD-EkPc$0op>oXe40alcIxq8+>5j~ms0LJLmM7thk`+ae{Miy1E*cy+oa_pnw#1hnK zKCvE`s4(fp+BGg9H?HvVQd%{@4{`fd#@H?{B_1#Ha@}PB!FXKE8wi;*Nt?I1K7wiW zdAJn00E2Qp7{jopd%`Syzek0$J&I@UXdA6MoM=*>-qrj$OlOwDmeJhs`H1fDDY^%g zT-&PKxMNZEQh-|YX&OvMtPto+g0O~=T%f{<9)S0HRP8FHz)PB3#~1F8JZiCUAzV7^ ztHRxpsHXPvyirQa&rR7BH=>LA&G-UYoPGr@^o-M8;P@206^qKUSg?lJB{k+q&>e&8 zE|0+USb(_^8glw^!2H$Oh<Jl4U4Cq*w_J7TG-q7NsNB9w59jZ2=njXHmhfz!+;AE^ zUa)Re0T6(xh^~P`;r!zCsk@;0ps`Q-PSM<hNAMEuaeHx?-f-Jfox-<%ZiCeC-uqCW z0F5Vt)OMuviSP+M#~gsGuY}PG!O;usXXQE(a;sLz;yH(J(}-s;E}H*(HX{OI(K%G; z!y+#pF=vWO5L0N?Yf4qI7ymHli|Z7;X}U@dA)cV#(t7;eyjA*{f+6!{+0TdvsA*>n zPSDWKF&sA!lpj)XnI<Z_aGGi>$8gB}t1?-^6mxY~1o106xw{KjOiT5Bh<}n^Q-}R# zYt7$?gJx50Hexq*JoX7LknX?Djkh&W$KT?WfMHYX2Hg5We?nFG-H7~_M^iwHYJncp zwr6qsJK-;cXy>{jw09j4cyFe9U-eQiyAev1uXxVLbSa5LWJii;S`<rx|^W<KGF< z!q_q+1h*lCzZYVh@u?q$h%z2#Tx9HIj4?(T(-HxeeiFiy2;1OPREPi*z8gXW8M_&e zF&;M0zFDJSC(Rvqqm}L)x8ow^wb^l!cDFh4TWV_a@*m&JOcjl^WoLz^xI)>aJPP;; z@}Ci+`8GHD2-}@FOD=w2qbJ(!g~zyBhZORVO|J3|!_3*%nR}d#xlTIWo|!i(Gx8p2 z*iv!uRKjWHJc3m2W5t(rr9B4&bgMll>lfa;yc*<?`7@kPqx4V?&YFdxmp?$w=*>X8 z0!2n&2J(esT$f=%iLswUrMt}7VPSg7*q+IBRXJJk{?t4+vh&kmv@(l6qgO)A7?B#S z+Ss2hSt;H0zjSS5Xsz8~6f~Z;@|2L#%Ah#>#%oqyJnG*dvKiN9b}b;;%W4)5B>xA) C(U0x` diff --git a/libs/x86/libgif.so b/libs/x86/libgif.so index 11eae263a1e96cfb551443e4e9bed602203958b5..7c6ae3f9fef9cfc8bc28909e3852c659649d8db9 100755 GIT binary patch delta 294 zcmbR7l5xgM#toLTg0mSJ7+Np!w=MwD2l!iNO!ktMmR}C!b%v;j9A{CnU|?W)!T#z0 z|JDPY$GU-H{4F0Rx5(Bpc`;6wlaqF=HDF-qZcYKJ>U0<B{M7jas0YYlFns&s&`*%A zQs(Y_hwgfb9WR)HR{ZZYQQ`M{@juJ}DC5%lw$ycUqMQm##ozz`Cohy1=bErL4P?}Z z7cP@G$|(yP0L2Xtyx!JZqQ=n4qVnRy<fn2P0^k3DL|<0@|Np<!M&-qh$+Gg=B6}c$ z_CUc2VC5fP%$yt}uOSei$-waXYVQ^`kh6OCsBi9(zhfy^#02EI@Hu$2GI_K!H?u~z Wu`nkxa`CYoJ$~%4)8@8FA!z`;b9wRr delta 327 zcmbR7l5xgM#toLTf{Pg$7+Np!x2^!u2l!hSO!ktMmR}F#b%v;j9A{CnU|?W)!T#z0 z|JDPY$GU-H{4GBxx5(DT2Z7Xl>ihvz160Cb`1Zw%pCDEIEe$|!x4TH|ffBxM50+g( zbqtpuSqhX0cCx6vNHzdUHm3l^I^9LO>m_!)U<TU!ztcp8-|xl$FoV_urQWS?OMNCM z$f>ZD|NZ}e@<M5Gk?wqlmlgm2|KFPi()i(p%~zmAf}Dh8XO0R>r;W-B4WLTH1FzTj zmZ&j+ta&l{uAGLz`#&Jjm&HJxAVnJ{i^^+@Y=H<`00k$2m4A3KadL>f28V|x1H<d9 vz1ueT$ltM)t6~CL<-+IS(aPk}&fLrz*~Y@0#K^_Ra`gDI!;YKVB88*@2p5UQ