Commit 593043a1 authored by Michael Natterer's avatar Michael Natterer 😴 Committed by Michael Natterer
Browse files

fixed a FIXME: set the sensitivity of the color tools' menu entries again.

2001-06-14  Michael Natterer  <mitch@gimp.org>

	* app/gdisplay.c: fixed a FIXME: set the sensitivity of the
	color tools' menu entries again.

	* libgimp/gimpcolorselector.h
	* libgimp/gimpdrawable.h
	* libgimp/gimpmenu.h: removed the usage of "id" from the public
	interface because it's a reserved keyword of Objective C.

	* libgimp/gimpdrawable.c
	* libgimp/gimptile.c

	* plug-ins/[lotsa plugins].c: changed accordingly.
parent 1564c5fd
2001-06-14 Michael Natterer <mitch@gimp.org>
* app/gdisplay.c: fixed a FIXME: set the sensitivity of the
color tools' menu entries again.
* libgimp/gimpcolorselector.h
* libgimp/gimpdrawable.h
* libgimp/gimpmenu.h: removed the usage of "id" from the public
interface because it's a reserved keyword of Objective C.
* libgimp/gimpdrawable.c
* libgimp/gimptile.c
* plug-ins/[lotsa plugins].c: changed accordingly.
2001-06-14 Sven Neumann <sven@gimp.org>
* app/tools/gimpmeasuretool.c: fixed typo, closes bug #56200.
......
......@@ -2040,26 +2040,18 @@ gdisplay_set_menu_sensitivity (GDisplay *gdisp)
SET_SENSITIVE ("Image/Mode/RGB", (base_type != RGB));
SET_SENSITIVE ("Image/Mode/Grayscale", (base_type != GRAY));
SET_SENSITIVE ("Image/Mode/Indexed...", (base_type != INDEXED));
#ifdef __GNUC__
#warning FIXME (set_menu_sensitivity)
#endif
#if 0
SET_SENSITIVE ("Image/Histogram...", lp);
#endif
SET_SENSITIVE ("Image/Colors", lp);
#if 0
SET_SENSITIVE ("Image/Colors/Color Balance...", (base_type == RGB));
SET_SENSITIVE ("Image/Colors/Hue-Saturation...", (base_type == RGB));
SET_SENSITIVE ("Image/Colors/Brightness-Contrast...", (base_type != INDEXED));
SET_SENSITIVE ("Image/Colors/Threshold...", (base_type != INDEXED));
SET_SENSITIVE ("Image/Colors/Levels...", (base_type != INDEXED));
SET_SENSITIVE ("Image/Colors/Curves...", (base_type != INDEXED));
#endif
SET_SENSITIVE ("Image/Colors/Desaturate", (base_type == RGB));
#if 0
SET_SENSITIVE ("Image/Colors/Posterize...", (base_type != INDEXED));
#endif
SET_SENSITIVE ("Image/Colors/Invert", (base_type != INDEXED));
SET_SENSITIVE ("Image/Colors/Auto/Equalize", (base_type != INDEXED));
......
......@@ -2040,26 +2040,18 @@ gdisplay_set_menu_sensitivity (GDisplay *gdisp)
SET_SENSITIVE ("Image/Mode/RGB", (base_type != RGB));
SET_SENSITIVE ("Image/Mode/Grayscale", (base_type != GRAY));
SET_SENSITIVE ("Image/Mode/Indexed...", (base_type != INDEXED));
#ifdef __GNUC__
#warning FIXME (set_menu_sensitivity)
#endif
#if 0
SET_SENSITIVE ("Image/Histogram...", lp);
#endif
SET_SENSITIVE ("Image/Colors", lp);
#if 0
SET_SENSITIVE ("Image/Colors/Color Balance...", (base_type == RGB));
SET_SENSITIVE ("Image/Colors/Hue-Saturation...", (base_type == RGB));
SET_SENSITIVE ("Image/Colors/Brightness-Contrast...", (base_type != INDEXED));
SET_SENSITIVE ("Image/Colors/Threshold...", (base_type != INDEXED));
SET_SENSITIVE ("Image/Colors/Levels...", (base_type != INDEXED));
SET_SENSITIVE ("Image/Colors/Curves...", (base_type != INDEXED));
#endif
SET_SENSITIVE ("Image/Colors/Desaturate", (base_type == RGB));
#if 0
SET_SENSITIVE ("Image/Colors/Posterize...", (base_type != INDEXED));
#endif
SET_SENSITIVE ("Image/Colors/Invert", (base_type != INDEXED));
SET_SENSITIVE ("Image/Colors/Auto/Equalize", (base_type != INDEXED));
......
......@@ -2040,26 +2040,18 @@ gdisplay_set_menu_sensitivity (GDisplay *gdisp)
SET_SENSITIVE ("Image/Mode/RGB", (base_type != RGB));
SET_SENSITIVE ("Image/Mode/Grayscale", (base_type != GRAY));
SET_SENSITIVE ("Image/Mode/Indexed...", (base_type != INDEXED));
#ifdef __GNUC__
#warning FIXME (set_menu_sensitivity)
#endif
#if 0
SET_SENSITIVE ("Image/Histogram...", lp);
#endif
SET_SENSITIVE ("Image/Colors", lp);
#if 0
SET_SENSITIVE ("Image/Colors/Color Balance...", (base_type == RGB));
SET_SENSITIVE ("Image/Colors/Hue-Saturation...", (base_type == RGB));
SET_SENSITIVE ("Image/Colors/Brightness-Contrast...", (base_type != INDEXED));
SET_SENSITIVE ("Image/Colors/Threshold...", (base_type != INDEXED));
SET_SENSITIVE ("Image/Colors/Levels...", (base_type != INDEXED));
SET_SENSITIVE ("Image/Colors/Curves...", (base_type != INDEXED));
#endif
SET_SENSITIVE ("Image/Colors/Desaturate", (base_type == RGB));
#if 0
SET_SENSITIVE ("Image/Colors/Posterize...", (base_type != INDEXED));
#endif
SET_SENSITIVE ("Image/Colors/Invert", (base_type != INDEXED));
SET_SENSITIVE ("Image/Colors/Auto/Equalize", (base_type != INDEXED));
......
......@@ -92,7 +92,7 @@ gimp_color_selector_register (const gchar *name,
G_MODULE_EXPORT
gboolean
gimp_color_selector_unregister (GimpColorSelectorID id,
gimp_color_selector_unregister (GimpColorSelectorID selector_id,
GimpColorSelectorFinishedCB finished_cb,
gpointer finished_data);
......
......@@ -38,7 +38,7 @@ gimp_drawable_get (gint32 drawable_ID)
GimpDrawable *drawable;
drawable = g_new (GimpDrawable, 1);
drawable->id = drawable_ID;
drawable->drawable_id = drawable_ID;
drawable->width = gimp_drawable_width (drawable_ID);
drawable->height = gimp_drawable_height (drawable_ID);
drawable->bpp = gimp_drawable_bpp (drawable_ID);
......@@ -100,10 +100,10 @@ gimp_drawable_delete (GimpDrawable *drawable)
{
if (drawable)
{
if (gimp_drawable_is_layer (drawable->id))
gimp_layer_delete (drawable->id);
if (gimp_drawable_is_layer (drawable->drawable_id))
gimp_layer_delete (drawable->drawable_id);
else
gimp_channel_delete (drawable->id);
gimp_channel_delete (drawable->drawable_id);
}
}
......
......@@ -34,7 +34,7 @@ extern "C" {
struct _GimpDrawable
{
gint32 id; /* drawable ID */
gint32 drawable_id; /* drawable ID */
guint width; /* width of drawble */
guint height; /* height of drawble */
guint bpp; /* bytes per pixel of drawable */
......
......@@ -30,7 +30,7 @@ extern "C" {
typedef gint (* GimpConstraintFunc) (gint32 image_id,
gint32 drawable_id,
gpointer data);
typedef void (* GimpMenuCallback) (gint32 id,
typedef void (* GimpMenuCallback) (gint32 any_id,
gpointer data);
......
......@@ -155,7 +155,7 @@ gimp_tile_get (GimpTile *tile)
GPTileData *tile_data;
WireMessage msg;
tile_req.drawable_ID = tile->drawable->id;
tile_req.drawable_ID = tile->drawable->drawable_id;
tile_req.tile_num = tile->tile_num;
tile_req.shadow = tile->shadow;
if (!gp_tile_req_write (_writechannel, &tile_req))
......@@ -164,7 +164,7 @@ gimp_tile_get (GimpTile *tile)
gimp_read_expect_msg(&msg,GP_TILE_DATA);
tile_data = msg.data;
if ((tile_data->drawable_ID != tile->drawable->id) ||
if ((tile_data->drawable_ID != tile->drawable->drawable_id) ||
(tile_data->tile_num != tile->tile_num) ||
(tile_data->shadow != tile->shadow) ||
(tile_data->width != tile->ewidth) ||
......@@ -213,7 +213,7 @@ gimp_tile_put (GimpTile *tile)
tile_info = msg.data;
tile_data.drawable_ID = tile->drawable->id;
tile_data.drawable_ID = tile->drawable->drawable_id;
tile_data.tile_num = tile->tile_num;
tile_data.shadow = tile->shadow;
tile_data.bpp = tile->bpp;
......
......@@ -252,11 +252,12 @@ run (gchar *name,
tile_width = gimp_tile_width ();
tile_height = gimp_tile_height ();
img_width = gimp_drawable_width (drawable->id);
img_height = gimp_drawable_height (drawable->id);
img_bpp = gimp_drawable_bpp(drawable->id);
img_width = gimp_drawable_width (drawable->drawable_id);
img_height = gimp_drawable_height (drawable->drawable_id);
img_bpp = gimp_drawable_bpp (drawable->drawable_id);
gimp_drawable_mask_bounds (drawable->id, &sel_x1, &sel_y1, &sel_x2, &sel_y2);
gimp_drawable_mask_bounds (drawable->drawable_id,
&sel_x1, &sel_y1, &sel_x2, &sel_y2);
sel_width = sel_x2 - sel_x1;
sel_height = sel_y2 - sel_y1;
......@@ -346,7 +347,7 @@ run (gchar *name,
if (status == GIMP_PDB_SUCCESS)
{
/* Make sure that the drawable is indexed or RGB color */
if (gimp_drawable_is_rgb(drawable->id))
if (gimp_drawable_is_rgb (drawable->drawable_id))
{
gimp_progress_init (_("Rendering Fractal..."));
......@@ -399,7 +400,7 @@ explorer (GimpDrawable * drawable)
* need to be done for correct operation. (It simply makes it go
* faster, since fewer pixels need to be operated on).
*/
gimp_drawable_mask_bounds (drawable->id, &x1, &y1, &x2, &y2);
gimp_drawable_mask_bounds (drawable->drawable_id, &x1, &y1, &x2, &y2);
/* Get the size of the input image. (This will/must be the same
* as the size of the output image.
......@@ -440,8 +441,8 @@ explorer (GimpDrawable * drawable)
/* update the processed region */
gimp_drawable_flush (drawable);
gimp_drawable_merge_shadow (drawable->id, TRUE);
gimp_drawable_update (drawable->id, x1, y1, (x2 - x1), (y2 - y1));
gimp_drawable_merge_shadow (drawable->drawable_id, TRUE);
gimp_drawable_update (drawable->drawable_id, x1, y1, (x2 - x1), (y2 - y1));
g_free (src_row);
g_free (dest_row);
......
......@@ -66,7 +66,7 @@ compute_image (void)
if (mapvals.create_new_image == TRUE ||
(mapvals.transparent_background == TRUE &&
! gimp_drawable_has_alpha (input_drawable->id)))
! gimp_drawable_has_alpha (input_drawable->drawable_id)))
{
/* Create a new image */
/* ================== */
......@@ -124,8 +124,8 @@ compute_image (void)
gimp_pixel_rgn_init (&dest_region, output_drawable,
0, 0, width, height, TRUE, TRUE);
obpp = gimp_drawable_bpp (output_drawable->id);
has_alpha = gimp_drawable_has_alpha (output_drawable->id);
obpp = gimp_drawable_bpp (output_drawable->drawable_id);
has_alpha = gimp_drawable_has_alpha (output_drawable->drawable_id);
row = g_new (guchar, obpp * width);
......@@ -172,8 +172,8 @@ compute_image (void)
/* ============ */
gimp_drawable_flush (output_drawable);
gimp_drawable_merge_shadow (output_drawable->id, TRUE);
gimp_drawable_update (output_drawable->id, 0, 0, width, height);
gimp_drawable_merge_shadow (output_drawable->drawable_id, TRUE);
gimp_drawable_update (output_drawable->drawable_id, 0, 0, width, height);
if (new_image_id!=-1)
{
......
......@@ -345,7 +345,7 @@ image_setup (GimpDrawable *drawable,
input_drawable = drawable;
output_drawable = drawable;
gimp_drawable_mask_bounds (drawable->id,
gimp_drawable_mask_bounds (drawable->drawable_id,
&border_x1, &border_y1, &border_x2, &border_y2);
width = input_drawable->width;
......@@ -360,7 +360,7 @@ image_setup (GimpDrawable *drawable,
/* =================== */
in_channels = 3;
if (gimp_drawable_has_alpha (input_drawable->id) == TRUE)
if (gimp_drawable_has_alpha (input_drawable->drawable_id) == TRUE)
in_channels++;
if (interactive == TRUE)
......
......@@ -214,7 +214,7 @@ run (gchar *name,
drawable = gimp_drawable_get (param[2].data.d_drawable);
mapvals.drawable_id = drawable->id;
mapvals.drawable_id = drawable->drawable_id;
check_drawables ();
......@@ -223,7 +223,7 @@ run (gchar *name,
/* Make sure that the drawable is RGBA or RGB color */
/* ================================================ */
if (gimp_drawable_is_rgb (drawable->id))
if (gimp_drawable_is_rgb (drawable->drawable_id))
{
/* Set the tile cache size */
/* ======================= */
......
......@@ -316,8 +316,8 @@ compute_image (void)
/* ================= */
gimp_drawable_flush (output_drawable);
gimp_drawable_merge_shadow (output_drawable->id, TRUE);
gimp_drawable_update (output_drawable->id, 0, 0, width, height);
gimp_drawable_merge_shadow (output_drawable->drawable_id, TRUE);
gimp_drawable_update (output_drawable->drawable_id, 0, 0, width, height);
if (new_image_id != -1)
{
......
......@@ -90,7 +90,7 @@ peek_box_image (gint image,
if (box_drawables[image]->bpp == 4)
{
if (gimp_drawable_has_alpha (box_drawables[image]->id))
if (gimp_drawable_has_alpha (box_drawables[image]->drawable_id))
color.a = (gdouble) (data[3]) / 255.0;
else
color.a = 1.0;
......@@ -120,7 +120,7 @@ peek_cylinder_image (gint image,
if (cylinder_drawables[image]->bpp == 4)
{
if (gimp_drawable_has_alpha (cylinder_drawables[image]->id))
if (gimp_drawable_has_alpha (cylinder_drawables[image]->drawable_id))
color.a = (gdouble) (data[3]) / 255.0;
else
color.a = 1.0;
......@@ -360,7 +360,7 @@ image_setup (GimpDrawable *drawable,
input_drawable = drawable;
output_drawable = drawable;
gimp_drawable_mask_bounds (drawable->id,
gimp_drawable_mask_bounds (drawable->drawable_id,
&border_x1, &border_y1, &border_x2, &border_y2);
width = input_drawable->width;
......@@ -385,7 +385,7 @@ image_setup (GimpDrawable *drawable,
/* =================== */
in_channels = 3;
if (gimp_drawable_has_alpha (input_drawable->id) == TRUE)
if (gimp_drawable_has_alpha (input_drawable->drawable_id) == TRUE)
in_channels++;
if (interactive == TRUE)
......
......@@ -115,12 +115,12 @@ check_drawables (GimpDrawable *drawable)
for (i = 0; i < 6; i++)
{
if (mapvals.boxmap_id[i] == -1)
mapvals.boxmap_id[i] = drawable->id;
mapvals.boxmap_id[i] = drawable->drawable_id;
else if (mapvals.boxmap_id[i] != -1 &&
gimp_drawable_image_id (mapvals.boxmap_id[i]) == -1)
mapvals.boxmap_id[i] = drawable->id;
mapvals.boxmap_id[i] = drawable->drawable_id;
else if (gimp_drawable_is_gray (mapvals.boxmap_id[i]))
mapvals.boxmap_id[i] = drawable->id;
mapvals.boxmap_id[i] = drawable->drawable_id;
}
/* Check that cylindermap images are valid */
......@@ -129,12 +129,12 @@ check_drawables (GimpDrawable *drawable)
for (i = 0; i < 2; i++)
{
if (mapvals.cylindermap_id[i] == -1)
mapvals.cylindermap_id[i] = drawable->id;
mapvals.cylindermap_id[i] = drawable->drawable_id;
else if (mapvals.cylindermap_id[i]!=-1 &&
gimp_drawable_image_id (mapvals.cylindermap_id[i]) == -1)
mapvals.cylindermap_id[i] = drawable->id;
mapvals.cylindermap_id[i] = drawable->drawable_id;
else if (gimp_drawable_is_gray (mapvals.cylindermap_id[i]))
mapvals.cylindermap_id[i] = drawable->id;
mapvals.cylindermap_id[i] = drawable->drawable_id;
}
}
......@@ -322,11 +322,11 @@ run (gchar *name,
for (i = 0; i < 6; i++)
mapvals.boxmap_id[i] =
gimp_drawable_get (param[41+i].data.d_drawable)->id;
gimp_drawable_get (param[41+i].data.d_drawable)->drawable_id;
for (i = 0; i < 2; i++)
mapvals.cylindermap_id[i] =
gimp_drawable_get (param[47+i].data.d_drawable)->id;
gimp_drawable_get (param[47+i].data.d_drawable)->drawable_id;
check_drawables (drawable);
image_setup (drawable, FALSE);
......
......@@ -1069,11 +1069,12 @@ run (char *name,
tile_width = gimp_tile_width();
tile_height = gimp_tile_height();
img_width = gimp_drawable_width(drawable->id);
img_height = gimp_drawable_height(drawable->id);
img_bpp = gimp_drawable_bpp(drawable->id);
img_width = gimp_drawable_width(drawable->drawable_id);
img_height = gimp_drawable_height(drawable->drawable_id);
img_bpp = gimp_drawable_bpp(drawable->drawable_id);
gimp_drawable_mask_bounds(drawable->id, &sel_x1, &sel_y1, &sel_x2, &sel_y2);
gimp_drawable_mask_bounds(drawable->drawable_id,
&sel_x1, &sel_y1, &sel_x2, &sel_y2);
sel_width = sel_x2 - sel_x1;
sel_height = sel_y2 - sel_y1;
......@@ -1157,7 +1158,7 @@ run (char *name,
if (status == GIMP_PDB_SUCCESS)
{
/* Make sure that the drawable is indexed or RGB color */
if (gimp_drawable_is_rgb (drawable->id))
if (gimp_drawable_is_rgb (drawable->drawable_id))
{
gimp_progress_init (_("AlienMap: Transforming..."));
......@@ -1280,7 +1281,7 @@ alienmap (GimpDrawable *drawable)
* need to be done for correct operation. (It simply makes it go
* faster, since fewer pixels need to be operated on).
*/
gimp_drawable_mask_bounds (drawable->id, &x1, &y1, &x2, &y2);
gimp_drawable_mask_bounds (drawable->drawable_id, &x1, &y1, &x2, &y2);
/* Get the size of the input image. (This will/must be the same
* as the size of the output image.
......@@ -1321,8 +1322,8 @@ alienmap (GimpDrawable *drawable)
/* update the processed region */
gimp_drawable_flush (drawable);
gimp_drawable_merge_shadow (drawable->id, TRUE);
gimp_drawable_update (drawable->id, x1, y1, (x2 - x1), (y2 - y1));
gimp_drawable_merge_shadow (drawable->drawable_id, TRUE);
gimp_drawable_update (drawable->drawable_id, x1, y1, (x2 - x1), (y2 - y1));
free (src_row);
free (dest_row);
......
......@@ -1064,11 +1064,12 @@ run (char *name,
tile_width = gimp_tile_width();
tile_height = gimp_tile_height();
img_width = gimp_drawable_width(drawable->id);
img_height = gimp_drawable_height(drawable->id);
img_bpp = gimp_drawable_bpp(drawable->id);
img_width = gimp_drawable_width(drawable->drawable_id);
img_height = gimp_drawable_height(drawable->drawable_id);
img_bpp = gimp_drawable_bpp(drawable->drawable_id);
gimp_drawable_mask_bounds(drawable->id, &sel_x1, &sel_y1, &sel_x2, &sel_y2);
gimp_drawable_mask_bounds(drawable->drawable_id,
&sel_x1, &sel_y1, &sel_x2, &sel_y2);
sel_width = sel_x2 - sel_x1;
sel_height = sel_y2 - sel_y1;
......@@ -1156,7 +1157,7 @@ run (char *name,
if (status == GIMP_PDB_SUCCESS)
{
/* Make sure that the drawable is indexed or RGB_MODEL color */
if (gimp_drawable_is_rgb (drawable->id))
if (gimp_drawable_is_rgb (drawable->drawable_id))
{
gimp_progress_init (_("AlienMap2: Transforming..."));
......@@ -1277,7 +1278,7 @@ alienmap2 (GimpDrawable *drawable)
* need to be done for correct operation. (It simply makes it go
* faster, since fewer pixels need to be operated on).
*/
gimp_drawable_mask_bounds (drawable->id, &x1, &y1, &x2, &y2);
gimp_drawable_mask_bounds (drawable->drawable_id, &x1, &y1, &x2, &y2);
/* Get the size of the input image. (This will/must be the same
* as the size of the output image.
......@@ -1313,8 +1314,8 @@ alienmap2 (GimpDrawable *drawable)
/* update the processed region */
gimp_drawable_flush (drawable);
gimp_drawable_merge_shadow (drawable->id, TRUE);
gimp_drawable_update (drawable->id, x1, y1, (x2 - x1), (y2 - y1));
gimp_drawable_merge_shadow (drawable->drawable_id, TRUE);
gimp_drawable_update (drawable->drawable_id, x1, y1, (x2 - x1), (y2 - y1));
free (src_row);
free (dest_row);
......
......@@ -861,8 +861,8 @@ CML_main_function (gint preview_p)
{
gimp_progress_update (1.0);
gimp_drawable_flush (drawable);
gimp_drawable_merge_shadow (drawable->id, TRUE);
gimp_drawable_update (drawable->id, x1, y1, (x2 - x1), (y2 - y1));
gimp_drawable_merge_shadow (drawable->drawable_id, TRUE);
gimp_drawable_update (drawable->drawable_id, x1, y1, (x2 - x1), (y2 - y1));
gimp_drawable_detach (drawable);
}
......
......@@ -977,11 +977,11 @@ render_frame (gint32 whichframe)
/* Image has been closed/etc since we got the layer list? */
/* FIXME - How do we tell if a gimp_drawable_get() fails? */
if (gimp_drawable_width(drawable->id)==0)
if (gimp_drawable_width(drawable->drawable_id)==0)
window_close_callback (NULL, NULL);
if (((dispose==DISPOSE_REPLACE)||(whichframe==0)) &&
gimp_drawable_has_alpha(drawable->id))
gimp_drawable_has_alpha(drawable->drawable_id))
{
total_alpha_preview(preview_data);
}
......@@ -992,19 +992,19 @@ render_frame (gint32 whichframe)
if ((rawwidth*rawheight*rawbpp)
!=
((gimp_drawable_width(drawable->id)*
gimp_drawable_height(drawable->id)*
gimp_drawable_bpp(drawable->id))))
((gimp_drawable_width(drawable->drawable_id)*
gimp_drawable_height(drawable->drawable_id)*
gimp_drawable_bpp(drawable->drawable_id))))
{
if (rawframe != NULL) g_free(rawframe);
rawframe = g_malloc((gimp_drawable_width(drawable->id)) *
(gimp_drawable_height(drawable->id)) *
(gimp_drawable_bpp(drawable->id)));
rawframe = g_malloc((gimp_drawable_width(drawable->drawable_id)) *
(gimp_drawable_height(drawable->drawable_id)) *
(gimp_drawable_bpp(drawable->drawable_id)));
}
rawwidth = gimp_drawable_width(drawable->id);
rawheight = gimp_drawable_height(drawable->id);
rawbpp = gimp_drawable_bpp(drawable->id);
rawwidth = gimp_drawable_width(drawable->drawable_id);
rawheight = gimp_drawable_height(drawable->drawable_id);
rawbpp = gimp_drawable_bpp(drawable->drawable_id);
/* Initialise and fetch the whole raw new frame */
......@@ -1021,7 +1021,7 @@ render_frame (gint32 whichframe)
drawable->width, drawable->height);
/* gimp_pixel_rgns_register (1, &pixel_rgn);*/
gimp_drawable_offsets (drawable->id,
gimp_drawable_offsets (drawable->drawable_id,
&rawx,
&rawy);
......@@ -1040,7 +1040,7 @@ render_frame (gint32 whichframe)
/* --- which this frame is the same size and position --- */
/* --- as the preview buffer itself --- */
if (gimp_drawable_has_alpha (drawable->id))
if (gimp_drawable_has_alpha (drawable->drawable_id))
{ /* alpha */
destptr = preview_data;
srcptr = rawframe;
......@@ -1138,7 +1138,7 @@ render_frame (gint32 whichframe)
/* --- this frame is bigger/smaller than the preview --- */
/* --- buffer, and/or offset within it. --- */
if (gimp_drawable_has_alpha (drawable->id))
if (gimp_drawable_has_alpha (drawable->drawable_id))
{ /* alpha */
srcptr = rawframe;
......@@ -1313,7 +1313,7 @@ render_frame (gint32 whichframe)
/* --- which this frame is the same size and position --- */
/* --- as the preview buffer itself --- */
if (gimp_drawable_has_alpha (drawable->id))
if (gimp_drawable_has_alpha (drawable->drawable_id))
{ /* alpha */
destptr = preview_data;
srcptr = rawframe;
......@@ -1417,7 +1417,7 @@ render_frame (gint32 whichframe)
/* --- this frame is bigger/smaller than the preview --- */
/* --- buffer, and/or offset within it. --- */
if (gimp_drawable_has_alpha (drawable->id))
if (gimp_drawable_has_alpha (drawable->drawable_id))
{ /* alpha */
srcptr = rawframe;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment