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

Merge commit 'origin/master' into soc-2009-dynamics

This commit is contained in:
Alexia Death 2009-10-11 01:05:40 +03:00
parent 943e8c9009 0012c86cf1
commit 0ca81896e9
15 changed files with 253 additions and 305 deletions

515
app/core/gimpchannel-combine.c
View File

@ -17,6 +17,8 @@
#include "config.h"
#include <string.h>
#include <gegl.h>
#include "libgimpbase/gimpbase.h"
@ -33,97 +35,6 @@
#include "gimpchannel-combine.h"
void
gimp_channel_add_segment (GimpChannel *mask,
gint x,
gint y,
gint width,
gint value)
{
PixelRegion maskPR;
guchar *data;
gint val;
gint x2;
gpointer pr;
g_return_if_fail (GIMP_IS_CHANNEL (mask));
/* check horizontal extents... */
x2 = x + width;
x2 = CLAMP (x2, 0, gimp_item_get_width (GIMP_ITEM (mask)));
x = CLAMP (x, 0, gimp_item_get_width (GIMP_ITEM (mask)));
width = x2 - x;
if (!width)
return;
if (y < 0 || y >= gimp_item_get_height (GIMP_ITEM (mask)))
return;
pixel_region_init (&maskPR, gimp_drawable_get_tiles (GIMP_DRAWABLE (mask)),
x, y, width, 1, TRUE);
for (pr = pixel_regions_register (1, &maskPR);
pr != NULL;
pr = pixel_regions_process (pr))
{
data = maskPR.data;
width = maskPR.w;
while (width--)
{
val = *data + value;
if (val > 255)
val = 255;
*data++ = val;
}
}
}
void
gimp_channel_sub_segment (GimpChannel *mask,
gint x,
gint y,
gint width,
gint value)
{
PixelRegion maskPR;
guchar *data;
gint val;
gint x2;
gpointer pr;
g_return_if_fail (GIMP_IS_CHANNEL (mask));
/* check horizontal extents... */
x2 = x + width;
x2 = CLAMP (x2, 0, gimp_item_get_width (GIMP_ITEM (mask)));
x = CLAMP (x, 0, gimp_item_get_width (GIMP_ITEM (mask)));
width = x2 - x;
if (! width)
return;
if (y < 0 || y > gimp_item_get_height (GIMP_ITEM (mask)))
return;
pixel_region_init (&maskPR, gimp_drawable_get_tiles (GIMP_DRAWABLE (mask)),
x, y, width, 1, TRUE);
for (pr = pixel_regions_register (1, &maskPR);
pr != NULL;
pr = pixel_regions_process (pr))
{
data = maskPR.data;
width = maskPR.w;
while (width--)
{
val = *data - value;
if (val < 0)
val = 0;
*data++ = val;
}
}
}
void
gimp_channel_combine_rect (GimpChannel *mask,
GimpChannelOps op,
@ -155,7 +66,7 @@ gimp_channel_combine_rect (GimpChannel *mask,
color_region (&maskPR, &color);
/* Determine new boundary */
if (mask->bounds_known && (op == GIMP_CHANNEL_OP_ADD) && !mask->empty)
if (mask->bounds_known && (op == GIMP_CHANNEL_OP_ADD) && ! mask->empty)
{
if (x < mask->x1)
mask->x1 = x;
@ -175,7 +86,9 @@ gimp_channel_combine_rect (GimpChannel *mask,
mask->y2 = y + h;
}
else
mask->bounds_known = FALSE;
{
mask->bounds_known = FALSE;
}
mask->x1 = CLAMP (mask->x1, 0, gimp_item_get_width (GIMP_ITEM (mask)));
mask->y1 = CLAMP (mask->y1, 0, gimp_item_get_height (GIMP_ITEM (mask)));
@ -216,27 +129,51 @@ gimp_channel_combine_ellipse (GimpChannel *mask,
w / 2.0, h / 2.0, antialias);
}
static inline void
gimp_channel_combine_segment (GimpChannel *mask,
static void
gimp_channel_combine_span (guchar *data,
GimpChannelOps op,
gint start,
gint row,
gint width,
gint x1,
gint x2,
gint value)
{
if (x2 <= x1)
return;
switch (op)
{
case GIMP_CHANNEL_OP_ADD:
case GIMP_CHANNEL_OP_REPLACE:
gimp_channel_add_segment (mask, start, row, width, value);
if (value == 255)
{
memset (data + x1, 255, x2 - x1);
}
else
{
while (x1 < x2)
{
const guint val = data[x1] + value;
data[x1++] = val > 255 ? 255 : val;
}
}
break;
case GIMP_CHANNEL_OP_SUBTRACT:
gimp_channel_sub_segment (mask, start, row, width, value);
if (value == 255)
{
memset (data + x1, 0, x2 - x1);
}
else
{
while (x1 < x2)
{
const gint val = data[x1] - value;
data[x1++] = val > 0 ? val : 0;
}
}
break;
case GIMP_CHANNEL_OP_INTERSECT:
/* Should not happend */
/* Should not happen */
break;
}
}
@ -272,31 +209,17 @@ gimp_channel_combine_ellipse_rect (GimpChannel *mask,
gdouble b,
gboolean antialias)
{
gint cur_y;
gdouble a_sqr;
gdouble b_sqr;
gdouble straight_width;
gdouble straight_height;
PixelRegion maskPR;
gdouble a_sqr;
gdouble b_sqr;
gdouble ellipse_center_x;
gint x0, y0;
gint width, height;
gpointer pr;
g_return_if_fail (GIMP_IS_CHANNEL (mask));
g_return_if_fail (a >= 0.0 && b >= 0.0);
if (! gimp_rectangle_intersect (x, y, w, h,
0, 0,
gimp_item_get_width (GIMP_ITEM (mask)),
gimp_item_get_height (GIMP_ITEM (mask)),
NULL, NULL, NULL, NULL))
{
return;
}
/* Allow us to use gimp_channel_combine_segment without breaking
* previous logic
*/
if (op == GIMP_CHANNEL_OP_INTERSECT)
return;
g_return_if_fail (op != GIMP_CHANNEL_OP_INTERSECT);
/* Make sure the elliptic corners fit into the rect */
a = MIN (a, w / 2.0);
@ -305,162 +228,179 @@ gimp_channel_combine_ellipse_rect (GimpChannel *mask,
a_sqr = SQR (a);
b_sqr = SQR (b);
straight_width = w - 2 * a;
straight_height = h - 2 * b;
if (! gimp_rectangle_intersect (x, y, w, h,
0, 0,
gimp_item_get_width (GIMP_ITEM (mask)),
gimp_item_get_height (GIMP_ITEM (mask)),
&x0, &y0, &width, &height))
return;
for (cur_y = y; cur_y < (y + h); cur_y++)
ellipse_center_x = x + a;
pixel_region_init (&maskPR, gimp_drawable_get_tiles (GIMP_DRAWABLE (mask)),
x0, y0, width, height, TRUE);
for (pr = pixel_regions_register (1, &maskPR);
pr != NULL;
pr = pixel_regions_process (pr))
{
gdouble x_start;
gdouble x_end;
gdouble ellipse_center_x;
gdouble ellipse_center_y;
gdouble half_ellipse_width_at_y;
guchar *data = maskPR.data;
gint py;
/* If this row is not part of the mask, continue with the next row */
if (cur_y < 0 || cur_y >= gimp_item_get_height (GIMP_ITEM (mask)))
for (py = maskPR.y;
py < maskPR.y + maskPR.h;
py++, data += maskPR.rowstride)
{
continue;
}
const gint px = maskPR.x;
gdouble ellipse_center_y;
/* If we are on a row not affected by rounded corners, simply combine the
* whole row.
*/
if (cur_y >= y + b && cur_y < y + b + straight_height)
{
x_start = x;
x_end = x + w;
gimp_channel_combine_segment (mask, op, x_start,
cur_y, x_end - x_start, 255);
continue;
}
/* Match the ellipse center y with our current y */
if (cur_y < y + b)
{
ellipse_center_y = y + b;
}
else
{
ellipse_center_y = y + b + straight_height;
}
/* For a non-antialiased ellipse, use the normal equation for an ellipse
* with an arbitrary center (ellipse_center_x, ellipse_center_y).
*/
if (!antialias)
{
ellipse_center_x = x + a;
half_ellipse_width_at_y =
sqrt (a_sqr - a_sqr * SQR (cur_y + 0.5f - ellipse_center_y) / b_sqr);
x_start = ROUND (ellipse_center_x - half_ellipse_width_at_y);
x_end = ROUND (ellipse_center_x + straight_width +
half_ellipse_width_at_y);
gimp_channel_combine_segment (mask, op, x_start,
cur_y, x_end - x_start, 255);
}
else /* use antialiasing */
{
/* algorithm changed 7-18-04, because the previous one did not
* work well for eccentric ellipses. The new algorithm
* measures the distance to the ellipse in the X and Y directions,
* and uses trigonometry to approximate the distance to the
* ellipse as the distance to the hypotenuse of a right triangle
* whose legs are the X and Y distances. (WES)
*/
gint val;
gint last_val;
gint x_start;
gint cur_x;
gfloat xj, yi;
gfloat xdist, ydist;
gfloat r;
gfloat dist;
x_start = x;
yi = ABS (cur_y + 0.5 - ellipse_center_y);
last_val = 0;
ellipse_center_x = x + a;
for (cur_x = x; cur_x < (x + w); cur_x++)
if (py >= y + b && py < y + h - b)
{
xj = ABS (cur_x + 0.5 - ellipse_center_x);
if (yi < b)
xdist = xj - a * sqrt (1 - SQR (yi) / b_sqr);
else
xdist = 1000.0; /* anything large will work */
if (xj < a)
ydist = yi - b * sqrt (1 - SQR (xj) / a_sqr);
else
ydist = 1000.0; /* anything large will work */
r = hypot (xdist, ydist);
if (r < 0.001)
dist = 0.;
else
dist = xdist * ydist / r; /* trig formula for distance to
* hypotenuse
*/
if (xdist < 0.0)
dist *= -1;
if (dist < -0.5)
val = 255;
else if (dist < 0.5)
val = (gint) (255 * (1 - (dist + 0.5)));
else
val = 0;
gimp_channel_combine_segment (mask, op,
x_start, cur_y,
cur_x - x_start,
last_val);
if (last_val != val)
{
x_start = cur_x;
last_val = val;
}
/* because we are symetric accross the y axis we can
* skip ahead a bit if we are inside. Do this if we
* have reached a value of 255 OR if we have passed
* the center of the leftmost ellipse.
*/
if ((val == 255 || cur_x >= x + a) && cur_x < x + w / 2)
{
x_start = cur_x;
last_val = val = 255;
cur_x = (ellipse_center_x +
(ellipse_center_x - cur_x) - 1 +
floor (straight_width));
}
/* Time to change center? */
if (cur_x >= x + w / 2)
{
ellipse_center_x = x + a + straight_width;
}
/* we are on a row without rounded corners */
gimp_channel_combine_span (data, op, 0, maskPR.w, 255);
continue;
}
gimp_channel_combine_segment (mask, op, x_start,
cur_y, cur_x - x_start, last_val);
/* Match the ellipse center y with our current y */
if (py < y + b)
{
ellipse_center_y = y + b;
}
else
{
ellipse_center_y = y + h - b;
}
/* For a non-antialiased ellipse, use the normal equation
* for an ellipse with an arbitrary center
* (ellipse_center_x, ellipse_center_y).
*/
if (! antialias)
{
gdouble half_ellipse_width_at_y;
gint x_start;
gint x_end;
half_ellipse_width_at_y =
sqrt (a_sqr -
a_sqr * SQR (py + 0.5f - ellipse_center_y) / b_sqr);
x_start = ROUND (ellipse_center_x - half_ellipse_width_at_y);
x_end = ROUND (ellipse_center_x + w - 2 * a +
half_ellipse_width_at_y);
gimp_channel_combine_span (data, op,
MAX (x_start - px, 0),
MIN (x_end - px, maskPR.w), 255);
}
else /* use antialiasing */
{
/* algorithm changed 7-18-04, because the previous one
* did not work well for eccentric ellipses. The new
* algorithm measures the distance to the ellipse in the
* X and Y directions, and uses trigonometry to
* approximate the distance to the ellipse as the
* distance to the hypotenuse of a right triangle whose
* legs are the X and Y distances. (WES)
*/
const gfloat yi = ABS (py + 0.5 - ellipse_center_y);
gint last_val = 0;
gint x_start = px;
gint cur_x;
for (cur_x = px; cur_x < (px + maskPR.w); cur_x++)
{
gfloat xj;
gfloat xdist;
gfloat ydist;
gfloat r;
gfloat dist;
gint val;
if (cur_x < x + w / 2)
{
ellipse_center_x = x + a;
}
else
{
ellipse_center_x = x + w - a;
}
xj = ABS (cur_x + 0.5 - ellipse_center_x);
if (yi < b)
xdist = xj - a * sqrt (1 - SQR (yi) / b_sqr);
else
xdist = 1000.0; /* anything large will work */
if (xj < a)
ydist = yi - b * sqrt (1 - SQR (xj) / a_sqr);
else
ydist = 1000.0; /* anything large will work */
r = hypot (xdist, ydist);
if (r < 0.001)
dist = 0.;
else
dist = xdist * ydist / r; /* trig formula for distance to
* hypotenuse
*/
if (xdist < 0.0)
dist *= -1;
if (dist < -0.5)
val = 255;
else if (dist < 0.5)
val = (gint) (255 * (1 - (dist + 0.5)));
else
val = 0;
gimp_channel_combine_span (data, op,
MAX (x_start - px, 0),
MIN (cur_x - px, maskPR.w),
last_val);
if (last_val != val)
{
x_start = cur_x;
last_val = val;
}
/* skip ahead if we are on the straight segment
* between rounded corners
*/
if (cur_x >= x + a && cur_x < x + w - a)
{
x_start = cur_x;
cur_x = x + w - a;
last_val = val = 255;
}
/* Time to change center? */
if (cur_x >= x + w / 2)
{
ellipse_center_x = x + w - a;
}
}
gimp_channel_combine_span (data, op,
MAX (x_start - px, 0),
MIN (cur_x - px, maskPR.w),
last_val);
}
}
}
/* use the intersected values for the boundary calculation */
x = x0;
y = y0;
w = width;
h = height;
/* determine new boundary */
if (mask->bounds_known && (op == GIMP_CHANNEL_OP_ADD) && !mask->empty)
if (mask->bounds_known && (op == GIMP_CHANNEL_OP_ADD) && ! mask->empty)
{
if (x < mask->x1)
mask->x1 = x;
@ -484,11 +424,6 @@ gimp_channel_combine_ellipse_rect (GimpChannel *mask,
mask->bounds_known = FALSE;
}
mask->x1 = CLAMP (mask->x1, 0, gimp_item_get_width (GIMP_ITEM (mask)));
mask->y1 = CLAMP (mask->y1, 0, gimp_item_get_height (GIMP_ITEM (mask)));
mask->x2 = CLAMP (mask->x2, 0, gimp_item_get_width (GIMP_ITEM (mask)));
mask->y2 = CLAMP (mask->y2, 0, gimp_item_get_height (GIMP_ITEM (mask)));
gimp_drawable_update (GIMP_DRAWABLE (mask), x, y, w, h);
}
@ -497,22 +432,19 @@ gimp_channel_combine_sub_region_add (gpointer unused,
PixelRegion *srcPR,
PixelRegion *destPR)
{
guchar *src, *dest;
gint x, y, val;
src = srcPR->data;
dest = destPR->data;
const guchar *src = srcPR->data;
guchar *dest = destPR->data;
gint x, y;
for (y = 0; y < srcPR->h; y++)
{
for (x = 0; x < srcPR->w; x++)
{
val = dest[x] + src[x];
if (val > 255)
dest[x] = 255;
else
dest[x] = val;
const guint val = dest[x] + src[x];
dest[x] = val > 255 ? 255 : val;
}
src += srcPR->rowstride;
dest += destPR->rowstride;
}
@ -523,11 +455,9 @@ gimp_channel_combine_sub_region_sub (gpointer unused,
PixelRegion *srcPR,
PixelRegion *destPR)
{
guchar *src, *dest;
gint x, y;
src = srcPR->data;
dest = destPR->data;
const guchar *src = srcPR->data;
guchar *dest = destPR->data;
gint x, y;
for (y = 0; y < srcPR->h; y++)
{
@ -536,8 +466,9 @@ gimp_channel_combine_sub_region_sub (gpointer unused,
if (src[x] > dest[x])
dest[x] = 0;
else
dest[x]-= src[x];
dest[x] -= src[x];
}
src += srcPR->rowstride;
dest += destPR->rowstride;
}
@ -548,11 +479,9 @@ gimp_channel_combine_sub_region_intersect (gpointer unused,
PixelRegion *srcPR,
PixelRegion *destPR)
{
guchar *src, *dest;
gint x, y;
src = srcPR->data;
dest = destPR->data;
const guchar *src = srcPR->data;
guchar *dest = destPR->data;
gint x, y;
for (y = 0; y < srcPR->h; y++)
{

10
app/core/gimpchannel-combine.h
View File

@ -19,16 +19,6 @@
#define __GIMP_CHANNEL_COMBINE_H__
void gimp_channel_add_segment (GimpChannel *mask,
gint x,
gint y,
gint width,
gint value);
void gimp_channel_sub_segment (GimpChannel *mask,
gint x,
gint y,
gint width,
gint value);
void gimp_channel_combine_rect (GimpChannel *mask,
GimpChannelOps op,
gint x,

9
app/core/gimpcontext.h
View File

@ -35,6 +35,15 @@
typedef struct _GimpContextClass GimpContextClass;
/**
* GimpContext:
*
* Holds state such as the active image, active display, active brush,
* active foreground and background color, and so on. There can many
* instances of contexts. The user context is what the user sees and
* interacts with but there can also be contexts for docks and for
* plug-ins.
*/
struct _GimpContext
{
GimpObject parent_instance;

2
app/widgets/gimpdock.h
View File

@ -34,6 +34,8 @@ typedef struct _GimpDockClass GimpDockClass;
typedef struct _GimpDockPrivate GimpDockPrivate;
/**
* GimpDock:
*
* Contains a column of GimpDockbooks.
*/
struct _GimpDock

2
app/widgets/gimpdockable.h
View File

@ -36,6 +36,8 @@
typedef struct _GimpDockableClass GimpDockableClass;
/**
* GimpDockable:
*
* A kind of adpater to make other widgets dockable. The widget to
* dock is put inside the GimpDockable, which is put in a
* GimpDockbook.

2
app/widgets/gimpdockbook.h
View File

@ -34,6 +34,8 @@ typedef struct _GimpDockbookClass GimpDockbookClass;
typedef struct _GimpDockbookPrivate GimpDockbookPrivate;
/**
* GimpDockbook:
*
* Holds GimpDockables which are presented on different tabs using
* GtkNotebook.
*/

2
app/widgets/gimpdockcolumns.h
View File

@ -34,6 +34,8 @@ typedef struct _GimpDockColumnsClass GimpDockColumnsClass;
typedef struct _GimpDockColumnsPrivate GimpDockColumnsPrivate;
/**
* GimpDockColumns:
*
* A widget containing GimpDocks so that dockables are arranged in
* columns.
*/

2
app/widgets/gimpdocked.h
View File

@ -31,6 +31,8 @@
typedef struct _GimpDockedInterface GimpDockedInterface;
/**
* GimpDockedInterface:
*
* Interface with common methods for stuff that is docked.
*/
struct _GimpDockedInterface

2
app/widgets/gimpdockseparator.h
View File

@ -33,6 +33,8 @@
typedef struct _GimpDockSeparatorClass GimpDockSeparatorClass;
/**
* GimpDockSeparator:
*
* Separates dockable and acts as drop-targets to allow rearrangements
* of them.
*/

2
app/widgets/gimpdockwindow.h
View File

@ -38,6 +38,8 @@ typedef struct _GimpDockWindowClass GimpDockWindowClass;
typedef struct _GimpDockWindowPrivate GimpDockWindowPrivate;
/**
* GimpDockWindow:
*
* A top-level window containing GimpDocks.
*/
struct _GimpDockWindow

2
app/widgets/gimpsessioninfo-aux.h
View File

@ -23,6 +23,8 @@
/**
* GimpSessionInfoAux:
*
* Contains arbitrary data in the session management system, used for
* example by dockables to manage dockable-specific data.
*/

2
app/widgets/gimpsessioninfo-book.h
View File

@ -23,6 +23,8 @@
/**
* GimpSessionInfoBook:
*
* Contains information about a book (a GtkNotebook of dockables) in
* the interface.
*/

2
app/widgets/gimpsessioninfo-dockable.h
View File

@ -23,6 +23,8 @@
/**
* GimpSessionInfoDockable:
*
* Contains information about a dockable in the interface.
*/
struct _GimpSessionInfoDockable

2
app/widgets/gimpsessioninfo.h
View File

@ -37,6 +37,8 @@ typedef struct _GimpSessionInfoPrivate GimpSessionInfoPrivate;
typedef struct _GimpSessionInfoClass GimpSessionInfoClass;
/**
* GimpSessionInfo:
*
* Contains session info for one toplevel window in the interface such
* as a dock, the empty-image-window, or the open/save dialog.
*/

2
devel-docs/app/app-sections.txt
View File

@ -905,8 +905,6 @@ GIMP_CHANNEL_GET_CLASS
<SECTION>
<FILE>gimpchannel-combine</FILE>
<TITLE>GimpChannel-combine</TITLE>
gimp_channel_add_segment
gimp_channel_sub_segment
gimp_channel_combine_rect
gimp_channel_combine_ellipse
gimp_channel_combine_ellipse_rect