app/core/gimpchannel.h app/core/gimpitem.c

2003-01-14  Manish Singh  <yosh@gimp.org>

        * app/core/gimpchannel.h
        * app/core/gimpitem.c
        * app/display/gimpnavigationview.c
        * app/gui/paths-dialog.c
        * app/tools/gimphistogramtool.c
        * app/tools/gimpscaletool.c
        * app/widgets/gimplistitem.c
        * libgimp/gimppixelrgn.c
        * libgimpwidgets/gimpunitmenu.c
        * plug-ins/FractalExplorer/Dialogs.c
        * plug-ins/common/aa.c
        * plug-ins/common/despeckle.c
        * plug-ins/common/psd.c
        * plug-ins/common/sharpen.c
        * plug-ins/common/snoise.c
        * plug-ins/common/spread.c
        * plug-ins/ifscompose/ifscompose.c
        * plug-ins/xjt/xjt.c: some minor code cleanup

        * plug-ins/common/csource.c: 64-bit cleanliness
This commit is contained in:
Manish Singh 2003-01-15 03:55:20 +00:00 committed by Manish Singh
parent 5bf67a3c11
commit 248dbd1e93
22 changed files with 49 additions and 24 deletions

View File

@ -1,3 +1,26 @@
2003-01-14 Manish Singh <yosh@gimp.org>
* app/core/gimpchannel.h
* app/core/gimpitem.c
* app/display/gimpnavigationview.c
* app/gui/paths-dialog.c
* app/tools/gimphistogramtool.c
* app/tools/gimpscaletool.c
* app/widgets/gimplistitem.c
* libgimp/gimppixelrgn.c
* libgimpwidgets/gimpunitmenu.c
* plug-ins/FractalExplorer/Dialogs.c
* plug-ins/common/aa.c
* plug-ins/common/despeckle.c
* plug-ins/common/psd.c
* plug-ins/common/sharpen.c
* plug-ins/common/snoise.c
* plug-ins/common/spread.c
* plug-ins/ifscompose/ifscompose.c
* plug-ins/xjt/xjt.c: some minor code cleanup
* plug-ins/common/csource.c: 64-bit cleanliness
2003-01-14 Manish Singh <yosh@gimp.org> 2003-01-14 Manish Singh <yosh@gimp.org>
* configure.in: Oops, the configure.in change below didn't actually * configure.in: Oops, the configure.in change below didn't actually
@ -744,7 +767,9 @@
2003-01-05 Maurits Rijk <lpeek.mrijk@consunet.nl> 2003-01-05 Maurits Rijk <lpeek.mrijk@consunet.nl>
* plug-ins/script-fu/scripts/starscape-logo.scm (apply-starscape-logo-effect): fixes #73894. A channel was removed but never added to the image. * plug-ins/script-fu/scripts/starscape-logo.scm
(apply-starscape-logo-effect): fixes #73894. A channel was removed
but never added to the image.
2003-01-05 Maurits Rijk <lpeek.mrijk@consunet.nl> 2003-01-05 Maurits Rijk <lpeek.mrijk@consunet.nl>

View File

