callisto-debian/gimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

app: s/GdkRectangle/cairo_rectangle_int_t/ in all GimpCanvasItems

Browse Source
This commit is contained in:
Michael Natterer
2011-04-10 18:15:16 +02:00
parent d0e07a2b1f
commit fde934ac58
17 changed files with 67 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/display/gimpcanvasarc.c
View File

@ -292,9 +292,9 @@ static cairo_region_t *
gimp_canvas_arc_get_extents (GimpCanvasItem *item,
GimpDisplayShell *shell)
{
GdkRectangle rectangle;
gdouble center_x, center_y;
gdouble radius_x, radius_y;
cairo_rectangle_int_t rectangle;
gdouble center_x, center_y;
gdouble radius_x, radius_y;
gimp_canvas_arc_transform (item, shell,
&center_x, &center_y,
@ -305,7 +305,7 @@ gimp_canvas_arc_get_extents (GimpCanvasItem *item,
rectangle.width = ceil (center_x + radius_x + 1.5) - rectangle.x;
rectangle.height = ceil (center_y + radius_y + 1.5) - rectangle.y;
return cairo_region_create_rectangle ((cairo_rectangle_int_t *) &rectangle);
return cairo_region_create_rectangle (&rectangle);
}
GimpCanvasItem *

4
app/display/gimpcanvasboundary.c
View File

@ -306,7 +306,7 @@ gimp_canvas_boundary_get_extents (GimpCanvasItem *item,
GimpDisplayShell *shell)
{
GimpCanvasBoundaryPrivate *private = GET_PRIVATE (item);
GdkRectangle rectangle;
cairo_rectangle_int_t rectangle;
GimpSegment *segs;
gint x1, y1, x2, y2;
gint i;
@ -340,7 +340,7 @@ gimp_canvas_boundary_get_extents (GimpCanvasItem *item,
rectangle.width = x2 - x1 + 4;
rectangle.height = y2 - y1 + 4;
return cairo_region_create_rectangle ((cairo_rectangle_int_t *) &rectangle);
return cairo_region_create_rectangle (&rectangle);
}
GimpCanvasItem *

8
app/display/gimpcanvascorner.c
View File

@ -412,9 +412,9 @@ static cairo_region_t *
gimp_canvas_corner_get_extents (GimpCanvasItem *item,
GimpDisplayShell *shell)
{
GdkRectangle rectangle;
gdouble x, y;
gdouble w, h;
cairo_rectangle_int_t rectangle;
gdouble x, y;
gdouble w, h;
gimp_canvas_corner_transform (item, shell, &x, &y, &w, &h);
@ -423,7 +423,7 @@ gimp_canvas_corner_get_extents (GimpCanvasItem *item,
rectangle.width = ceil (w + 3.0);
rectangle.height = ceil (h + 3.0);
return cairo_region_create_rectangle ((cairo_rectangle_int_t *) &rectangle);
return cairo_region_create_rectangle (&rectangle);
}
GimpCanvasItem *

4
app/display/gimpcanvascursor.c
View File

@ -188,7 +188,7 @@ gimp_canvas_cursor_get_extents (GimpCanvasItem *item,
GimpDisplayShell *shell)
{
GimpCanvasCursorPrivate *private = GET_PRIVATE (item);
GdkRectangle rectangle;
cairo_rectangle_int_t rectangle;
gdouble x, y;
x = floor (private->x) + 0.5;
@ -199,7 +199,7 @@ gimp_canvas_cursor_get_extents (GimpCanvasItem *item,
rectangle.width = ceil (x + GIMP_CURSOR_SIZE + 1.5) - rectangle.x;
rectangle.height = ceil (y + GIMP_CURSOR_SIZE + 1.5) - rectangle.y;
return cairo_region_create_rectangle ((cairo_rectangle_int_t *) &rectangle);
return cairo_region_create_rectangle (&rectangle);
}
GimpCanvasItem *

12
app/display/gimpcanvasgrid.c
View File

@ -344,11 +344,11 @@ static cairo_region_t *
gimp_canvas_grid_get_extents (GimpCanvasItem *item,
GimpDisplayShell *shell)
{
GimpImage *image = gimp_display_get_image (shell->display);
GdkRectangle rectangle;
gdouble x1, y1;
gdouble x2, y2;
gint w, h;
GimpImage *image = gimp_display_get_image (shell->display);
cairo_rectangle_int_t rectangle;
gdouble x1, y1;
gdouble x2, y2;
gint w, h;
if (! image)
return NULL;
@ -364,7 +364,7 @@ gimp_canvas_grid_get_extents (GimpCanvasItem *item,
rectangle.width = ceil (x2) - rectangle.x;
rectangle.height = ceil (y2) - rectangle.y;
return cairo_region_create_rectangle ((cairo_rectangle_int_t *) &rectangle);
return cairo_region_create_rectangle (&rectangle);
}
static void

8
app/display/gimpcanvasguide.c
View File

@ -230,9 +230,9 @@ static cairo_region_t *
gimp_canvas_guide_get_extents (GimpCanvasItem *item,
GimpDisplayShell *shell)
{
GdkRectangle rectangle;
gdouble x1, y1;
gdouble x2, y2;
cairo_rectangle_int_t rectangle;
gdouble x1, y1;
gdouble x2, y2;
gimp_canvas_guide_transform (item, shell, &x1, &y1, &x2, &y2);
@ -241,7 +241,7 @@ gimp_canvas_guide_get_extents (GimpCanvasItem *item,
rectangle.width = ABS (x2 - x1) + 3.0;
rectangle.height = ABS (y2 - y1) + 3.0;
return cairo_region_create_rectangle ((cairo_rectangle_int_t *) &rectangle);
return cairo_region_create_rectangle (&rectangle);
}
static void

4
app/display/gimpcanvashandle.c
View File

@ -354,7 +354,7 @@ gimp_canvas_handle_get_extents (GimpCanvasItem *item,
GimpDisplayShell *shell)
{
GimpCanvasHandlePrivate *private = GET_PRIVATE (item);
GdkRectangle rectangle;
cairo_rectangle_int_t rectangle;
gdouble x, y;
gimp_canvas_handle_transform (item, shell, &x, &y);
@ -382,7 +382,7 @@ gimp_canvas_handle_get_extents (GimpCanvasItem *item,
break;
}
return cairo_region_create_rectangle ((cairo_rectangle_int_t *) &rectangle);
return cairo_region_create_rectangle (&rectangle);
}
static gboolean

8
app/display/gimpcanvasline.c
View File

@ -226,9 +226,9 @@ static cairo_region_t *
gimp_canvas_line_get_extents (GimpCanvasItem *item,
GimpDisplayShell *shell)
{
GdkRectangle rectangle;
gdouble x1, y1;
gdouble x2, y2;
cairo_rectangle_int_t rectangle;
gdouble x1, y1;
gdouble x2, y2;
gimp_canvas_line_transform (item, shell, &x1, &y1, &x2, &y2);
@ -247,7 +247,7 @@ gimp_canvas_line_get_extents (GimpCanvasItem *item,
rectangle.height = ceil (ABS (y2 - y1) + 5.0);
}
return cairo_region_create_rectangle ((cairo_rectangle_int_t *) &rectangle);
return cairo_region_create_rectangle (&rectangle);
}
GimpCanvasItem *

15
app/display/gimpcanvaspassepartout.c
View File

@ -83,16 +83,17 @@ static cairo_region_t *
gimp_canvas_passe_partout_get_extents (GimpCanvasItem *item,
GimpDisplayShell *shell)
{
cairo_region_t *inner;
cairo_region_t *outer;
GdkRectangle rect = { 0, 0, 0, 0 };
cairo_rectangle_int_t rectangle;
cairo_region_t *inner;
cairo_region_t *outer;
rect.x = - shell->offset_x;
rect.y = - shell->offset_y;
rectangle.x = - shell->offset_x;
rectangle.y = - shell->offset_y;
gimp_display_shell_draw_get_scaled_image_size (shell,
&rect.width, &rect.height);
&rectangle.width,
&rectangle.height);
outer = cairo_region_create_rectangle ((cairo_rectangle_int_t *) &rect);
outer = cairo_region_create_rectangle (&rectangle);
inner = GIMP_CANVAS_ITEM_CLASS (parent_class)->get_extents (item, shell);

8
app/display/gimpcanvaspath.c
View File

@ -254,9 +254,9 @@ gimp_canvas_path_get_extents (GimpCanvasItem *item,
if (private->path && gtk_widget_get_realized (shell->canvas))
{
cairo_t *cr;
GdkRectangle rectangle;
gdouble x1, y1, x2, y2;
cairo_t *cr;
cairo_rectangle_int_t rectangle;
gdouble x1, y1, x2, y2;
cr = gdk_cairo_create (gtk_widget_get_window (shell->canvas));
@ -287,7 +287,7 @@ gimp_canvas_path_get_extents (GimpCanvasItem *item,
rectangle.height = ceil (y2 + 1.5) - rectangle.y;
}
return cairo_region_create_rectangle ((cairo_rectangle_int_t *) &rectangle);
return cairo_region_create_rectangle (&rectangle);
}
return NULL;

6
app/display/gimpcanvaspen.c
View File

@ -170,16 +170,16 @@ gimp_canvas_pen_get_extents (GimpCanvasItem *item,
if (region)
{
GdkRectangle rectangle;
cairo_rectangle_int_t rectangle;
cairo_region_get_extents (region, (cairo_rectangle_int_t *) &rectangle);
cairo_region_get_extents (region, &rectangle);
rectangle.x -= ceil (private->width / 2.0);
rectangle.y -= ceil (private->width / 2.0);
rectangle.width += private->width + 1;
rectangle.height += private->width + 1;
cairo_region_union_rectangle (region, (cairo_rectangle_int_t *) &rectangle);
cairo_region_union_rectangle (region, &rectangle);
}
return region;

4
app/display/gimpcanvaspolygon.c
View File

@ -251,7 +251,7 @@ gimp_canvas_polygon_get_extents (GimpCanvasItem *item,
GimpDisplayShell *shell)
{
GimpCanvasPolygonPrivate *private = GET_PRIVATE (item);
GdkRectangle rectangle;
cairo_rectangle_int_t rectangle;
GimpVector2 *points;
gint x1, y1, x2, y2;
gint i;
@ -285,7 +285,7 @@ gimp_canvas_polygon_get_extents (GimpCanvasItem *item,
rectangle.width = x2 - x1;
rectangle.height = y2 - y1;
return cairo_region_create_rectangle ((cairo_rectangle_int_t *) &rectangle);
return cairo_region_create_rectangle (&rectangle);
}
GimpCanvasItem *

8
app/display/gimpcanvasprogress.c
View File

@ -310,9 +310,9 @@ static cairo_region_t *
gimp_canvas_progress_get_extents (GimpCanvasItem *item,
GimpDisplayShell *shell)
{
GdkRectangle rectangle;
gdouble x, y;
gint width, height;
cairo_rectangle_int_t rectangle;
gdouble x, y;
gint width, height;
gimp_canvas_progress_transform (item, shell, &x, &y, &width, &height);
@ -322,7 +322,7 @@ gimp_canvas_progress_get_extents (GimpCanvasItem *item,
rectangle.width = width + 2;
rectangle.height = height + 2;
return cairo_region_create_rectangle ((cairo_rectangle_int_t *) &rectangle);
return cairo_region_create_rectangle (&rectangle);
}
static GimpProgress *

14
app/display/gimpcanvasrectangle.c
View File

@ -270,7 +270,7 @@ gimp_canvas_rectangle_get_extents (GimpCanvasItem *item,
GimpDisplayShell *shell)
{
GimpCanvasRectanglePrivate *private = GET_PRIVATE (item);
GdkRectangle rectangle;
cairo_rectangle_int_t rectangle;
gdouble x, y;
gdouble w, h;
@ -283,7 +283,7 @@ gimp_canvas_rectangle_get_extents (GimpCanvasItem *item,
rectangle.width = ceil (w + 2.0);
rectangle.height = ceil (h + 2.0);
return cairo_region_create_rectangle ((cairo_rectangle_int_t *) &rectangle);
return cairo_region_create_rectangle (&rectangle);
}
else if (w > 64 && h > 64)
{
@ -295,12 +295,12 @@ gimp_canvas_rectangle_get_extents (GimpCanvasItem *item,
rectangle.width = 3.0;
rectangle.height = ceil (h + 3.0);
region = cairo_region_create_rectangle ((cairo_rectangle_int_t *) &rectangle);
region = cairo_region_create_rectangle (&rectangle);
/* right */
rectangle.x = floor (x + w - 1.5);
cairo_region_union_rectangle (region, (cairo_rectangle_int_t *) &rectangle);
cairo_region_union_rectangle (region, &rectangle);
/* top */
rectangle.x = floor (x - 1.5);
@ -308,12 +308,12 @@ gimp_canvas_rectangle_get_extents (GimpCanvasItem *item,
rectangle.width = ceil (w + 3.0);
rectangle.height = 3.0;
cairo_region_union_rectangle (region, (cairo_rectangle_int_t *) &rectangle);
cairo_region_union_rectangle (region, &rectangle);
/* bottom */
rectangle.y = floor (y + h - 1.5);
cairo_region_union_rectangle (region, (cairo_rectangle_int_t *) &rectangle);
cairo_region_union_rectangle (region, &rectangle);
return region;
}
@ -324,7 +324,7 @@ gimp_canvas_rectangle_get_extents (GimpCanvasItem *item,
rectangle.width = ceil (w + 3.0);
rectangle.height = ceil (h + 3.0);
return cairo_region_create_rectangle ((cairo_rectangle_int_t *) &rectangle);
return cairo_region_create_rectangle (&rectangle);
}
}

8
app/display/gimpcanvassamplepoint.c
View File

@ -261,9 +261,9 @@ static cairo_region_t *
gimp_canvas_sample_point_get_extents (GimpCanvasItem *item,
GimpDisplayShell *shell)
{
GdkRectangle rectangle;
gdouble x, y;
gint x1, x2, y1, y2;
cairo_rectangle_int_t rectangle;
gdouble x, y;
gint x1, x2, y1, y2;
gimp_canvas_sample_point_transform (item, shell, &x, &y);
@ -281,7 +281,7 @@ gimp_canvas_sample_point_get_extents (GimpCanvasItem *item,
rectangle.width += 5;
rectangle.height += 5;
return cairo_region_create_rectangle ((cairo_rectangle_int_t *) &rectangle);
return cairo_region_create_rectangle (&rectangle);
}
static void

4
app/display/gimpcanvastextcursor.c
View File

@ -273,7 +273,7 @@ gimp_canvas_text_cursor_get_extents (GimpCanvasItem *item,
GimpDisplayShell *shell)
{
GimpCanvasTextCursorPrivate *private = GET_PRIVATE (item);
GdkRectangle rectangle;
cairo_rectangle_int_t rectangle;
gdouble x, y;
gdouble w, h;
@ -294,7 +294,7 @@ gimp_canvas_text_cursor_get_extents (GimpCanvasItem *item,
rectangle.height = ceil (h + 3.0);
}
return cairo_region_create_rectangle ((cairo_rectangle_int_t *) &rectangle);
return cairo_region_create_rectangle (&rectangle);
}
GimpCanvasItem *

10
app/display/gimpcanvastransformpreview.c
View File

@ -346,9 +346,9 @@ gimp_canvas_transform_preview_get_property (GObject *object,
}
static gboolean
gimp_canvas_transform_preview_transform (GimpCanvasItem *item,
GimpDisplayShell *shell,
GdkRectangle *extents)
gimp_canvas_transform_preview_transform (GimpCanvasItem *item,
GimpDisplayShell *shell,
cairo_rectangle_int_t *extents)
{
GimpCanvasTransformPreviewPrivate *private = GET_PRIVATE (item);
gdouble tx1, ty1;
@ -569,10 +569,10 @@ static cairo_region_t *
gimp_canvas_transform_preview_get_extents (GimpCanvasItem *item,
GimpDisplayShell *shell)
{
GdkRectangle rectangle;
cairo_rectangle_int_t rectangle;
if (gimp_canvas_transform_preview_transform (item, shell, &rectangle))
return cairo_region_create_rectangle ((cairo_rectangle_int_t *) &rectangle);
return cairo_region_create_rectangle (&rectangle);
return NULL;
}