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

minor patch from David Hodson <hodsond@ozemail.com.au> to fix off-by-one 

2000-10-21  Austin Donnelly  <austin@gimp.org>

	* plug-ins/common/nlfilt.c: minor patch from David Hodson
	    <hodsond@ozemail.com.au> to fix off-by-one error in previous fix.

    	* AUTHORS
	* app/authors.h
	* tools/authorsgen/contributors: Add the prolific David Hodson
	    to the authors list.
This commit is contained in:
Austin Donnelly 2000-10-21 13:15:55 +00:00 committed by Austin Donnelly
parent 29e26b10e5
commit d37667433d
5 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
AUTHORS
View File

@ -71,6 +71,7 @@ Henrik Hansen
Ville Hautamaki Ville Hautamaki
James Henstridge James Henstridge
Eric Hernes Eric Hernes
David Hodson
Christoph Hoegl Christoph Hoegl
Wolfgang Hofer Wolfgang Hofer
Jan Hubicka Jan Hubicka

10
ChangeLog
View File

@ -1,3 +1,13 @@
2000-10-21 Austin Donnelly <austin@gimp.org>
* plug-ins/common/nlfilt.c: minor patch from David Hodson
<hodsond@ozemail.com.au> to fix off-by-one error in previous fix.
* AUTHORS
* app/authors.h
* tools/authorsgen/contributors: Add the prolific David Hodson
to the authors list.
2000-10-19 Seth Burgess <sjburges@gimp.org> 2000-10-19 Seth Burgess <sjburges@gimp.org>
* plug-ins/common/xbm.c : oops, should have compiled it before * plug-ins/common/xbm.c : oops, should have compiled it before

1
app/authors.h
View File

@ -66,6 +66,7 @@ static gchar *authors[] =
#endif #endif
"James Henstridge", "James Henstridge",
"Eric Hernes", "Eric Hernes",
"David Hodson",
"Christoph Hoegl", "Christoph Hoegl",
"Wolfgang Hofer", "Wolfgang Hofer",
"Jan Hubicka", "Jan Hubicka",

11
plug-ins/common/nlfilt.c
View File

@ -264,7 +264,7 @@ pluginCore (struct piArgs *argp)
gimp_pixel_rgn_init (&srcPr, drw, 0, 0, width, height, FALSE, FALSE); gimp_pixel_rgn_init (&srcPr, drw, 0, 0, width, height, FALSE, FALSE);
gimp_pixel_rgn_init (&dstPr, drw, 0, 0, width, height, TRUE, TRUE); gimp_pixel_rgn_init (&dstPr, drw, 0, 0, width, height, TRUE, TRUE);
/* source buffer gives one pixel buffer around current row */ /* source buffer gives one pixel margin all around destination buffer */
srcbuf = g_new0 (guchar, exrowsize * 3); srcbuf = g_new0 (guchar, exrowsize * 3);
dstbuf = g_new0 (guchar, rowsize); dstbuf = g_new0 (guchar, rowsize);
@ -278,9 +278,11 @@ pluginCore (struct piArgs *argp)
/* first row */ /* first row */
gimp_pixel_rgn_get_row (&srcPr, thisrow, 0, 0, width); gimp_pixel_rgn_get_row (&srcPr, thisrow, 0, 0, width);
/* copy thisrow[0] to thisrow[-1], thisrow[width-1] to thisrow[width] */
memcpy (thisrow - Bpp, thisrow, Bpp); memcpy (thisrow - Bpp, thisrow, Bpp);
memcpy (thisrow + rowsize, thisrow + rowsize - Bpp, Bpp); memcpy (thisrow + rowsize, thisrow + rowsize - Bpp, Bpp);
memcpy (lastrow, thisrow, exrowsize); /* copy whole thisrow to lastrow */
memcpy (lastrow - Bpp, thisrow - Bpp, exrowsize);
for (y = 0; y < height - 1; y++) for (y = 0; y < height - 1; y++)
{ {
@ -292,6 +294,7 @@ pluginCore (struct piArgs *argp)
memcpy (nextrow + rowsize, nextrow + rowsize - Bpp, Bpp); memcpy (nextrow + rowsize, nextrow + rowsize - Bpp, Bpp);
nlfiltRow (lastrow, thisrow, nextrow, dstbuf, width, Bpp, filtno); nlfiltRow (lastrow, thisrow, nextrow, dstbuf, width, Bpp, filtno);
gimp_pixel_rgn_set_row (&dstPr, dstbuf, 0, y, width); gimp_pixel_rgn_set_row (&dstPr, dstbuf, 0, y, width);
/* rotate row buffers */
temprow = lastrow; lastrow = thisrow; temprow = lastrow; lastrow = thisrow;
thisrow = nextrow; nextrow = temprow; thisrow = nextrow; nextrow = temprow;
} }
@ -713,6 +716,10 @@ gint noisevariance; /* global so that pixel processing code can get at it q
#define RUNSCALE(x) (((x) + (1 << (SCALEB-1))) >> SCALEB) /* rounded un-scale */ #define RUNSCALE(x) (((x) + (1 << (SCALEB-1))) >> SCALEB) /* rounded un-scale */
#define UNSCALE(x) ((x) >> SCALEB) #define UNSCALE(x) ((x) >> SCALEB)
/* Note: modified by David Hodson, nlfiltRow now accesses
* srclast, srcthis, and srcnext from [-Bpp] to [width*Bpp-1].
* Beware if you use this code anywhere else!
*/
static void static void
nlfiltRow(guchar *srclast, guchar *srcthis, guchar *srcnext, guchar *dst, nlfiltRow(guchar *srclast, guchar *srcthis, guchar *srcnext, guchar *dst,
gint width, gint Bpp, gint filtno) { gint width, gint Bpp, gint filtno) {

1
tools/authorsgen/contributors
View File

@ -68,6 +68,7 @@ Henrik Hansen
Ville Hautamaki [Ville Hautamäki] Ville Hautamaki [Ville Hautamäki]
James Henstridge James Henstridge
Eric Hernes Eric Hernes
David Hodson
Christoph Hoegl Christoph Hoegl
Wolfgang Hofer Wolfgang Hofer
Jan Hubicka Jan Hubicka