@ -92,7 +92,7 @@ void gimp_channel_set_color (GimpChannel *channel,
gboolean gimp_channel_get_show_masked (GimpChannel *channel); gboolean gimp_channel_get_show_masked (GimpChannel *channel);
void gimp_channel_set_show_masked (GimpChannel *channel, void gimp_channel_set_show_masked (GimpChannel *channel,
gboolean show_masked);; gboolean show_masked);
void gimp_channel_scale (GimpChannel *channel, void gimp_channel_scale (GimpChannel *channel,
gint new_width, gint new_width,

View File

@ -92,7 +92,7 @@ void gimp_channel_set_color (GimpChannel *channel,
gboolean gimp_channel_get_show_masked (GimpChannel *channel); gboolean gimp_channel_get_show_masked (GimpChannel *channel);
void gimp_channel_set_show_masked (GimpChannel *channel, void gimp_channel_set_show_masked (GimpChannel *channel,
gboolean show_masked);; gboolean show_masked);
void gimp_channel_scale (GimpChannel *channel, void gimp_channel_scale (GimpChannel *channel,
gint new_width, gint new_width,

View File

@ -330,7 +330,7 @@ gimp_item_set_image (GimpItem *item,
GimpImage *gimage) GimpImage *gimage)
{ {
g_return_if_fail (GIMP_IS_ITEM (item)); g_return_if_fail (GIMP_IS_ITEM (item));
g_return_if_fail (! gimage || GIMP_IS_IMAGE (gimage));; g_return_if_fail (! gimage || GIMP_IS_IMAGE (gimage));
if (gimage == NULL) if (gimage == NULL)
{ {

View File

@ -292,7 +292,7 @@ gimp_navigation_view_popup (GimpDisplayShell *shell,
} }
else else
{ {
view = GIMP_NAVIGATION_VIEW (GTK_BIN (GTK_BIN (shell->nav_popup)->child)->child);; view = GIMP_NAVIGATION_VIEW (GTK_BIN (GTK_BIN (shell->nav_popup)->child)->child);
} }
preview = GIMP_NAVIGATION_PREVIEW (view->preview); preview = GIMP_NAVIGATION_PREVIEW (view->preview);

View File

@ -292,7 +292,7 @@ gimp_navigation_view_popup (GimpDisplayShell *shell,
} }
else else
{ {
view = GIMP_NAVIGATION_VIEW (GTK_BIN (GTK_BIN (shell->nav_popup)->child)->child);; view = GIMP_NAVIGATION_VIEW (GTK_BIN (GTK_BIN (shell->nav_popup)->child)->child);
} }
preview = GIMP_NAVIGATION_PREVIEW (view->preview); preview = GIMP_NAVIGATION_PREVIEW (view->preview);

View File

@ -447,7 +447,7 @@ paths_dialog_create (void)
paths_factory = gtk_item_factory_from_path ("<Paths>"); paths_factory = gtk_item_factory_from_path ("<Paths>");
paths_dialog->ops_menu = paths_factory->widget; paths_dialog->ops_menu = paths_factory->widget;
paths_dialog->accel_group = paths_factory->accel_group;; paths_dialog->accel_group = paths_factory->accel_group;
paths_dialog_set_menu_sensitivity (); paths_dialog_set_menu_sensitivity ();

View File

@ -352,7 +352,7 @@ histogram_tool_dialog_new (GimpToolInfo *tool_info)
NULL); NULL);
vbox = gtk_vbox_new (FALSE, 4); vbox = gtk_vbox_new (FALSE, 4);
gtk_container_set_border_width (GTK_CONTAINER (vbox), 4);; gtk_container_set_border_width (GTK_CONTAINER (vbox), 4);
gtk_container_add (GTK_CONTAINER (GTK_DIALOG (htd->shell)->vbox), vbox); gtk_container_add (GTK_CONTAINER (GTK_DIALOG (htd->shell)->vbox), vbox);
gtk_widget_show (vbox); gtk_widget_show (vbox);

View File

@ -418,7 +418,7 @@ gimp_scale_tool_info_update (GimpTransformTool *tr_tool)
tool = GIMP_TOOL (tr_tool); tool = GIMP_TOOL (tr_tool);
unit = gimp_size_entry_get_unit (GIMP_SIZE_ENTRY (sizeentry));; unit = gimp_size_entry_get_unit (GIMP_SIZE_ENTRY (sizeentry));
/* Find original sizes */ /* Find original sizes */
x1 = tr_tool->x1; x1 = tr_tool->x1;

View File

@ -374,7 +374,7 @@ gimp_list_item_set_reorderable (GimpListItem *list_item,
g_return_if_fail (! reorderable || container != NULL); g_return_if_fail (! reorderable || container != NULL);
g_return_if_fail (! container || GIMP_IS_CONTAINER (container)); g_return_if_fail (! container || GIMP_IS_CONTAINER (container));
list_item->reorderable = reorderable ? TRUE : FALSE;; list_item->reorderable = reorderable ? TRUE : FALSE;
if (reorderable) if (reorderable)
{ {
@ -402,7 +402,7 @@ gimp_list_item_set_convertable (GimpListItem *list_item,
{ {
g_return_if_fail (GIMP_IS_LIST_ITEM (list_item)); g_return_if_fail (GIMP_IS_LIST_ITEM (list_item));
list_item->convertable = convertable ? TRUE : FALSE;; list_item->convertable = convertable ? TRUE : FALSE;
} }
void void

View File

@ -189,7 +189,7 @@ gimp_pixel_rgn_get_row (GimpPixelRgn *pr,
(const void *)tile_data, (const void *)tile_data,
inc = (bpp * inc = (bpp *
( (min = MIN (end, boundary)) -x) ) ); ( (min = MIN (end, boundary)) -x) ) );
x = min;; x = min;
buf += inc; buf += inc;
#else #else
for ( ; x < end && x < boundary; x++) for ( ; x < end && x < boundary; x++)

View File

@ -178,7 +178,7 @@ gimp_unit_menu_new (const gchar *format,
g_return_val_if_fail (((unit >= GIMP_UNIT_PIXEL) && g_return_val_if_fail (((unit >= GIMP_UNIT_PIXEL) &&
(unit < gimp_unit_get_number_of_units ())) || (unit < gimp_unit_get_number_of_units ())) ||
(unit == GIMP_UNIT_PERCENT), NULL); (unit == GIMP_UNIT_PERCENT), NULL);
if ((unit >= gimp_unit_get_number_of_built_in_units ()) && if ((unit >= gimp_unit_get_number_of_built_in_units ()) &&
(unit != GIMP_UNIT_PERCENT)) (unit != GIMP_UNIT_PERCENT))

View File

@ -566,7 +566,7 @@ explorer_dialog (void)
gimp_radio_group_new2 (FALSE, NULL, gimp_radio_group_new2 (FALSE, NULL,
G_CALLBACK (explorer_radio_update), G_CALLBACK (explorer_radio_update),
&wvals.fractaltype, &wvals.fractaltype,
(gpointer) &wvals.fractaltype, (gpointer) wvals.fractaltype,
_("Mandelbrot"), (gpointer) TYPE_MANDELBROT, _("Mandelbrot"), (gpointer) TYPE_MANDELBROT,
&(elements->type[TYPE_MANDELBROT]), &(elements->type[TYPE_MANDELBROT]),

View File

@ -233,7 +233,7 @@ save_aa (gint32 drawable_ID,
{ {
aa_savedata savedata; aa_savedata savedata;
aa_context *context; aa_context *context;
aa_format format = *aa_formats[output_type];; aa_format format = *aa_formats[output_type];
format.width = gimp_drawable_width (drawable_ID) / 2; format.width = gimp_drawable_width (drawable_ID) / 2;
format.height = gimp_drawable_height (drawable_ID) / 2; format.height = gimp_drawable_height (drawable_ID) / 2;

View File

@ -505,7 +505,7 @@ save_image (Config *config,
s_uint_8, s_uint_8,
config->use_rle ? "rle_" : ""); config->use_rle ? "rle_" : "");
if (config->use_rle) if (config->use_rle)
fprintf (fp, "%u + 1];\n", img_buffer_end - img_buffer); fprintf (fp, "%u + 1];\n", (guint) (img_buffer_end - img_buffer));
else else
fprintf (fp, "%u * %u * %u + 1];\n", fprintf (fp, "%u * %u * %u + 1];\n",
drawable->width, drawable->width,
@ -584,7 +584,7 @@ save_image (Config *config,
macro_name, macro_name,
config->use_rle ? "rle_" : ""); config->use_rle ? "rle_" : "");
if (config->use_rle) if (config->use_rle)
fprintf (fp, "%u] =\n", img_buffer_end - img_buffer); fprintf (fp, "%u] =\n", (guint) (img_buffer_end - img_buffer));
else else
fprintf (fp, "%u * %u * %u + 1] =\n", fprintf (fp, "%u * %u * %u + 1] =\n",
drawable->width, drawable->width,

View File

@ -305,7 +305,7 @@ run (gchar *name, /* I - Name of filter program. */
default: default:
status = GIMP_PDB_CALLING_ERROR; status = GIMP_PDB_CALLING_ERROR;
break;; break;
}; };
/* /*

View File

@ -2284,7 +2284,7 @@ unpack_pb_channel(FILE *fd, guchar *dst, gint32 unpackedlen, guint32 *offset)
{ /* copy next n+1 guchars literally */ { /* copy next n+1 guchars literally */
for (b = ++n; b > 0; --b) for (b = ++n; b > 0; --b)
{ {
*dst = getguchar(fd, "packbits3");; *dst = getguchar(fd, "packbits3");
(*offset)++; (*offset)++;
dst ++; dst ++;
upremain--; upremain--;

View File

@ -255,7 +255,7 @@ run (gchar *name,
default: default:
status = GIMP_PDB_CALLING_ERROR; status = GIMP_PDB_CALLING_ERROR;
break;; break;
}; };
/* /*

View File

@ -339,7 +339,7 @@ solid_noise (GimpDrawable *drawable)
*dest++ = 255; *dest++ = 255;
} }
dest_row += dest_rgn.rowstride;; dest_row += dest_rgn.rowstride;
} }
/* Update progress */ /* Update progress */

View File

@ -311,7 +311,7 @@ spread (GimpDrawable *drawable)
} }
dest += bytes; dest += bytes;
} }
destrow += dest_rgn.rowstride;; destrow += dest_rgn.rowstride;
} }
progress += dest_rgn.w * dest_rgn.h; progress += dest_rgn.w * dest_rgn.h;
gimp_progress_update ((double) progress / (double) max_progress); gimp_progress_update ((double) progress / (double) max_progress);

View File

@ -1468,7 +1468,7 @@ ifs_compose (GimpDrawable *drawable)
break; break;
} }
} }
destrow += dest_rgn.rowstride;; destrow += dest_rgn.rowstride;
} }
progress += dest_rgn.w * dest_rgn.h; progress += dest_rgn.w * dest_rgn.h;
gimp_progress_update ((gdouble) progress / (gdouble) max_progress); gimp_progress_update ((gdouble) progress / (gdouble) max_progress);

View File

@ -1926,7 +1926,7 @@ t_channel_props * p_new_channel_prop()
l_new_prop->show_masked = g_prop_table[p_get_property_index(PROP_SHOW_MASKED)].default_val1; l_new_prop->show_masked = g_prop_table[p_get_property_index(PROP_SHOW_MASKED)].default_val1;
l_new_prop->offx = g_prop_table[p_get_property_index(PROP_OFFSETS)].default_val1; l_new_prop->offx = g_prop_table[p_get_property_index(PROP_OFFSETS)].default_val1;
l_new_prop->offy = g_prop_table[p_get_property_index(PROP_OFFSETS)].default_val2; l_new_prop->offy = g_prop_table[p_get_property_index(PROP_OFFSETS)].default_val2;
l_new_prop->color_r = g_prop_table[p_get_property_index(PROP_COLOR)].default_val1;; l_new_prop->color_r = g_prop_table[p_get_property_index(PROP_COLOR)].default_val1;
l_new_prop->color_g = g_prop_table[p_get_property_index(PROP_COLOR)].default_val2; l_new_prop->color_g = g_prop_table[p_get_property_index(PROP_COLOR)].default_val2;
l_new_prop->color_b = g_prop_table[p_get_property_index(PROP_COLOR)].default_val3; l_new_prop->color_b = g_prop_table[p_get_property_index(PROP_COLOR)].default_val3;
l_new_prop->tattoo = g_prop_table[p_get_property_index(PROP_TATTOO)].default_val1; l_new_prop->tattoo = g_prop_table[p_get_property_index(PROP_TATTOO)].default_val1;