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

cosmetic cleanups, renamed gimp_smudge_nonclipped_painthit_coords() to 

2006-09-13  Michael Natterer  <mitch@gimp.org>

	* app/paint/gimpsmudge.c: cosmetic cleanups, renamed
	gimp_smudge_nonclipped_painthit_coords() to
	gimp_smudge_brush_coords ().
This commit is contained in:
Michael Natterer 2006-09-13 17:32:36 +00:00 committed by Michael Natterer
parent 0fb9104817
commit d607b7da4d
2 changed files with 35 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2006-09-13 Michael Natterer <mitch@gimp.org>
* app/paint/gimpsmudge.c: cosmetic cleanups, renamed
gimp_smudge_nonclipped_painthit_coords() to
gimp_smudge_brush_coords ().
2006-09-13 Sven Neumann <sven@gimp.org> 2006-09-13 Sven Neumann <sven@gimp.org>
* app/tools/gimpcroptool.c (gimp_crop_tool_register): removed * app/tools/gimpcroptool.c (gimp_crop_tool_register): removed

58
app/paint/gimpsmudge.c
View File

@ -41,25 +41,25 @@
#include "gimp-intl.h" #include "gimp-intl.h"
static void gimp_smudge_finalize (GObject *object); static void gimp_smudge_finalize (GObject *object);
static void gimp_smudge_paint (GimpPaintCore *paint_core, static void gimp_smudge_paint (GimpPaintCore *paint_core,
GimpDrawable *drawable, GimpDrawable *drawable,
GimpPaintOptions *paint_options, GimpPaintOptions *paint_options,
GimpPaintState paint_state, GimpPaintState paint_state,
guint32 time); guint32 time);
static gboolean gimp_smudge_start (GimpPaintCore *paint_core, static gboolean gimp_smudge_start (GimpPaintCore *paint_core,
GimpDrawable *drawable, GimpDrawable *drawable,
GimpPaintOptions *paint_options); GimpPaintOptions *paint_options);
static void gimp_smudge_motion (GimpPaintCore *paint_core, static void gimp_smudge_motion (GimpPaintCore *paint_core,
GimpDrawable *drawable, GimpDrawable *drawable,
GimpPaintOptions *paint_options); GimpPaintOptions *paint_options);
static void gimp_smudge_nonclipped_painthit_coords (GimpPaintCore *paint_core, static void gimp_smudge_brush_coords (GimpPaintCore *paint_core,
gint *x, gint *x,
gint *y, gint *y,
gint *w, gint *w,
gint *h); gint *h);
G_DEFINE_TYPE (GimpSmudge, gimp_smudge, GIMP_TYPE_BRUSH_CORE) G_DEFINE_TYPE (GimpSmudge, gimp_smudge, GIMP_TYPE_BRUSH_CORE)
@ -147,8 +147,6 @@ gimp_smudge_paint (GimpPaintCore *paint_core,
default: default:
break; break;
} }
return;
} }
static gboolean static gboolean
@ -173,15 +171,15 @@ gimp_smudge_start (GimpPaintCore *paint_core,
return FALSE; return FALSE;
/* adjust the x and y coordinates to the upper left corner of the brush */ /* adjust the x and y coordinates to the upper left corner of the brush */
gimp_smudge_nonclipped_painthit_coords (paint_core, &x, &y, &w, &h); gimp_smudge_brush_coords (paint_core, &x, &y, &w, &h);
/* Allocate the accumulation buffer */ /* Allocate the accumulation buffer */
bytes = gimp_drawable_bytes (drawable); bytes = gimp_drawable_bytes (drawable);
smudge->accum_data = g_malloc (w * h * bytes); smudge->accum_data = g_malloc (w * h * bytes);
/* If clipped, prefill the smudge buffer /* If clipped, prefill the smudge buffer with the color at the
with the color at the brush position. */ * brush position.
*/
if (x != area->x || y != area->y || w != area->width || h != area->height) if (x != area->x || y != area->y || w != area->width || h != area->height)
{ {
guchar *fill; guchar *fill;
@ -191,6 +189,7 @@ gimp_smudge_start (GimpPaintCore *paint_core,
0, gimp_item_width (GIMP_ITEM (drawable)) - 1), 0, gimp_item_width (GIMP_ITEM (drawable)) - 1),
CLAMP ((gint) paint_core->cur_coords.y, CLAMP ((gint) paint_core->cur_coords.y,
0, gimp_item_height (GIMP_ITEM (drawable)) - 1)); 0, gimp_item_height (GIMP_ITEM (drawable)) - 1));
g_return_val_if_fail (fill != NULL, FALSE); g_return_val_if_fail (fill != NULL, FALSE);
pixel_region_init_data (&srcPR, smudge->accum_data, pixel_region_init_data (&srcPR, smudge->accum_data,
@ -250,7 +249,8 @@ gimp_smudge_motion (GimpPaintCore *paint_core,
if (opacity == 0.0) if (opacity == 0.0)
return; return;
gimp_smudge_nonclipped_painthit_coords (paint_core, &x, &y, &w, &h); /* Get the unclipped brush coordinates */
gimp_smudge_brush_coords (paint_core, &x, &y, &w, &h);
/* Get the paint area (Smudge won't scale!) */ /* Get the paint area (Smudge won't scale!) */
area = gimp_paint_core_get_paint_area (paint_core, drawable, paint_options); area = gimp_paint_core_get_paint_area (paint_core, drawable, paint_options);
@ -316,11 +316,11 @@ gimp_smudge_motion (GimpPaintCore *paint_core,
} }
static void static void
gimp_smudge_nonclipped_painthit_coords (GimpPaintCore *paint_core, gimp_smudge_brush_coords (GimpPaintCore *paint_core,
gint *x, gint *x,
gint *y, gint *y,
gint *w, gint *w,
gint *h) gint *h)
{ {
GimpBrushCore *brush_core = GIMP_BRUSH_CORE (paint_core); GimpBrushCore *brush_core = GIMP_BRUSH_CORE (paint_core);