Minor fixes to IconFamily library

third_party/icon_family/IconFamily.m

 // IconFamily.m
 // IconFamily class implementation
 // by Troy Stephens, Thomas Schnitzer, David Remahl, Nathan Day, Ben Haller, Sven Janssen, Peter Hosey, Conor Dearden, Elliot Glaysher, and Dave MacLachlan
 // version 0.9.4
 //
 // Project Home Page:
 //   http://iconfamily.sourceforge.net/
 //
 // Problems, shortcomings, and uncertainties that I'm aware of are flagged with "NOTE:".  Please address bug reports, bug fixes, suggestions, etc. to the project Forums and bug tracker at https://sourceforge.net/projects/iconfamily/
 
@@ skipping 73 matching lines @@
 + (NSImage*) resampleImage:(NSImage*)image toIconWidth:(int)width usingImageInterpolation:(NSImageInterpolation)imageInterpolation;
 
 + (Handle) get32BitDataFromBitmapImageRep:(NSBitmapImageRep*)bitmapImageRep requiredPixelSize:(int)requiredPixelSize;
 
 + (Handle) get8BitDataFromBitmapImageRep:(NSBitmapImageRep*)bitmapImageRep requiredPixelSize:(int)requiredPixelSize;
 
 + (Handle) get8BitMaskFromBitmapImageRep:(NSBitmapImageRep*)bitmapImageRep requiredPixelSize:(int)requiredPixelSize;
 
 + (Handle) get1BitMaskFromBitmapImageRep:(NSBitmapImageRep*)bitmapImageRep requiredPixelSize:(int)requiredPixelSize;
 
+#if !defined(DISABLE_CUSTOM_ICON)
 - (BOOL) addResourceType:(OSType)type asResID:(int)resID;
+#endif
 
 @end
 
 @implementation IconFamily
 
 + (IconFamily*) iconFamily
 {
     return [[[IconFamily alloc] init] autorelease];
 }
 
@@ skipping 23 matching lines @@
 }
 
 + (IconFamily*) iconFamilyWithThumbnailsOfImage:(NSImage*)image usingImageInterpolation:(NSImageInterpolation)imageInterpolation
 {
     return [[[IconFamily alloc] initWithThumbnailsOfImage:image usingImageInterpolation:imageInterpolation] autorelease];
 }
 
 // This is IconFamily's designated initializer.  It creates a new IconFamily that initially has no elements.
 //
 // The proper way to do this is to simply allocate a zero-sized handle (not to be confused with an empty handle) and assign it to hIconFamily.  This technique works on Mac OS X 10.2 as well as on 10.0.x and 10.1.x.  Our previous technique of allocating an IconFamily struct with a resourceSize of 0 no longer works as of Mac OS X 10.2.
-- init
+- (id) init
 {
     self = [super init];
     if (self) {
         hIconFamily = (IconFamilyHandle) NewHandle( 0 );
         if (hIconFamily == NULL) {
             [self autorelease];
             return nil;
         }
     }
     return self;
 }
 
-- initWithData:(NSData *)data
+- (id) initWithData:(NSData *)data
 {
     self = [self init];
     if (self) {
         Handle storageMem = NULL;
 
         OSStatus err = PtrToHand([data bytes], &storageMem, (long)[data length]);
         if( err != noErr )
         {
             [self release];
             return nil;
         }
 
         hIconFamily = (IconFamilyHandle)storageMem;
     }
     return self;
 }
 
-- initWithContentsOfFile:(NSString*)path
+- (id) initWithContentsOfFile:(NSString*)path
 {
     FSRef ref;
     OSStatus result;
     
     self = [self init];
     if (self) {
         if (hIconFamily) {
             DisposeHandle( (Handle)hIconFamily );
             hIconFamily = NULL;
         }
                 if (![path getFSRef:&ref createFileIfNecessary:NO]) {
                         [self autorelease];
                         return nil;
                 }
                 result = ReadIconFromFSRef( &ref, &hIconFamily );
                 if (result != noErr) {
                         [self autorelease];
                         return nil;
                 }
     }
     return self;
 }
 
-- initWithIconFamilyHandle:(IconFamilyHandle)hNewIconFamily
+- (id) initWithIconFamilyHandle:(IconFamilyHandle)hNewIconFamily
 {
     self = [self init];
     if (self) {
         if (hIconFamily) {
             DisposeHandle( (Handle)hIconFamily );
             hIconFamily = NULL;
         }
         hIconFamily = hNewIconFamily;
     }
     return self;
 }
 
-- initWithIconOfFile:(NSString*)path
+- (id) initWithIconOfFile:(NSString*)path
 {
     IconRef     iconRef;
     OSStatus    result;
     SInt16      label;
     FSRef       ref;
 
     self = [self init];
     if (self)
     {
         if (hIconFamily)
@@ skipping 33 matching lines @@
 
         if (result != noErr || !hIconFamily)
         {
             [self autorelease];
             return nil;
         }
     }
     return self;
 }
 
