Sam Lantinga - Sat Nov 14 11:22:14 PST 2009

* Fixed bug loading multiple images
libsdl-org · Nov 14, 2009 · 05c5480 · 05c5480
1 parent d981898
commit 05c5480
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/CHANGES b/CHANGES
@@ -1,3 +1,7 @@
+1.2.10:
+Sam Lantinga - Sat Nov 14 11:22:14 PST 2009
+ * Fixed bug loading multiple images
+
 1.2.9:
 Sam Lantinga - Tue Nov 10 00:29:20 PST 2009
  * Fixed alpha premultiplication on Mac OS X and iPhone OS

diff --git a/IMG.c b/IMG.c
@@ -73,18 +73,18 @@ int IMG_Init(int flags)
 {
 	int result = 0;
 
-	if ((flags & IMG_INIT_JPG) && !(initialized & IMG_INIT_JPG)) {
-		if (IMG_InitJPG() == 0) {
+	if (flags & IMG_INIT_JPG) {
+		if ((initialized & IMG_INIT_JPG) || IMG_InitJPG() == 0) {
 			result |= IMG_INIT_JPG;
 		}
 	}
-	if ((flags & IMG_INIT_PNG) && !(initialized & IMG_INIT_PNG)) {
-		if (IMG_InitPNG() == 0) {
+	if (flags & IMG_INIT_PNG) {
+		if ((initialized & IMG_INIT_PNG) || IMG_InitPNG() == 0) {
 			result |= IMG_INIT_PNG;
 		}
 	}
-	if ((flags & IMG_INIT_TIF) && !(initialized & IMG_INIT_TIF)) {
-		if (IMG_InitTIF() == 0) {
+	if (flags & IMG_INIT_TIF) {
+		if ((initialized & IMG_INIT_TIF) || IMG_InitTIF() == 0) {
 			result |= IMG_INIT_TIF;
 		}
 	}