dwindows: mac/dw.m comparison

comparison mac/dw.m @ 1557:030e9bddc1c9

Fixed some potential Objective-C memory leaks on Mac reported by XCode 4.2.1. Trying to track down an autorelease crash on Lion using dw_main_quit().

author	bsmith@81767d24-ef19-dc11-ae90-00e081727c95
date	Mon, 16 Jan 2012 21:24:11 +0000
parents	4a9c574d5c17
children	9c5d3ac5bec5

comparison

equal deleted inserted replaced

-:4a9c574d5c17
+:030e9bddc1c9
 if([bltdest isMemberOfClass:[NSBitmapImageRep class]])
 {
 [NSGraphicsContext saveGraphicsState];
 [NSGraphicsContext setCurrentContext:[NSGraphicsContext
 graphicsContextWithGraphicsPort:[[NSGraphicsContext graphicsContextWithBitmapImageRep:bltdest] graphicsPort] flipped:YES]];
-[[NSDictionary alloc] initWithObjectsAndKeys:bltdest, NSGraphicsContextDestinationAttributeName, nil];
+[[[NSDictionary alloc] initWithObjectsAndKeys:bltdest, NSGraphicsContextDestinationAttributeName, nil] autorelease];
 }
 else
 {
 if([bltdest lockFocusIfCanDraw] == NO)
 {
 {
 self = [super init];
 if(self)
 {
-textfield = [[NSTextField alloc] init];
+textfield = [[[NSTextField alloc] init] autorelease];
 [self addSubview:textfield];
-stepper = [[DWStepper alloc] init];
+stepper = [[[DWStepper alloc] init] autorelease];
 [self addSubview:stepper];
 [stepper setParent:self];
 [stepper setTextfield:textfield];
 [textfield takeIntValueFrom:stepper];
 [textfield setDelegate:self];
 }
 /* Handle file types */
 if(ext)
 {
-NSArray* fileTypes = [[NSArray alloc] initWithObjects:[NSString stringWithUTF8String:ext], nil];
+NSArray* fileTypes = [[[NSArray alloc] initWithObjects:[NSString stringWithUTF8String:ext], nil] autorelease];
 [openDlg setAllowedFileTypes:fileTypes];
 }
 /* Disable multiple selection */
 [openDlg setAllowsMultipleSelection:NO];
 [saveDlg setCanCreateDirectories:YES];
 /* Handle file types */
 if(ext)
 {
-NSArray* fileTypes = [[NSArray alloc] initWithObjects:[NSString stringWithUTF8String:ext], nil];
+NSArray* fileTypes = [[[NSArray alloc] initWithObjects:[NSString stringWithUTF8String:ext], nil] autorelease];
 [saveDlg setAllowedFileTypes:fileTypes];
 }
 /* Display the dialog.  If the OK button was pressed,
 * process the files.
 *          limit: Number of characters the entryfield will take.
 */
 void API dw_entryfield_set_limit(HWND handle, ULONG limit)
 {
 DWEntryField *entry = handle;
-DWEntryFieldFormatter *formatter = [[DWEntryFieldFormatter alloc] init];
+DWEntryFieldFormatter *formatter = [[[DWEntryFieldFormatter alloc] init] autorelease];
 [formatter setMaximumLength:(int)limit];
 [[entry cell] setFormatter:formatter];
 }
 [stepper setTag:cid];
 [stepper setMinValue:-65536];
 [stepper setMaxValue:65536];
 [stepper setIntValue:atoi(text)];
 [textfield takeIntValueFrom:stepper];
-[stepper autorelease];
-[textfield autorelease];
 return spinbutton;
 }
 /*
 * Sets the spinbutton value.
 DW_MUTEX_LOCK;
 DWContainer *cont = _cont_new(cid, multi);
 [cont setHeaderView:nil];
 int type = DW_CFA_STRING;
 [cont setup];
-NSTableColumn *column = [[NSTableColumn alloc] init];
+NSTableColumn *column = [[[NSTableColumn alloc] init] autorelease];
 [column setEditable:NO];
 [cont addTableColumn:column];
 [cont addColumn:column andType:type];
 DW_MUTEX_UNLOCK;
 return cont;
 color = (NSColor *)dw_dialog_wait(dialog);
 /* Figure out the value of what they returned */
 CGFloat red, green, blue;
 [color getRed:&red green:&green blue:&blue alpha:NULL];
+[color release];
 value = DW_RGB((int)(red * 255), (int)(green *255), (int)(blue *255));
 return value;
 }
 /* Draw a point on a window (preferably a render window).
 int _locked_by_me = FALSE;
 DW_MUTEX_LOCK;
 DWContainer *cont = _cont_new(cid, multi);
 NSScrollView *scrollview = [cont scrollview];
 [scrollview setHasHorizontalScroller:YES];
-NSTableHeaderView *header = [[NSTableHeaderView alloc] init];
+NSTableHeaderView *header = [[[NSTableHeaderView alloc] init] autorelease];
 [cont setHeaderView:header];
 [cont setTarget:cont];
 [cont setDoubleAction:@selector(doubleClicked:)];
 DW_MUTEX_UNLOCK;
 return cont;
 if(pointer)
 {
 lastadd = [cont lastAddPoint];
 }
-browsercell = [[DWImageAndTextCell alloc] init];
+browsercell = [[[DWImageAndTextCell alloc] init] autorelease];
 [browsercell setImage:icon];
 [browsercell setStringValue:[ NSString stringWithUTF8String:filename ]];
 [cont editCell:browsercell at:(row+lastadd) and:0];
 [cont setNeedsDisplay:YES];
 DW_MUTEX_UNLOCK;
 {
 [NSGraphicsContext saveGraphicsState];
 [NSGraphicsContext setCurrentContext:[NSGraphicsContext
 graphicsContextWithGraphicsPort:[[NSGraphicsContext graphicsContextWithBitmapImageRep:image] graphicsPort]
 flipped:YES]];
-[[NSDictionary alloc] initWithObjectsAndKeys:image, NSGraphicsContextDestinationAttributeName, nil];
+[[[NSDictionary alloc] initWithObjectsAndKeys:image, NSGraphicsContextDestinationAttributeName, nil] autorelease];
 // make a new transform:
 NSAffineTransform *t = [NSAffineTransform transform];
 // by scaling Y negatively, we effectively flip the image:
 [t scaleXBy:1.0 yBy:-1.0];
 char *ext = _dw_get_image_extension( filename );
 if(!(pixmap = calloc(1,sizeof(struct _hpixmap))))
 return NULL;
 NSString *nstr = [ NSString stringWithUTF8String:filename ];
-NSImage *tmpimage = [[NSImage alloc] initWithContentsOfFile:nstr];
+NSImage *tmpimage = [[[NSImage alloc] initWithContentsOfFile:nstr] autorelease];
 if(!tmpimage && ext)
 {
 nstr = [nstr stringByAppendingString: [NSString stringWithUTF8String:ext]];
-tmpimage = [[NSImage alloc] initWithContentsOfFile:nstr];
+tmpimage = [[[NSImage alloc] initWithContentsOfFile:nstr] autorelease];
 }
 if(!tmpimage)
 return NULL;
 NSSize size = [tmpimage size];
 NSBitmapImageRep *image = [[NSBitmapImageRep alloc]
 HPIXMAP pixmap;
 if(!(pixmap = calloc(1,sizeof(struct _hpixmap))))
 return NULL;
 NSData *thisdata = [NSData dataWithBytes:data length:len];
-NSImage *tmpimage = [[NSImage alloc] initWithData:thisdata];
+NSImage *tmpimage = [[[NSImage alloc] initWithData:thisdata] autorelease];
 if(!tmpimage)
 return NULL;
 NSSize size = [tmpimage size];
 NSBitmapImageRep *image = [[NSBitmapImageRep alloc]
 initWithBitmapDataPlanes:NULL
 NSImageView *iv = handle;
 NSImage *bitmap = nil;
 if(filename)
 {
-bitmap = [[NSImage alloc] initWithContentsOfFile:[ NSString stringWithUTF8String:filename ]];
+bitmap = [[[NSImage alloc] initWithContentsOfFile:[ NSString stringWithUTF8String:filename ]] autorelease];
 }
 else if(resid > 0 && resid < 65536)
 {
 bitmap = dw_icon_load(0, resid);
 }

Mercurial > dwindows

comparison mac/dw.m @ 1557:030e9bddc1c9