From eb2a8f67089baa750bdcfc572d35a03ec52d4d6c Mon Sep 17 00:00:00 2001 From: Manish Singh Date: Sun, 29 Mar 1998 22:32:54 +0000 Subject: [PATCH] fixed improper use of types; sparkle actually works now -Yosh --- ChangeLog | 5 +++++ plug-ins/common/sparkle.c | 14 +++++--------- plug-ins/sparkle/sparkle.c | 14 +++++--------- 3 files changed, 15 insertions(+), 18 deletions(-) diff --git a/ChangeLog b/ChangeLog index 11586c9aed..0938c7effa 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Sun Mar 29 14:29:34 PST 1998 Manish Singh + + * plug-ins/sparkle/sparkle.c: fixed improper use of types; + works now + Sun Mar 29 11:47:02 EST 1998 Adrian Likins *app/brushes.c: changed gimp-brushes-refresh so diff --git a/plug-ins/common/sparkle.c b/plug-ins/common/sparkle.c index 788746a5f0..f3d38359c0 100644 --- a/plug-ins/common/sparkle.c +++ b/plug-ins/common/sparkle.c @@ -623,6 +623,7 @@ fspike (GPixelRgn *dest_rgn, gdouble theta, efac; gdouble sfac; gdouble *gd_tmp1, *gd_tmp2; + guchar *guc_tmp; GTile *tile = NULL; gint row, col; gint i; @@ -646,8 +647,8 @@ fspike (GPixelRgn *dest_rgn, gimp_pixel_rgn_get_pixel (dest_rgn, pixel, x, y); - for (b = 0, gd_tmp1 = val, gd_tmp2 = pixel; b < bytes; b++) - *gd_tmp1++ = (gdouble) (gint)(*gd_tmp2++) / 255.0; + for (b = 0, gd_tmp1 = val, guc_tmp = pixel; b < bytes; b++) + *gd_tmp1++ = (gdouble) (gint)(*guc_tmp++) / 255.0; /* increase saturation to full for color image */ if (! gray) @@ -713,11 +714,6 @@ rpnt (GDrawable *drawable, guchar *pixel; guchar *guc_tmp; gdouble *gd_tmp; - gint *oldrow; - gint *oldcol; - - oldrow = row - 1; - oldcol = col - 1; x = (int) (xr); /* integer coord. to upper left of real point */ y = (int) (yr); @@ -730,10 +726,10 @@ rpnt (GDrawable *drawable, *row = y >> 6; if (tile) gimp_tile_unref (tile, TRUE); - tile = gimp_drawable_get_tile (drawable, TRUE, - *row, *col); + tile = gimp_drawable_get_tile (drawable, TRUE, *row, *col); gimp_tile_ref (tile); } + pixel = tile->data + tile->bpp * (tile->ewidth * (y % 64) + (x % 64)); dx = xr - x; dy = yr - y; rs = dx * dx + dy * dy; diff --git a/plug-ins/sparkle/sparkle.c b/plug-ins/sparkle/sparkle.c index 788746a5f0..f3d38359c0 100644 --- a/plug-ins/sparkle/sparkle.c +++ b/plug-ins/sparkle/sparkle.c @@ -623,6 +623,7 @@ fspike (GPixelRgn *dest_rgn, gdouble theta, efac; gdouble sfac; gdouble *gd_tmp1, *gd_tmp2; + guchar *guc_tmp; GTile *tile = NULL; gint row, col; gint i; @@ -646,8 +647,8 @@ fspike (GPixelRgn *dest_rgn, gimp_pixel_rgn_get_pixel (dest_rgn, pixel, x, y); - for (b = 0, gd_tmp1 = val, gd_tmp2 = pixel; b < bytes; b++) - *gd_tmp1++ = (gdouble) (gint)(*gd_tmp2++) / 255.0; + for (b = 0, gd_tmp1 = val, guc_tmp = pixel; b < bytes; b++) + *gd_tmp1++ = (gdouble) (gint)(*guc_tmp++) / 255.0; /* increase saturation to full for color image */ if (! gray) @@ -713,11 +714,6 @@ rpnt (GDrawable *drawable, guchar *pixel; guchar *guc_tmp; gdouble *gd_tmp; - gint *oldrow; - gint *oldcol; - - oldrow = row - 1; - oldcol = col - 1; x = (int) (xr); /* integer coord. to upper left of real point */ y = (int) (yr); @@ -730,10 +726,10 @@ rpnt (GDrawable *drawable, *row = y >> 6; if (tile) gimp_tile_unref (tile, TRUE); - tile = gimp_drawable_get_tile (drawable, TRUE, - *row, *col); + tile = gimp_drawable_get_tile (drawable, TRUE, *row, *col); gimp_tile_ref (tile); } + pixel = tile->data + tile->bpp * (tile->ewidth * (y % 64) + (x % 64)); dx = xr - x; dy = yr - y; rs = dx * dx + dy * dy;