diff --git a/ChangeLog b/ChangeLog index ad91aea46236da6f4ce5c2b707b985fab67c96b2..3bb9b9a71a3ffe9de88e62a275d414b9197c1318 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +Sun Jan 25 13:28:28 PST 1998 Manish Singh + + * libgimp/gimppixelrgn.c + * plug-ins/iwarp/iwarp.c + * plug-ins/sparkle/sparkle.c: Misc portability fixes for + DEC OSF1 (gimp-joke-980109-0) + Sun Jan 25 02:24:03 PST 1998 Manish Singh * libgimp/*: Placed libgimp under the LGPL diff --git a/libgimp/gimppixelrgn.c b/libgimp/gimppixelrgn.c index fc580c3dc0a6c4420f2aad082ef03cf1026d2d66..cf8a8d50532259f5fabac0df9cd34b2db842827c 100644 --- a/libgimp/gimppixelrgn.c +++ b/libgimp/gimppixelrgn.c @@ -157,7 +157,7 @@ gimp_pixel_rgn_get_row (GPixelRgn *pr, tile = gimp_drawable_get_tile2 (pr->drawable, pr->shadow, x, y); gimp_tile_ref (tile); - tile_data = tile->data + tile->bpp * (tile->ewidth * (y % TILE_HEIGHT) + (x % TILE_WIDTH)); + tile_data = tile->data + (int)tile->bpp * (int)(tile->ewidth * (int)(y % TILE_HEIGHT) + (x % TILE_WIDTH)); boundary = x + (tile->ewidth - (x % TILE_WIDTH)); bpp = tile->bpp; diff --git a/plug-ins/common/iwarp.c b/plug-ins/common/iwarp.c index 86efb49df5cee3d5aca6eab5c5716b6ccd64cff4..9a191c850d30ac2629992e901403a22f1c7b27c9 100644 --- a/plug-ins/common/iwarp.c +++ b/plug-ins/common/iwarp.c @@ -1355,21 +1355,23 @@ iwarp_motion_callback(GtkWidget *widget, int x,y; mb = (GdkEventButton*) event; - x = mb->x; - y = mb->y; switch (event->type) { case GDK_BUTTON_PRESS: - lastx = x; - lasty = y; + lastx = mb->x; + lasty = mb->y; break; case GDK_BUTTON_RELEASE: if (mb->state & GDK_BUTTON1_MASK) { + x = mb->x; + y = mb->y; if (iwarp_vals.do_move) iwarp_move(x,y,lastx,lasty); else iwarp_deform(x, y,0.0,0.0); } break; case GDK_MOTION_NOTIFY : if (mb->state & GDK_BUTTON1_MASK) { + x = mb->x; + y = mb->y; if (iwarp_vals.do_move) iwarp_move(x,y,lastx,lasty); else iwarp_deform(x, y,0.0,0.0); lastx = x; diff --git a/plug-ins/common/sparkle.c b/plug-ins/common/sparkle.c index 71f625c811644ecf2ae415dd4a70965ad6c2e944..8dea42189b25a0bbe1b2a2b1f759aac28fea9631 100644 --- a/plug-ins/common/sparkle.c +++ b/plug-ins/common/sparkle.c @@ -637,7 +637,7 @@ fspike (GPixelRgn *dest_rgn, gimp_pixel_rgn_get_pixel (dest_rgn, pixel, x, y); for (b = 0; b < bytes; b++) - val[b] = (gdouble) pixel[b] / 255.0; + val[b] = (gdouble) (gint)pixel[b] / 255.0; /* increase saturation to full for color image */ if (! gray) diff --git a/plug-ins/iwarp/iwarp.c b/plug-ins/iwarp/iwarp.c index 86efb49df5cee3d5aca6eab5c5716b6ccd64cff4..9a191c850d30ac2629992e901403a22f1c7b27c9 100644 --- a/plug-ins/iwarp/iwarp.c +++ b/plug-ins/iwarp/iwarp.c @@ -1355,21 +1355,23 @@ iwarp_motion_callback(GtkWidget *widget, int x,y; mb = (GdkEventButton*) event; - x = mb->x; - y = mb->y; switch (event->type) { case GDK_BUTTON_PRESS: - lastx = x; - lasty = y; + lastx = mb->x; + lasty = mb->y; break; case GDK_BUTTON_RELEASE: if (mb->state & GDK_BUTTON1_MASK) { + x = mb->x; + y = mb->y; if (iwarp_vals.do_move) iwarp_move(x,y,lastx,lasty); else iwarp_deform(x, y,0.0,0.0); } break; case GDK_MOTION_NOTIFY : if (mb->state & GDK_BUTTON1_MASK) { + x = mb->x; + y = mb->y; if (iwarp_vals.do_move) iwarp_move(x,y,lastx,lasty); else iwarp_deform(x, y,0.0,0.0); lastx = x; diff --git a/plug-ins/sparkle/sparkle.c b/plug-ins/sparkle/sparkle.c index 71f625c811644ecf2ae415dd4a70965ad6c2e944..8dea42189b25a0bbe1b2a2b1f759aac28fea9631 100644 --- a/plug-ins/sparkle/sparkle.c +++ b/plug-ins/sparkle/sparkle.c @@ -637,7 +637,7 @@ fspike (GPixelRgn *dest_rgn, gimp_pixel_rgn_get_pixel (dest_rgn, pixel, x, y); for (b = 0; b < bytes; b++) - val[b] = (gdouble) pixel[b] / 255.0; + val[b] = (gdouble) (gint)pixel[b] / 255.0; /* increase saturation to full for color image */ if (! gray)