[Bf-committers] Windows PNG issues

Kent Mein mein at cs.umn.edu
Fri Apr 8 17:15:24 CEST 2005


Can someone that can compile for windows test out the following diff of:
blender/source/blender/imbuf/intern/readimage.c

and then test it by loading a bunch of random png's?

If you look at the comments in the code I removed it states that
the quicktime png reader does a better job.  Doug Yeater is
having some issues with blender loading certain png's and I've never
had a png I can't load in blender under linux, I also can not reproduce
the problem on linux but can on windows.  If you look at the code now 
if it can't load the png it should fall back to trying
quicktime at the end.  Maybe we need to fix the png loader a bit so it does
some stricter error checking, but I'm thinking that will fix Doug's problem.

Kent



Index: readimage.c
===================================================================
RCS file: /cvsroot/bf-blender/blender/source/blender/imbuf/intern/readimage.c,v
retrieving revision 1.12
diff -p -u -r1.12 readimage.c
--- readimage.c 23 Mar 2005 21:10:02 -0000      1.12
+++ readimage.c 8 Apr 2005 14:59:26 -0000
@@ -119,17 +119,8 @@ ImBuf *IMB_ibImageFromMemory(int *mem, i
                        }
                }
 
-               /* let quicktime handle png's, skips error messages ;)
-                * but only on windows
-                */
-#ifdef _WIN32
-               if(G.have_quicktime == FALSE) {
-#else
-               if(1) {
-#endif
-                       ibuf = imb_loadpng((uchar *)mem, size, flags);
-                       if (ibuf) return(ibuf);
-               }
+               ibuf = imb_loadpng((uchar *)mem, size, flags);
+               if (ibuf) return(ibuf);
 
                ibuf = imb_bmp_decode((uchar *)mem, size, flags);
                if (ibuf) return(ibuf);


More information about the Bf-committers mailing list