Changeset 838

Timestamp:

05/06/2009 09:15:50 PM (3 years ago)

Author:

gbooker

Message:

Leak fixes

Location:

branches/CoreData/SapphireFrappliance

Files:

• Browser/SapphireMarkMenu.m (modified) (1 diff)
• Extension/NSImage-Extensions.h (modified) (1 diff)
• Extension/NSImage-Extensions.m (modified) (1 diff)
• FRAppliance/SapphireApplianceController.m (modified) (1 diff)
• MetaDataImporting/SapphirePosterChooser.m (modified) (2 diffs)
• Players/SapphireMedia.m (modified) (1 diff)

branches/CoreData/SapphireFrappliance/Browser/SapphireMarkMenu.m

@@ -42 +42 @@
                 return NO;
         
-        const NSSet * const disallowedFormats = [[NSSet alloc] initWithObjects:@"mkv", @"flv", nil];
+        static NSSet *disallowedFormats = nil;
+        if(disallowedFormats == nil)
+        {
+                disallowedFormats = [[NSSet alloc] initWithObjects:@"mkv", @"flv", nil];
+        }
         
         return ![disallowedFormats containsObject:[path pathExtension]];

branches/CoreData/SapphireFrappliance/Extension/NSImage-Extensions.h

@@ -56 +56 @@
  * @brief Convert NSImage data to CGImageRef
  */
-- (CGImageRef) asImageRef;
+- (CGImageRef) newImageRef;
 
 /*!

branches/CoreData/SapphireFrappliance/Extension/NSImage-Extensions.m

@@ -86 +86 @@
 }
 
-- (CGImageRef) asImageRef
+- (CGImageRef) newImageRef
 {
         NSApplicationLoad(); // TIFFRepresentation won't work without this

branches/CoreData/SapphireFrappliance/FRAppliance/SapphireApplianceController.m

@@ -549 +549 @@
         NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
         if(![[NSFileManager defaultManager] isDirectory:dirPath])
+        {
+                [pool release];
                 return;
+        }
         
         if(![dirPath isAbsolutePath])
+        {
+                [pool release];
                 return;
+        }
         
         dirPath = [dirPath stringByResolvingSymlinksInPath];

branches/CoreData/SapphireFrappliance/MetaDataImporting/SapphirePosterChooser.m

@@ -176 +176 @@
                                                                                                                                                  title: BRLocalizedString(@"Getting artwork selection", @"Getting artwork selection")
                                                                                                                                         invokation: invoke];
-                [[self stack] swapController:wait];
+                [[self stack] swapController:[wait autorelease]];
         }
         else
@@ -505 +505 @@
         else if ( row == [posters count] )
         {
-                NSMutableDictionary *refreshMeta = [[NSMutableDictionary alloc] init];
+                NSMutableDictionary *refreshMeta = [NSMutableDictionary dictionary];
                 [refreshMeta setObject: BRLocalizedString( @"Refresh the artwork selection", @"Refresh the artwork selection" ) forKey: META_TITLE_KEY];
                 [preview setUtilityData: refreshMeta];

branches/CoreData/SapphireFrappliance/Players/SapphireMedia.m

@@ -91 +91 @@
         
         if (coverart)
-                return [SapphireFrontRowCompat coverartAsImage:[coverart asImageRef]];
+        {
+                CGImageRef imageRef = [coverart newImageRef];
+                id ret = [SapphireFrontRowCompat coverartAsImage:imageRef];
+                CFRelease(imageRef);
+                return ret;
+        }
 
         return nil;