Commit 013e30db authored by Manish Singh's avatar Manish Singh Committed by Manish Singh
Browse files

app/undo_history.c app/core/gimpbrush.c app/core/gimpimage-new.c

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

        * app/undo_history.c
        * app/core/gimpbrush.c
        * app/core/gimpimage-new.c
        * app/core/gimpobject.c
        * app/core/gimppalette-import.c
        * app/core/gimppattern.c
        * app/plug-in/plug-in.c
        * app/tools/gimpbezierselecttool.c
        * libgimpwidgets/gimpunitmenu.c
        * plug-ins/MapObject/mapobject_ui.c
        * plug-ins/common/convmatrix.c
        * plug-ins/common/curve_bend.c
        * plug-ins/common/sample_colorize.c
        * plug-ins/common/tiff.c
        * plug-ins/flame/flame.c
        * plug-ins/gflare/gflare.c
        * plug-ins/gimpressionist/general.c
        * plug-ins/gimpressionist/orientation.c
        * plug-ins/gimpressionist/preview.c
        * plug-ins/gimpressionist/size.c
        * plug-ins/imagemap/imap_grid.c
        * plug-ins/imagemap/imap_menu.c
        * plug-ins/maze/algorithms.c
        * plug-ins/script-fu/interp_regex.c
        * plug-ins/script-fu/interp_sliba.c
        * plug-ins/script-fu/script-fu-console.c
        * plug-ins/script-fu/script-fu-server.c
        * plug-ins/webbrowser/webbrowser.c: added GINT_TO_POINTER and friends,
        fixed format strings, for 64-bitness.

        * modules/colorsel_triangle.c
        * plug-ins/tools/tool-safe-mode-plug-in.c: #include missing header
        files
parent a817b033
2003-01-05 Manish Singh <yosh@gimp.org>
* app/undo_history.c
* app/core/gimpbrush.c
* app/core/gimpimage-new.c
* app/core/gimpobject.c
* app/core/gimppalette-import.c
* app/core/gimppattern.c
* app/plug-in/plug-in.c
* app/tools/gimpbezierselecttool.c
* libgimpwidgets/gimpunitmenu.c
* plug-ins/MapObject/mapobject_ui.c
* plug-ins/common/convmatrix.c
* plug-ins/common/curve_bend.c
* plug-ins/common/sample_colorize.c
* plug-ins/common/tiff.c
* plug-ins/flame/flame.c
* plug-ins/gflare/gflare.c
* plug-ins/gimpressionist/general.c
* plug-ins/gimpressionist/orientation.c
* plug-ins/gimpressionist/preview.c
* plug-ins/gimpressionist/size.c
* plug-ins/imagemap/imap_grid.c
* plug-ins/imagemap/imap_menu.c
* plug-ins/maze/algorithms.c
* plug-ins/script-fu/interp_regex.c
* plug-ins/script-fu/interp_sliba.c
* plug-ins/script-fu/script-fu-console.c
* plug-ins/script-fu/script-fu-server.c
* plug-ins/webbrowser/webbrowser.c: added GINT_TO_POINTER and friends,
fixed format strings, for 64-bitness.
* modules/colorsel_triangle.c
* plug-ins/tools/tool-safe-mode-plug-in.c: #include missing header
files
2003-01-05 Michael Natterer <mitch@gimp.org>
 
