Mirrors_UI_SDK/fltk
1
0
Fork 0
mirror of https://github.com/fltk/fltk.git synced 2026-05-29 20:45:33 +08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Mac OS: changed memory allocation style of static NSBitmapImageRep* rect_to_NSBitmapImageRep().

Browse Source 
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@9805 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
This commit is contained in:
Manolo Gouy
2013-01-20 16:54:23 +00:00
parent 161bdb8973
commit b5a9c5218a
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Fl_cocoa.mm
+3 -5
View File
@@ -3466,7 +3466,7 @@ int Fl::dnd(void)
} }
static NSBitmapImageRep* rect_to_NSBitmapImageRep(Fl_Window *win, int x, int y, int w, int h) static NSBitmapImageRep* rect_to_NSBitmapImageRep(Fl_Window *win, int x, int y, int w, int h)
// release the returned value after use // the returned value is autoreleased
{ {
while (win->window()) { while (win->window()) {
x += win->x(); x += win->x();
@@ -3479,7 +3479,7 @@ static NSBitmapImageRep* rect_to_NSBitmapImageRep(Fl_Window *win, int x, int y,
// left pixel column are not read, and bitmap is read shifted by one pixel in both directions. // left pixel column are not read, and bitmap is read shifted by one pixel in both directions.
// Under 10.5, we want no offset. // Under 10.5, we want no offset.
NSRect rect = NSMakeRect(x - epsilon, y - epsilon, w, h); NSRect rect = NSMakeRect(x - epsilon, y - epsilon, w, h);
return [[NSBitmapImageRep alloc] initWithFocusedViewRect:rect]; return [[[NSBitmapImageRep alloc] initWithFocusedViewRect:rect] autorelease];
} }
unsigned char *Fl_X::bitmap_from_window_rect(Fl_Window *win, int x, int y, int w, int h, int *bytesPerPixel) unsigned char *Fl_X::bitmap_from_window_rect(Fl_Window *win, int x, int y, int w, int h, int *bytesPerPixel)
@@ -3508,7 +3508,6 @@ unsigned char *Fl_X::bitmap_from_window_rect(Fl_Window *win, int x, int y, int w
q += w * *bytesPerPixel; q += w * *bytesPerPixel;
} }
} }
[bitmap release];
return data; return data;
} }
@@ -3521,11 +3520,10 @@ CGImageRef Fl_X::CGImage_from_window_rect(Fl_Window *win, int x, int y, int w, i
// CFRelease the returned CGImageRef after use // CFRelease the returned CGImageRef after use
{ {
CGImageRef img; CGImageRef img;
if (fl_mac_os_version >= 100600) { // crashes with 10.5 if (fl_mac_os_version >= 100500) {
NSBitmapImageRep *bitmap = rect_to_NSBitmapImageRep(win, x, y, w, h); NSBitmapImageRep *bitmap = rect_to_NSBitmapImageRep(win, x, y, w, h);
img = (CGImageRef)[bitmap performSelector:@selector(CGImage)]; // requires Mac OS 10.5 img = (CGImageRef)[bitmap performSelector:@selector(CGImage)]; // requires Mac OS 10.5
CGImageRetain(img); CGImageRetain(img);
[bitmap release];
} }
else { else {
int bpp; int bpp;