dnrops
/
gimp
mirror of https://github.com/GNOME/gimp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add gimp_rectangle_union()

This commit is contained in:
Michael Natterer 2009-08-23 22:58:36 +02:00
parent e2ed81e310
commit c6bd3e0570
3 changed files with 62 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libgimpbase/gimpbase.def
View File

@ -86,6 +86,7 @@ EXPORTS
gimp_plug_in_directory
gimp_progress_command_get_type
gimp_rectangle_intersect
gimp_rectangle_union
gimp_repeat_mode_get_type
gimp_run_mode_get_type
gimp_signal_private

49
libgimpbase/gimprectangle.c
View File

@ -45,7 +45,7 @@
* Return value: %TRUE if the intersection is non-empty, %FALSE otherwise
*
* Since: GIMP 2.4
*/
**/
gboolean
gimp_rectangle_intersect (gint x1,
gint y1,
@ -75,3 +75,50 @@ gimp_rectangle_intersect (gint x1,
return (d_w > 0 && d_h > 0);
}
/**
* gimp_rectangle_union:
* @x1: origin of first rectangle
* @y1: origin of first rectangle
* @width1: width of first rectangle
* @height1: height of first rectangle
* @x2: origin of second rectangle
* @y2: origin of second rectangle
* @width2: width of second rectangle
* @height2: height of second rectangle
* @dest_x: return location for origin of union (may be %NULL)
* @dest_y: return location for origin of union (may be %NULL)
* @dest_width: return location for width of union (may be %NULL)
* @dest_height: return location for height of union (may be %NULL)
*
* Calculates the union of two rectangles.
*
* Since: GIMP 2.8
**/
void
gimp_rectangle_union (gint x1,
gint y1,
gint width1,
gint height1,
gint x2,
gint y2,
gint width2,
gint height2,
gint *dest_x,
gint *dest_y,
gint *dest_width,
gint *dest_height)
{
gint d_x, d_y;
gint d_w, d_h;
d_x = MIN (x1, x2);
d_y = MIN (y1, y2);
d_w = MAX (x1 + width1, x2 + width2) - d_x;
d_h = MAX (y1 + height1, y2 + height2) - d_y;
if (dest_x) *dest_x = d_x;
if (dest_y) *dest_y = d_y;
if (dest_width) *dest_width = d_w;
if (dest_height) *dest_height = d_h;
}

13
libgimpbase/gimprectangle.h
View File

@ -37,6 +37,19 @@ gboolean gimp_rectangle_intersect (gint x1,
gint *dest_width,
gint *dest_height);
void gimp_rectangle_union (gint x1,
gint y1,
gint width1,
gint height1,
gint x2,
gint y2,
gint width2,
gint height2,
gint *dest_x,
gint *dest_y,
gint *dest_width,
gint *dest_height);
G_END_DECLS