* configure.in: changed --with-gnome-desktop to --with-gnome-datadir
......
......@@ -512,7 +512,7 @@ gimp_brush_load_brush (gint fd,
{
g_set_error (error, GIMP_DATA_ERROR, GIMP_DATA_ERROR_READ,
_("Could not read %d bytes from '%s': %s"),
sizeof (header), filename, g_strerror (errno));
(gint) sizeof (header), filename, g_strerror (errno));
return NULL;
}
......
......@@ -512,7 +512,7 @@ gimp_brush_load_brush (gint fd,
{
g_set_error (error, GIMP_DATA_ERROR, GIMP_DATA_ERROR_READ,
_("Could not read %d bytes from '%s': %s"),
sizeof (header), filename, g_strerror (errno));
(gint) sizeof (header), filename, g_strerror (errno));
return NULL;
}
......
......@@ -111,7 +111,7 @@ gimp_image_new_get_memsize_string (gsize memsize)
{
if (memsize < 4096)
{
return g_strdup_printf (_("%d Bytes"), memsize);
return g_strdup_printf (_("%lu Bytes"), memsize);
}
else if (memsize < 1024 * 10)
{
......@@ -123,7 +123,7 @@ gimp_image_new_get_memsize_string (gsize memsize)
}
else if (memsize < 1024 * 1024)
{
return g_strdup_printf (_("%d KB"), memsize / 1024);
return g_strdup_printf (_("%lu KB"), memsize / 1024);
}
else if (memsize < 1024 * 1024 * 10)
{
......
......@@ -290,7 +290,7 @@ gimp_object_get_memsize (GimpObject *object)
indent_buf[i] = '\0';
object_size = g_strdup_printf ("%s%s \"%s\": %d\n",
object_size = g_strdup_printf ("%s%s \"%s\": %lu\n",
indent_buf,
g_type_name (G_TYPE_FROM_INSTANCE (object)),
object->name,
......
......@@ -104,7 +104,8 @@ gimp_palette_import_store_colors (GHashTable *h_array,
}
else
{
found_color = g_hash_table_lookup (h_array, (gpointer) key_colors);
found_color = g_hash_table_lookup (h_array,
GUINT_TO_POINTER (key_colors));
}
if (found_color == NULL)
......@@ -127,7 +128,7 @@ gimp_palette_import_store_colors (GHashTable *h_array,
new_color->g = colors[1];
new_color->b = colors[2];
g_hash_table_insert (h_array, (gpointer) key_colors, new_color);
g_hash_table_insert (h_array, GUINT_TO_POINTER (key_colors), new_color);
}
else
{
......
......@@ -309,7 +309,7 @@ gimp_pattern_load (const gchar *filename,
{
g_set_error (error, GIMP_DATA_ERROR, GIMP_DATA_ERROR_READ,
_("Could not read %d bytes from '%s': %s"),
sizeof (header), filename, g_strerror (errno));
(gint) sizeof (header), filename, g_strerror (errno));
goto error;
}
......
......@@ -309,7 +309,7 @@ gimp_pattern_load (const gchar *filename,
{
g_set_error (error, GIMP_DATA_ERROR, GIMP_DATA_ERROR_READ,
_("Could not read %d bytes from '%s': %s"),
sizeof (header), filename, g_strerror (errno));
(gint) sizeof (header), filename, g_strerror (errno));
goto error;
}
......
......@@ -1655,7 +1655,7 @@ plug_in_flush (GIOChannel *channel,
GIOStatus status;
GError *error = NULL;
gint count;
guint bytes;
gsize bytes;
plug_in = (PlugIn *) user_data;
......
......@@ -1655,7 +1655,7 @@ plug_in_flush (GIOChannel *channel,
GIOStatus status;
GError *error = NULL;
gint count;
guint bytes;
gsize bytes;
plug_in = (PlugIn *) user_data;
......
......@@ -1655,7 +1655,7 @@ plug_in_flush (GIOChannel *channel,
GIOStatus status;
GError *error = NULL;
gint count;
guint bytes;
gsize bytes;
plug_in = (PlugIn *) user_data;
......
......@@ -1655,7 +1655,7 @@ plug_in_flush (GIOChannel *channel,
GIOStatus status;
GError *error = NULL;
gint count;
guint bytes;
gsize bytes;
plug_in = (PlugIn *) user_data;
......
......@@ -1655,7 +1655,7 @@ plug_in_flush (GIOChannel *channel,
GIOStatus status;
GError *error = NULL;
gint count;
guint bytes;
gsize bytes;
plug_in = (PlugIn *) user_data;
......
......@@ -1655,7 +1655,7 @@ plug_in_flush (GIOChannel *channel,
GIOStatus status;
GError *error = NULL;
gint count;
guint bytes;
gsize bytes;
plug_in = (PlugIn *) user_data;
......
......@@ -1655,7 +1655,7 @@ plug_in_flush (GIOChannel *channel,
GIOStatus status;
GError *error = NULL;
gint count;
guint bytes;
gsize bytes;
plug_in = (PlugIn *) user_data;
......
......@@ -1655,7 +1655,7 @@ plug_in_flush (GIOChannel *channel,
GIOStatus status;
GError *error = NULL;
gint count;
guint bytes;
gsize bytes;
plug_in = (PlugIn *) user_data;
......
......@@ -1655,7 +1655,7 @@ plug_in_flush (GIOChannel *channel,
GIOStatus status;
GError *error = NULL;
gint count;
guint bytes;
gsize bytes;
plug_in = (PlugIn *) user_data;
......
......@@ -3460,7 +3460,7 @@ bezier_stroke (GimpBezierSelectTool *bezier_sel,
procedural_db_run_proc (gdisp->gimage->gimp,
pdb_string,
&nreturn_vals,
GIMP_PDB_DRAWABLE, (GimpDrawable *) gimp_item_get_ID (GIMP_ITEM (drawable)),
GIMP_PDB_DRAWABLE, gimp_item_get_ID (GIMP_ITEM (drawable)),
GIMP_PDB_INT32, (gint32) rpnts->num_stroke_points * 2,
GIMP_PDB_FLOATARRAY, rpnts->stroke_points,
GIMP_PDB_END);
......
......@@ -428,7 +428,7 @@ undo_history_set_pixmap (GtkCList *clist,
{
static idle_preview_args idle;
if (!size || ((gint)gtk_clist_get_row_data (clist, row)) == 2)
if (!size || (GPOINTER_TO_INT (gtk_clist_get_row_data (clist, row))) == 2)
return;
idle.clist = clist;
......
......@@ -295,7 +295,7 @@ gimp_object_get_memsize (GimpObject *object)
indent_buf[i] = '\0';
object_size = g_strdup_printf ("%s%s \"%s\": %d\n",
object_size = g_strdup_printf ("%s%s \"%s\": %lu\n",
indent_buf,
g_type_name (G_TYPE_FROM_INSTANCE (object)),
object->name,
......
Supports Markdown
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