Make if block more sensible

dmcdougall · mdboom · commit 01a5b028fba7 · 2012-09-18T08:34:46.000-04:00
diff --git a/src/_macosx.m b/src/_macosx.m
@@ -3559,28 +3559,26 @@ static void _data_provider_release(void* info, const void* data, size_t size)
 
     [rep setSize:newSize];
 
-    if (! [extension isEqualToString: @"tiff"] &&
-        ! [extension isEqualToString: @"tif"])
-    {
-        NSBitmapImageFileType filetype;
-        if ([extension isEqualToString: @"bmp"])
-            filetype = NSBMPFileType;
-        else if ([extension isEqualToString: @"gif"])
-            filetype = NSGIFFileType;
-        else if ([extension isEqualToString: @"jpg"] ||
-                 [extension isEqualToString: @"jpeg"])
-            filetype = NSJPEGFileType;
-        else if ([extension isEqualToString: @"png"])
-            filetype = NSPNGFileType;
-        else
-        {   PyErr_SetString(PyExc_ValueError, "Unknown file type");
-            return NULL;
-        }
-
-        data = [rep representationUsingType:filetype properties:nil];
+    NSBitmapImageFileType filetype;
+    if ([extension isEqualToString: @"bmp"])
+        filetype = NSBMPFileType;
+    else if ([extension isEqualToString: @"gif"])
+        filetype = NSGIFFileType;
+    else if ([extension isEqualToString: @"jpg"] ||
+             [extension isEqualToString: @"jpeg"])
+        filetype = NSJPEGFileType;
+    else if ([extension isEqualToString: @"png"])
+        filetype = NSPNGFileType;
+    else if ([extension isEqualToString: @"tiff"] ||
+             [extension isEqualToString: @"tif"])
+        filetype = NSTIFFFileType;
+    else
+    {   PyErr_SetString(PyExc_ValueError, "Unknown file type");
+        return NULL;
     }
 
-    data = [rep representationUsingType:NSTIFFFileType properties:nil];
+    data = [rep representationUsingType:filetype properties:nil];
+
     [data writeToFile: filename atomically: YES];
     [pool release];
 
