AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

Fix this for the single-rectangle case. (#326127, Benjamin Berg)

Browse Source 
2006-01-08  Matthias Clasen  <mclasen@redhat.com>

	* gdk/gdkregion-generic.c (miRegionCopy): Fix this for the
	single-rectangle case.  (#326127, Benjamin Berg)
	(gdk_region_copy): Use miRegionCopy() here.
This commit is contained in:
Matthias Clasen 2006-01-08 06:11:18 +00:00 committed by Matthias Clasen
parent 4c19425693
commit ea8167d919
3 changed files with 21 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2006-01-08 Matthias Clasen <mclasen@redhat.com>
* gdk/gdkregion-generic.c (miRegionCopy): Fix this for the
single-rectangle case. (#326127, Benjamin Berg)
(gdk_region_copy): Use miRegionCopy() here.
2006-01-07 Matthias Clasen <mclasen@redhat.com>
Fix actiongroup-action interaction that relied on

6
ChangeLog.pre-2-10
View File

@ -1,3 +1,9 @@
2006-01-08 Matthias Clasen <mclasen@redhat.com>
* gdk/gdkregion-generic.c (miRegionCopy): Fix this for the
single-rectangle case. (#326127, Benjamin Berg)
(gdk_region_copy): Use miRegionCopy() here.
2006-01-07 Matthias Clasen <mclasen@redhat.com>
Fix actiongroup-action interaction that relied on

23
gdk/gdkregion-generic.c
View File

@ -168,19 +168,9 @@ gdk_region_copy (GdkRegion *region)
g_return_val_if_fail (region != NULL, NULL);
temp = g_slice_new (GdkRegion);
temp = gdk_region_new ();
temp->numRects = region->numRects;
temp->extents = region->extents;
temp->size = region->numRects;
if (region->numRects == 1)
temp->rects = &temp->extents;
else
{
temp->rects = g_new (GdkRegionBox, region->numRects);
memcpy (temp->rects, region->rects, region->numRects * sizeof (GdkRegionBox));
}
miRegionCopy (temp, region);
return temp;
}
@ -600,15 +590,20 @@ gdk_region_intersect (GdkRegion *source1,
}
static void
miRegionCopy(GdkRegion *dstrgn, GdkRegion *rgn)
miRegionCopy (GdkRegion *dstrgn,
GdkRegion *rgn)
{
if (dstrgn != rgn) /* don't want to copy to itself */
{
if (dstrgn->size < rgn->numRects)
{
dstrgn->rects = g_renew (GdkRegionBox, dstrgn->rects, rgn->numRects);
if (dstrgn->rects != &dstrgn->extents)
g_free (dstrgn->rects);
dstrgn->rects = g_new (GdkRegionBox, rgn->numRects);
dstrgn->size = rgn->numRects;
}
dstrgn->numRects = rgn->numRects;
dstrgn->extents = rgn->extents;