gnustep/libs-back
0
0
Fork 0
mirror of https://github.com/gnustep/libs-back.git synced 2025-02-23 20:01:22 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Correct the memory management of XWindowBuffer.

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/back/trunk@28141 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Fred Kiefer 2009-03-27 23:16:48 +00:00
parent 76a7888859
commit 4f3b8457a3
4 changed files with 15 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,10 @@
2009-03-28 Fred Kiefer <FredKiefer@gmx.de>
* Source/x11/XWindowBuffer.m (+windowBufferForWindow:depthInfo:):
Return an autorelease instance.
* Source/cairo/XGCairoXImageSurface.m (-initWithDevice:),
* Source/art/ARTGState.m (-GSSetDevice:): Adopt callers.
2009-03-12 Fred Kiefer <FredKiefer@gmx.de> 2009-03-12 Fred Kiefer <FredKiefer@gmx.de>
* Source/x11/XGServerEvent.m: Correct formatting. * Source/x11/XGServerEvent.m: Correct formatting.

17
Source/art/ARTGState.m
View file

@ -618,7 +618,6 @@ draw_info_t ART_DI;
-(void) GSSetDevice: (gswindow_device_t *)window : (int)x : (int)y -(void) GSSetDevice: (gswindow_device_t *)window : (int)x : (int)y
{ {
struct XWindowBuffer_depth_info_s di; struct XWindowBuffer_depth_info_s di;
XWindowBuffer *new_wi;
[self setOffset: NSMakePoint(x, y)]; [self setOffset: NSMakePoint(x, y)];
@ -628,16 +627,8 @@ draw_info_t ART_DI;
di.bytes_per_pixel = DI.bytes_per_pixel; di.bytes_per_pixel = DI.bytes_per_pixel;
di.inline_alpha = DI.inline_alpha; di.inline_alpha = DI.inline_alpha;
di.inline_alpha_ofs = DI.inline_alpha_ofs; di.inline_alpha_ofs = DI.inline_alpha_ofs;
new_wi = [XWindowBuffer windowBufferForWindow: window depthInfo: &di];
if (new_wi != wi) ASSIGN(wi, [XWindowBuffer windowBufferForWindow: window depthInfo: &di]);
{
DESTROY(wi);
wi = new_wi;
}
else
{
DESTROY(new_wi);
}
} }
-(void) GSCurrentDevice: (void **)device : (int *)x : (int *)y -(void) GSCurrentDevice: (void **)device : (int *)x : (int *)y
@ -652,9 +643,9 @@ draw_info_t ART_DI;
if (device) if (device)
{ {
if (wi) if (wi)
*device = wi->window; *device = wi->window;
else else
*device = NULL; *device = NULL;
} }
} }

6
Source/cairo/XGCairoXImageSurface.m
View file

@ -48,13 +48,13 @@
} }
di.drawing_depth = GSWINDEVICE->depth; di.drawing_depth = GSWINDEVICE->depth;
// FIXME: The next four lines may be wrong for depth <> 32. // FIXME: The next lines may be wrong for depth <> 32.
// But then art uses a depth of 24 for 32 bit modes. Strange! // But then art uses a depth of 24 for 32 bit modes. Strange!
di.bytes_per_pixel = 4; di.bytes_per_pixel = 4;
di.inline_alpha = YES; di.inline_alpha = YES;
di.inline_alpha_ofs = 0; di.inline_alpha_ofs = 0;
// FIXME: This method is somewhat special as it does not return an autoreleased object
wi = [XWindowBuffer windowBufferForWindow: GSWINDEVICE depthInfo: &di]; ASSIGN(wi, [XWindowBuffer windowBufferForWindow: GSWINDEVICE depthInfo: &di]);
_surface = cairo_image_surface_create_for_data((unsigned char*)wi->data, _surface = cairo_image_surface_create_for_data((unsigned char*)wi->data,
CAIRO_FORMAT_ARGB32, CAIRO_FORMAT_ARGB32,

2
Source/x11/XWindowBuffer.m
View file

@ -412,7 +412,7 @@ no_xshm:
wi->data = NULL; wi->data = NULL;
} }
return wi; return AUTORELEASE(wi);
} }