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

app: gimp_gegl_convolve() rename parameter "matrix" to "kernel"

Browse Source
This commit is contained in:
Michael Natterer
2012-04-04 14:05:56 +02:00
parent 2b2315deea
commit 2ea74df523
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/gegl/gimp-gegl-loops.c
View File

@ -34,8 +34,8 @@ gimp_gegl_convolve (GeglBuffer *src_buffer,
const GeglRectangle *src_rect, const GeglRectangle *src_rect,
GeglBuffer *dest_buffer, GeglBuffer *dest_buffer,
const GeglRectangle *dest_rect, const GeglRectangle *dest_rect,
const gfloat *matrix, const gfloat *kernel,
gint size, gint kernel_size,
gdouble divisor, gdouble divisor,
GimpConvolutionType mode, GimpConvolutionType mode,
gboolean alpha_weighting) gboolean alpha_weighting)
@ -64,7 +64,7 @@ gimp_gegl_convolve (GeglBuffer *src_buffer,
while (gegl_buffer_iterator_next (iter)) while (gegl_buffer_iterator_next (iter))
{ {
/* Convolve the src image using the convolution matrix, writing /* Convolve the src image using the convolution kernel, writing
* to dest Convolve is not tile-enabled--use accordingly * to dest Convolve is not tile-enabled--use accordingly
*/ */
const guchar *src = iter->data[0]; const guchar *src = iter->data[0];
@ -72,7 +72,7 @@ gimp_gegl_convolve (GeglBuffer *src_buffer,
const gint bytes = src_bpp; const gint bytes = src_bpp;
const gint a_byte = bytes - 1; const gint a_byte = bytes - 1;
const gint rowstride = src_bpp * src_roi->width; const gint rowstride = src_bpp * src_roi->width;
const gint margin = size / 2; const gint margin = kernel_size / 2;
const gint x1 = src_roi->x; const gint x1 = src_roi->x;
const gint y1 = src_roi->y; const gint y1 = src_roi->y;
const gint x2 = src_roi->x + src_roi->width - 1; const gint x2 = src_roi->x + src_roi->width - 1;
@ -99,7 +99,7 @@ gimp_gegl_convolve (GeglBuffer *src_buffer,
{ {
for (x = 0; x < dest_roi->width; x++) for (x = 0; x < dest_roi->width; x++)
{ {
const gfloat *m = matrix; const gfloat *m = kernel;
gdouble total[4] = { 0.0, 0.0, 0.0, 0.0 }; gdouble total[4] = { 0.0, 0.0, 0.0, 0.0 };
gdouble weighted_divisor = 0.0; gdouble weighted_divisor = 0.0;
gint i, j, b; gint i, j, b;
@ -153,7 +153,7 @@ gimp_gegl_convolve (GeglBuffer *src_buffer,
{ {
for (x = 0; x < dest_roi->width; x++) for (x = 0; x < dest_roi->width; x++)
{ {
const gfloat *m = matrix; const gfloat *m = kernel;
gdouble total[4] = { 0.0, 0.0, 0.0, 0.0 }; gdouble total[4] = { 0.0, 0.0, 0.0, 0.0 };
gint i, j, b; gint i, j, b;

4
app/gegl/gimp-gegl-loops.h
View File

@ -29,8 +29,8 @@ void gimp_gegl_convolve (GeglBuffer *src_buffer,
const GeglRectangle *src_rect, const GeglRectangle *src_rect,
GeglBuffer *dest_buffer, GeglBuffer *dest_buffer,
const GeglRectangle *dest_rect, const GeglRectangle *dest_rect,
const gfloat *matrix, const gfloat *kernel,
gint size, gint kernel_size,
gdouble divisor, gdouble divisor,
GimpConvolutionType mode, GimpConvolutionType mode,
gboolean alpha_weighting); gboolean alpha_weighting);