Merged Eric's changes to support ImageIO on iOS

libsdl-org · Mar 28, 2011 · b3ede70 · b3ede70
2 parents 16e8493 + 86efa56
commit b3ede70
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/IMG.c b/IMG.c
@@ -90,7 +90,7 @@ int IMG_Init(int flags)
 	}
 	initialized |= result;
 
-	return (result);
+	return (initialized);
 }
 
 void IMG_Quit()

diff --git a/IMG_png.c b/IMG_png.c
@@ -72,7 +72,7 @@
 #include <png.h>
 
 /* Check for the older version of libpng */
-#if (PNG_LIBPNG_VER_MAJOR == 1) && (PNG_LIBPNG_VER_MINOR)
+#if (PNG_LIBPNG_VER_MAJOR == 1) && (PNG_LIBPNG_VER_MINOR < 4)
 #define LIBPNG_VERSION_12
 #endif
 
@@ -282,6 +282,9 @@ int IMG_InitPNG()
 		lib.png_set_read_fn = png_set_read_fn;
 		lib.png_set_strip_16 = png_set_strip_16;
 		lib.png_sig_cmp = png_sig_cmp;
+#ifndef LIBPNG_VERSION_12
+		lib.png_set_longjmp_fn = png_set_longjmp_fn;
+#endif
 	}
 	++lib.loaded;
 

diff --git a/Makefile.am b/Makefile.am
@@ -26,7 +26,7 @@ EXTRA_DIST =			\
 	Android.mk		\
 	CHANGES			\
 	version.rc		\
-	VisualC.zip		\
+	VisualC			\
 	VisualCE.zip		\
 	Xcode.tar.gz		\
 	Xcode_iPhone.tar.gz	\