gnustep/libs-back
0
0
Fork 0
mirror of https://github.com/gnustep/libs-back.git synced 2025-02-24 04:11:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Better handling of clip copying when the clip is not representable by cairo.

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/back/trunk@27797 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Fred Kiefer 2009-02-05 18:44:18 +00:00
parent 958fc4f709
commit dac60cb4d2
2 changed files with 24 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2009-02-05 Fred Kiefer <FredKiefer@gmx.de>
* Source/cairo/CairoGState.m (-copyWithZone:): Better handling of
clip copying when the clip is not representable by cairo.
2009-02-05 Fred Kiefer <FredKiefer@gmx.de> 2009-02-05 Fred Kiefer <FredKiefer@gmx.de>
* Source/xlib/XGBitmap.m: Fix some compiler warnings. * Source/xlib/XGBitmap.m: Fix some compiler warnings.

25
Source/cairo/CairoGState.m
View file

@ -197,11 +197,7 @@ static float floatToUserSpace(NSAffineTransform *ctm, float f)
// In cairo 1.4 there also is a way to get the current clipping path // In cairo 1.4 there also is a way to get the current clipping path
clip_rects = cairo_copy_clip_rectangle_list(_ct); clip_rects = cairo_copy_clip_rectangle_list(_ct);
status = clip_rects->status; status = clip_rects->status;
if (status != CAIRO_STATUS_SUCCESS) if (status == CAIRO_STATUS_SUCCESS)
{
NSLog(@"Cairo status '%s' in copy clip", cairo_status_to_string(status));
}
else
{ {
int i; int i;
@ -232,8 +228,25 @@ static float floatToUserSpace(NSAffineTransform *ctm, float f)
cairo_clip(copy->_ct); cairo_clip(copy->_ct);
} }
} }
}
cairo_rectangle_list_destroy(clip_rects); cairo_rectangle_list_destroy(clip_rects);
}
else if (status == CAIRO_STATUS_CLIP_NOT_REPRESENTABLE)
{
// We cannot get the exact clip, so we do the best we can
double x1;
double y1;
double x2;
double y2;
cairo_clip_extents(_ct, &x1, &y1, &x2, &y2);
cairo_rectangle(copy->_ct, x1, y2, x2 - x1, y2 - y1);
cairo_clip(copy->_ct);
}
else
{
NSLog(@"Cairo status '%s' in copy clip", cairo_status_to_string(status));
}
#endif #endif
} }
} }