-- initWithSystemIcon:(int)fourByteCode
+- (id) initWithSystemIcon:(int)fourByteCode
 {
     IconRef     iconRef;
     OSErr       result;
 
     self = [self init];
     if (self)
     {
         if (hIconFamily)
         {
             DisposeHandle( (Handle)hIconFamily );
@@ skipping 17 matching lines @@
         {
             [self autorelease];
             return nil;
         }
 
         ReleaseIconRef( iconRef );
     }
     return self;
 }
 
-- initWithThumbnailsOfImage:(NSImage*)image
+- (id) initWithThumbnailsOfImage:(NSImage*)image
 {
     // The default is to use a high degree of antialiasing, producing a smooth image.
     return [self initWithThumbnailsOfImage:image usingImageInterpolation:NSImageInterpolationHigh];
 }
 
-- initWithThumbnailsOfImage:(NSImage*)image usingImageInterpolation:(NSImageInterpolation)imageInterpolation
+- (id) initWithThumbnailsOfImage:(NSImage*)image usingImageInterpolation:(NSImageInterpolation)imageInterpolation
 {
     NSImage* iconImage512x512;
     NSImage* iconImage256x256;
     NSImage* iconImage128x128;
     NSImage* iconImage32x32;
     NSImage* iconImage16x16;
     NSImage* bitmappedIconImage512x512;
     NSBitmapImageRep* iconBitmap512x512;
     NSBitmapImageRep* iconBitmap256x256;
     NSBitmapImageRep* iconBitmap128x128;
@@ skipping 402 matching lines @@
         
     if (result != noErr)
         {
                 NSLog(@"SetIconFamilyData() returned error %d", result);
                 return NO;
         }
         
     return YES;
 }
 
+#if !defined(DISABLE_CUSTOM_ICON)
+
 - (BOOL) setAsCustomIconForFile:(NSString*)path
 {
     return( [self setAsCustomIconForFile:path withCompatibility:NO] );
 }
 
 - (BOOL) setAsCustomIconForFile:(NSString*)path withCompatibility:(BOOL)compat
 {
     FSRef targetFileFSRef;
     FSRef parentDirectoryFSRef;
     SInt16 file;
@@ skipping 395 matching lines @@
         if (result != noErr)
             return NO;
     }
 
     if( ! [[NSFileManager defaultManager] iconfamily_removeItemAtPath:[path stringByAppendingPathComponent:@"Icon\r"]] )
         return NO;
         
     return YES;
 }
 
+#endif  // !defined(DISABLE_CUSTOM_ICON)
+
 - (NSData *) data
 {
     return [NSData dataWithBytes:*hIconFamily length:GetHandleSize((Handle)hIconFamily)];
 }
 
 - (BOOL) writeToFile:(NSString*)path
 {
     return [[self data] writeToFile:path atomically:NO];
 }
 
@@ skipping 430 matching lines @@
         }
         else
         {
                 NSLog(@"get1BitMaskFromBitmapImageRep:requiredPixelSize: returning NULL due to bitsPerPixel == %ld, samplesPerPixel== %ld, bitsPerSample == %ld", bitsPerPixel, samplesPerPixel, bitsPerSample);
                 return NULL;
         }
         
     return hRawData;
 }
 
+#if !defined(DISABLE_CUSTOM_ICON)
+
 - (BOOL) addResourceType:(OSType)type asResID:(int)resID 
 {
     Handle hIconRes = NewHandle(0);
     OSErr err;
 
     err = GetIconFamilyData( hIconFamily, type, hIconRes );
 
     if( !GetHandleSize(hIconRes) || err != noErr )
         return NO;
 
     AddResource( hIconRes, type, resID, "\p" );
 
     return YES;
 }
 
+#endif  // !defined(DISABLE_CUSTOM_ICON)
+
 @end
 
 // Methods for interfacing with the Cocoa Pasteboard.
 
 @implementation IconFamily (ScrapAdditions)
 
 + (BOOL) canInitWithScrap
 {
     NSArray *types = [[NSPasteboard generalPasteboard] types];
     return [types containsObject:ICONFAMILY_UTI] || [types containsObject:ICONFAMILY_PBOARD_TYPE];
 }
 
 + (IconFamily*) iconFamilyWithScrap
 {
     return [[[IconFamily alloc] initWithScrap] autorelease];
 }
 
-- initWithScrap
+- (id) initWithScrap
 {
     NSPasteboard *pboard = [NSPasteboard generalPasteboard];
 
     NSData *data = [pboard dataForType:ICONFAMILY_UTI];
     if( !data )
         data = [pboard dataForType:ICONFAMILY_PBOARD_TYPE];
     if( !data )
     {
         [self release];
         return nil;
@@ skipping 60 matching lines @@
 }
 
 @end
 
 
 @implementation NSImage (IconFamilyCompatibility)
 
 - (NSImageRep *) iconfamily_bestRepresentation
 {
 #if MAC_OS_X_VERSION_MIN_REQUIRED < 1060
-        if ([!self respondsToSelector:@selector(bestRepresentationForRect:context:hints:)])
+        if (![self respondsToSelector:@selector(bestRepresentationForRect:context:hints:)])
         {
                 return [self bestRepresentationForDevice:nil];
         }
 #endif
         
         return [self bestRepresentationForRect:(NSRect){NSZeroPoint, [self size]} context:nil hints:nil];
 }
 
 @end