Commit 1bfe515f authored by Adrian Likins's avatar Adrian Likins

gimp-joke-980321

 * app/iscissors.c, app/tips_dialog.c, app/gradient.c,
        libgimp/gimp.c, plug-ins/AlienMap/AlienMap.c,
        plug-ins/bmp/bmp.c, plug-ins/fits/fitsrw.h,
        plug-ins/fits/fitsrw.c, plug-ins/flarefx/flarefx.c,
        plug-ins/gfig/gfig.c, plug-ins/gfli/gfli.c,
        plug-ins/gicon/gicon.c, plug-ins/gqbist/gqbist.c,
        plug-ins/gtm/gtm.c, plug-ins/hot/hot.c,
        plug-ins/ifscompose/ifscompose.c,
        plug-ins/ifscompose/ifscompose_utils.c
        plug-ins/max_rgb/max_rgb.c, plug-ins/nlfilt/nlfilt.c,
        plug-ins/pat/pat.c, plug-ins/pcx/pcx.c, plug-ins/rotate/rotate.c,
        plug-ins/script-fu/script-fu-server.c, plug-ins/snoise/snoise.c,
        plug-ins/threshold_alpha/threshold_alpha.c,
        plug-ins/zealouscrop/zealouscrop.c :gimp-joke-980321

        plug-ins/CML_explorer, plug-ins/autocrop,
        plug-ins/align_layers, plug-ins/blinds,
        plug-ins/bmp, plug-ins/megawidget: gimp-joke-980322

        Applied gimp-joke-980322-0.patch and gimp-joke-980321-0.patch
        from Yasuhiro SHIRASAKI <joke@awa.tohoku.ac.jp>. Mostly
        portability for DEC osf1's cc. Lots of MAIN();'s, trailing
        commas in enums, and guchar/gchar madness.

	Gimp now sends mail, cleans vinyl records,
	removes stubborn stains, julien fries, and more!

-adrian
parent 4ef2e384
Sun Mar 22 14:23:03 EST 1998 Adrian Likins <adrian@gimp.org>
* app/iscissors.c, app/tips_dialog.c, app/gradient.c,
libgimp/gimp.c, plug-ins/AlienMap/AlienMap.c,
plug-ins/bmp/bmp.c, plug-ins/fits/fitsrw.h,
plug-ins/fits/fitsrw.c, plug-ins/flarefx/flarefx.c,
plug-ins/gfig/gfig.c, plug-ins/gfli/gfli.c,
plug-ins/gicon/gicon.c, plug-ins/gqbist/gqbist.c,
plug-ins/gtm/gtm.c, plug-ins/hot/hot.c,
plug-ins/ifscompose/ifscompose.c,
plug-ins/ifscompose/ifscompose_utils.c
plug-ins/max_rgb/max_rgb.c, plug-ins/nlfilt/nlfilt.c,
plug-ins/pat/pat.c, plug-ins/pcx/pcx.c, plug-ins/rotate/rotate.c,
plug-ins/script-fu/script-fu-server.c, plug-ins/snoise/snoise.c,
plug-ins/threshold_alpha/threshold_alpha.c,
plug-ins/zealouscrop/zealouscrop.c :gimp-joke-980321
plug-ins/CML_explorer, plug-ins/autocrop,
plug-ins/align_layers, plug-ins/blinds,
plug-ins/bmp, plug-ins/megawidget: gimp-joke-980322
Applied gimp-joke-980322-0.patch and gimp-joke-980321-0.patch
from Yasuhiro SHIRASAKI <joke@awa.tohoku.ac.jp>. Mostly
portability for DEC osf1's cc. Lots of MAIN();'s, trailing
commas in enums, and guchar/gchar madness.
Sun Mar 22 01:59:31 PST 1998 Manish Singh <yosh@gimp.org> Sun Mar 22 01:59:31 PST 1998 Manish Singh <yosh@gimp.org>
* autoconfed for random/lrand48/rand madness * autoconfed for random/lrand48/rand madness
...@@ -86,7 +114,7 @@ Thu Mar 19 01:04:56 PST 1998 Manish Singh <yosh@gimp.org> ...@@ -86,7 +114,7 @@ Thu Mar 19 01:04:56 PST 1998 Manish Singh <yosh@gimp.org>
Wed Mar 18 20:57:55 EST 1998 Adrian Likins <adrian@gimp.org> Wed Mar 18 20:57:55 EST 1998 Adrian Likins <adrian@gimp.org>
*AlienMap/AlienMap.c CEL/CEL.c CML_explorer/CML_explorer.c * AlienMap/AlienMap.c CEL/CEL.c CML_explorer/CML_explorer.c
align_layers/align_layers.c animationplay/animationplay.c align_layers/align_layers.c animationplay/animationplay.c
bmp/bmpwrite.c dbbrowser/dbbrowser.c emboss/emboss.c bmp/bmpwrite.c dbbrowser/dbbrowser.c emboss/emboss.c
exchange/exchange.c faxg3/faxg3.c faxg3/g3.c gbr/gbr.c exchange/exchange.c faxg3/faxg3.c faxg3/g3.c gbr/gbr.c
......
...@@ -41,7 +41,7 @@ tips_dialog_create () ...@@ -41,7 +41,7 @@ tips_dialog_create ()
if (tips_count == 0) if (tips_count == 0)
{ {
temp = g_malloc (512); temp = g_malloc (512);
sprintf (temp, "%s/%s", DATADIR, TIPS_FILE_NAME); sprintf ((char *)temp, "%s/%s", DATADIR, TIPS_FILE_NAME);
read_tips_file ((char *)temp); read_tips_file ((char *)temp);
g_free (temp); g_free (temp);
} }
......
...@@ -5920,7 +5920,7 @@ gradients_get_active_invoker(Argument *args) ...@@ -5920,7 +5920,7 @@ gradients_get_active_invoker(Argument *args)
return_args[1].value.pdb_pointer = g_strdup(curr_gradient->name); return_args[1].value.pdb_pointer = g_strdup(curr_gradient->name);
return return_args; return return_args;
}; /* gradients_get_active_invoker */ } /* gradients_get_active_invoker */
/***** gradients_set_active *****/ /***** gradients_set_active *****/
......
...@@ -5920,7 +5920,7 @@ gradients_get_active_invoker(Argument *args) ...@@ -5920,7 +5920,7 @@ gradients_get_active_invoker(Argument *args)
return_args[1].value.pdb_pointer = g_strdup(curr_gradient->name); return_args[1].value.pdb_pointer = g_strdup(curr_gradient->name);
return return_args; return return_args;
}; /* gradients_get_active_invoker */ } /* gradients_get_active_invoker */
/***** gradients_set_active *****/ /***** gradients_set_active *****/
......
...@@ -5920,7 +5920,7 @@ gradients_get_active_invoker(Argument *args) ...@@ -5920,7 +5920,7 @@ gradients_get_active_invoker(Argument *args)
return_args[1].value.pdb_pointer = g_strdup(curr_gradient->name); return_args[1].value.pdb_pointer = g_strdup(curr_gradient->name);
return return_args; return return_args;
}; /* gradients_get_active_invoker */ } /* gradients_get_active_invoker */
/***** gradients_set_active *****/ /***** gradients_set_active *****/
......
...@@ -854,11 +854,19 @@ palette_refresh_callback (GtkWidget *w, ...@@ -854,11 +854,19 @@ palette_refresh_callback (GtkWidget *w,
palette = client_data; palette = client_data;
if(palette) if(palette)
{
palette_free_palettes ();
palette_init_palettes();
palette_create_palette_menu (palette, default_palette_entries);
palette_calc_scrollbar (palette);
palette_draw_entries (palette);
palette_draw_current_entry (palette);
}
else
{ {
palette_free_palettes (); palette_free_palettes ();
palette_init_palettes(); palette_init_palettes();
} }
palette_create_palette_menu (palette, default_palette_entries);
} }
...@@ -1466,10 +1474,9 @@ palette_refresh_invoker (Argument *args) ...@@ -1466,10 +1474,9 @@ palette_refresh_invoker (Argument *args)
*/ */
int success = TRUE ; int success = TRUE ;
if(palette) palette_free_palettes();
palette_free_palettes ();
palette_init_palettes(); palette_init_palettes();
return procedural_db_return_args (&palette_refresh_proc, success); return procedural_db_return_args (&palette_refresh_proc, success);
} }
......
...@@ -41,7 +41,7 @@ tips_dialog_create () ...@@ -41,7 +41,7 @@ tips_dialog_create ()
if (tips_count == 0) if (tips_count == 0)
{ {
temp = g_malloc (512); temp = g_malloc (512);
sprintf (temp, "%s/%s", DATADIR, TIPS_FILE_NAME); sprintf ((char *)temp, "%s/%s", DATADIR, TIPS_FILE_NAME);
read_tips_file ((char *)temp); read_tips_file ((char *)temp);
g_free (temp); g_free (temp);
} }
......
...@@ -284,7 +284,7 @@ selection_to_bezier(GtkWidget *w, gpointer none) ...@@ -284,7 +284,7 @@ selection_to_bezier(GtkWidget *w, gpointer none)
tools_select(BEZIER_SELECT); tools_select(BEZIER_SELECT);
} }
return; return;
}; }
static IScissorsOptions * static IScissorsOptions *
iscissors_selection_options (void) iscissors_selection_options (void)
......
...@@ -854,11 +854,19 @@ palette_refresh_callback (GtkWidget *w, ...@@ -854,11 +854,19 @@ palette_refresh_callback (GtkWidget *w,
palette = client_data; palette = client_data;
if(palette) if(palette)
{
palette_free_palettes ();
palette_init_palettes();
palette_create_palette_menu (palette, default_palette_entries);
palette_calc_scrollbar (palette);
palette_draw_entries (palette);
palette_draw_current_entry (palette);
}
else
{ {
palette_free_palettes (); palette_free_palettes ();
palette_init_palettes(); palette_init_palettes();
} }
palette_create_palette_menu (palette, default_palette_entries);
} }
...@@ -1466,10 +1474,9 @@ palette_refresh_invoker (Argument *args) ...@@ -1466,10 +1474,9 @@ palette_refresh_invoker (Argument *args)
*/ */
int success = TRUE ; int success = TRUE ;
if(palette) palette_free_palettes();
palette_free_palettes ();
palette_init_palettes(); palette_init_palettes();
return procedural_db_return_args (&palette_refresh_proc, success); return procedural_db_return_args (&palette_refresh_proc, success);
} }
......
...@@ -41,7 +41,7 @@ tips_dialog_create () ...@@ -41,7 +41,7 @@ tips_dialog_create ()
if (tips_count == 0) if (tips_count == 0)
{ {
temp = g_malloc (512); temp = g_malloc (512);
sprintf (temp, "%s/%s", DATADIR, TIPS_FILE_NAME); sprintf ((char *)temp, "%s/%s", DATADIR, TIPS_FILE_NAME);
read_tips_file ((char *)temp); read_tips_file ((char *)temp);
g_free (temp); g_free (temp);
} }
......
...@@ -284,7 +284,7 @@ selection_to_bezier(GtkWidget *w, gpointer none) ...@@ -284,7 +284,7 @@ selection_to_bezier(GtkWidget *w, gpointer none)
tools_select(BEZIER_SELECT); tools_select(BEZIER_SELECT);
} }
return; return;
}; }
static IScissorsOptions * static IScissorsOptions *
iscissors_selection_options (void) iscissors_selection_options (void)
......
...@@ -284,7 +284,7 @@ selection_to_bezier(GtkWidget *w, gpointer none) ...@@ -284,7 +284,7 @@ selection_to_bezier(GtkWidget *w, gpointer none)
tools_select(BEZIER_SELECT); tools_select(BEZIER_SELECT);
} }
return; return;
}; }
static IScissorsOptions * static IScissorsOptions *
iscissors_selection_options (void) iscissors_selection_options (void)
......
...@@ -5920,7 +5920,7 @@ gradients_get_active_invoker(Argument *args) ...@@ -5920,7 +5920,7 @@ gradients_get_active_invoker(Argument *args)
return_args[1].value.pdb_pointer = g_strdup(curr_gradient->name); return_args[1].value.pdb_pointer = g_strdup(curr_gradient->name);
return return_args; return return_args;
}; /* gradients_get_active_invoker */ } /* gradients_get_active_invoker */
/***** gradients_set_active *****/ /***** gradients_set_active *****/
......
...@@ -854,11 +854,19 @@ palette_refresh_callback (GtkWidget *w, ...@@ -854,11 +854,19 @@ palette_refresh_callback (GtkWidget *w,
palette = client_data; palette = client_data;
if(palette) if(palette)
{
palette_free_palettes ();
palette_init_palettes();
palette_create_palette_menu (palette, default_palette_entries);
palette_calc_scrollbar (palette);
palette_draw_entries (palette);
palette_draw_current_entry (palette);
}
else
{ {
palette_free_palettes (); palette_free_palettes ();
palette_init_palettes(); palette_init_palettes();
} }
palette_create_palette_menu (palette, default_palette_entries);
} }
...@@ -1466,10 +1474,9 @@ palette_refresh_invoker (Argument *args) ...@@ -1466,10 +1474,9 @@ palette_refresh_invoker (Argument *args)
*/ */
int success = TRUE ; int success = TRUE ;
if(palette) palette_free_palettes();
palette_free_palettes ();
palette_init_palettes(); palette_init_palettes();
return procedural_db_return_args (&palette_refresh_proc, success); return procedural_db_return_args (&palette_refresh_proc, success);
} }
......
...@@ -160,7 +160,7 @@ gint do_bluenone; ...@@ -160,7 +160,7 @@ gint do_bluenone;
/***** Functions *****/ /***** Functions *****/
MAIN (); MAIN ()
static void static void
query () query ()
......
...@@ -117,7 +117,7 @@ typedef struct ...@@ -117,7 +117,7 @@ typedef struct
typedef struct typedef struct
{ {
guchar *name; gchar *name;
gpointer data; gpointer data;
} gtkW_menu_item; } gtkW_menu_item;
/* gtkW global variables */ /* gtkW global variables */
...@@ -143,16 +143,16 @@ static void gtkW_menu_update (GtkWidget *widget, gpointer data); ...@@ -143,16 +143,16 @@ static void gtkW_menu_update (GtkWidget *widget, gpointer data);
static void gtkW_toggle_change_value (gtkW_widget_table *wtable); static void gtkW_toggle_change_value (gtkW_widget_table *wtable);
/* gtkW method */ /* gtkW method */
GtkWidget *gtkW_check_button_new (GtkWidget *parent, GtkWidget *gtkW_check_button_new (GtkWidget *parent,
guchar *name, gchar *name,
GtkSignalFunc update, GtkSignalFunc update,
gint *value); gint *value);
static GtkWidget *gtkW_dialog_new (guchar *name, static GtkWidget *gtkW_dialog_new (gchar *name,
GtkSignalFunc ok_callback, GtkSignalFunc ok_callback,
GtkSignalFunc close_callback); GtkSignalFunc close_callback);
static GtkWidget *gtkW_frame_new (GtkWidget *parent, guchar *name); static GtkWidget *gtkW_frame_new (GtkWidget *parent, gchar *name);
static GtkWidget *gtkW_hbox_new (GtkWidget *parent); static GtkWidget *gtkW_hbox_new (GtkWidget *parent);
static void gtkW_message_dialog (gint gtk_was_initialized, guchar *message); static void gtkW_message_dialog (gint gtk_was_initialized, gchar *message);
static GtkWidget *gtkW_message_dialog_new (guchar * name); static GtkWidget *gtkW_message_dialog_new (gchar * name);
static GtkWidget *gtkW_table_add_button (GtkWidget *table, static GtkWidget *gtkW_table_add_button (GtkWidget *table,
gchar *name, gchar *name,
gint x0, gint x0,
...@@ -183,7 +183,7 @@ static GtkWidget *gtkW_table_add_iscale_entry (GtkWidget *table, ...@@ -183,7 +183,7 @@ static GtkWidget *gtkW_table_add_iscale_entry (GtkWidget *table,
gdouble step, gdouble step,
gpointer table_entry); gpointer table_entry);
static GtkWidget *gtkW_table_add_menu (GtkWidget *parent, static GtkWidget *gtkW_table_add_menu (GtkWidget *parent,
guchar *name, gchar *name,
gint x, gint x,
gint y, gint y,
GtkSignalFunc imenu_update, GtkSignalFunc imenu_update,
...@@ -192,7 +192,7 @@ static GtkWidget *gtkW_table_add_menu (GtkWidget *parent, ...@@ -192,7 +192,7 @@ static GtkWidget *gtkW_table_add_menu (GtkWidget *parent,
gint item_num, gint item_num,
gpointer table_entry); gpointer table_entry);
static GtkWidget *gtkW_table_add_toggle (GtkWidget *table, static GtkWidget *gtkW_table_add_toggle (GtkWidget *table,
guchar *name, gchar *name,
gint x, gint x,
gint y, gint y,
GtkSignalFunc update, GtkSignalFunc update,
...@@ -200,7 +200,7 @@ static GtkWidget *gtkW_table_add_toggle (GtkWidget *table, ...@@ -200,7 +200,7 @@ static GtkWidget *gtkW_table_add_toggle (GtkWidget *table,
gpointer widget_entry); gpointer widget_entry);
static GtkWidget *gtkW_table_new (GtkWidget *parent, gint col, gint row); static GtkWidget *gtkW_table_new (GtkWidget *parent, gint col, gint row);
static GtkWidget *gtkW_vbox_add_button (GtkWidget *vbox, static GtkWidget *gtkW_vbox_add_button (GtkWidget *vbox,
guchar *name, gchar *name,
GtkSignalFunc update, GtkSignalFunc update,
gpointer data); gpointer data);
static GtkWidget *gtkW_vbox_new (GtkWidget *parent); static GtkWidget *gtkW_vbox_new (GtkWidget *parent);
...@@ -347,7 +347,7 @@ typedef struct ...@@ -347,7 +347,7 @@ typedef struct
gint scale; gint scale;
gint start_offset; gint start_offset;
gint seed; gint seed;
guchar last_file_name[256]; gchar last_file_name[256];
} ValueType; } ValueType;
static ValueType VALS = static ValueType VALS =
...@@ -401,10 +401,10 @@ static void hsv_to_rgb (int *h, int *s, int *v); ...@@ -401,10 +401,10 @@ static void hsv_to_rgb (int *h, int *s, int *v);
static gdouble logistic_function (CML_PARAM *param, gdouble x, gdouble power); static gdouble logistic_function (CML_PARAM *param, gdouble x, gdouble power);
static gint DIALOG (); static gint DIALOG ();
static GtkWidget *CML_dialog_sub_panel_new (GtkWidget *parent, static GtkWidget *CML_dialog_sub_panel_new (GtkWidget *parent,
guchar *name, gchar *name,
CML_PARAM *param, CML_PARAM *param,
gint channel_id); gint channel_id);
static GtkWidget *CML_dialog_advanced_panel_new (GtkWidget *parent, guchar *name); static GtkWidget *CML_dialog_advanced_panel_new (GtkWidget *parent, gchar *name);
void preview_update (); void preview_update ();
static void function_graph_new (GtkWidget *widget, gpointer data); static void function_graph_new (GtkWidget *widget, gpointer data);
static void CML_set_or_randomize_seed_callback (GtkWidget *widget, gpointer data); static void CML_set_or_randomize_seed_callback (GtkWidget *widget, gpointer data);
...@@ -419,7 +419,7 @@ static gint force_overwrite (char *filename); ...@@ -419,7 +419,7 @@ static gint force_overwrite (char *filename);
static void CML_overwrite_ok_callback (GtkWidget *widget, gpointer data); static void CML_overwrite_ok_callback (GtkWidget *widget, gpointer data);
static void CML_preview_update_callback (GtkWidget *widget, gpointer data); static void CML_preview_update_callback (GtkWidget *widget, gpointer data);
static void CML_load_from_file_callback (GtkWidget *widget, gpointer client_data); static void CML_load_from_file_callback (GtkWidget *widget, gpointer client_data);
static gint CML_load_parameter_file (guchar *filename, gint interactive_mode); static gint CML_load_parameter_file (gchar *filename, gint interactive_mode);
static void CML_execute_load_from_file (GtkWidget *widget, gpointer client_data); static void CML_execute_load_from_file (GtkWidget *widget, gpointer client_data);
static gint parse_line_to_gint (FILE *file, gint *flag); static gint parse_line_to_gint (FILE *file, gint *flag);
static gdouble parse_line_to_gdouble (FILE *file, gint *flag); static gdouble parse_line_to_gdouble (FILE *file, gint *flag);
...@@ -528,7 +528,7 @@ run (char *name, ...@@ -528,7 +528,7 @@ run (char *name,
break; break;
case RUN_NONINTERACTIVE: case RUN_NONINTERACTIVE:
{ {
guchar *filename = param[3].data.d_string; gchar *filename = param[3].data.d_string;
if (! CML_load_parameter_file (filename, FALSE)) if (! CML_load_parameter_file (filename, FALSE))
return; return;
...@@ -1620,7 +1620,7 @@ DIALOG () ...@@ -1620,7 +1620,7 @@ DIALOG ()
static GtkWidget * static GtkWidget *
CML_dialog_sub_panel_new (GtkWidget *parent, CML_dialog_sub_panel_new (GtkWidget *parent,
guchar *name, gchar *name,
CML_PARAM *param, CML_PARAM *param,
gint channel_id) gint channel_id)
{ {
...@@ -1733,7 +1733,7 @@ CML_dialog_sub_panel_new (GtkWidget *parent, ...@@ -1733,7 +1733,7 @@ CML_dialog_sub_panel_new (GtkWidget *parent,
} }
static GtkWidget * static GtkWidget *
CML_dialog_advanced_panel_new (GtkWidget *parent, guchar *name) CML_dialog_advanced_panel_new (GtkWidget *parent, gchar *name)
{ {
GtkWidget *frame; GtkWidget *frame;
GtkWidget *subframe; GtkWidget *subframe;
...@@ -1742,7 +1742,7 @@ CML_dialog_advanced_panel_new (GtkWidget *parent, guchar *name) ...@@ -1742,7 +1742,7 @@ CML_dialog_advanced_panel_new (GtkWidget *parent, guchar *name)
gint index = 0; gint index = 0;
gint widget_offset = 12; gint widget_offset = 12;
gint channel_id; gint channel_id;
guchar *ch_name[] = { "Hue", "Saturation", "Value" }; gchar *ch_name[] = { "Hue", "Saturation", "Value" };
CML_PARAM *param; CML_PARAM *param;
frame = gtkW_frame_new (parent, name); frame = gtkW_frame_new (parent, name);
...@@ -2091,7 +2091,7 @@ CML_execute_save_to_file (GtkWidget *widget, gpointer client_data) ...@@ -2091,7 +2091,7 @@ CML_execute_save_to_file (GtkWidget *widget, gpointer client_data)
} }
if ((err != 0) && (file == NULL)) if ((err != 0) && (file == NULL))
{ {
guchar buffer[CML_LINE_SIZE]; gchar buffer[CML_LINE_SIZE];
sprintf (buffer, "Error: could not open \"%s\"", filename); sprintf (buffer, "Error: could not open \"%s\"", filename);
gtkW_message_dialog (TRUE, buffer); gtkW_message_dialog (TRUE, buffer);
...@@ -2136,7 +2136,7 @@ CML_execute_save_to_file (GtkWidget *widget, gpointer client_data) ...@@ -2136,7 +2136,7 @@ CML_execute_save_to_file (GtkWidget *widget, gpointer client_data)
fclose(file); fclose(file);
#ifdef VERBOSE_DIALOGS #ifdef VERBOSE_DIALOGS
{ {
guchar buffer[CML_LINE_SIZE]; gchar buffer[CML_LINE_SIZE];
sprintf (buffer, "Parameters were saved to \"%s\"", filename); sprintf (buffer, "Parameters were saved to \"%s\"", filename);
gtkW_message_dialog (TRUE, buffer); gtkW_message_dialog (TRUE, buffer);
...@@ -2266,7 +2266,7 @@ CML_execute_load_from_file (GtkWidget *widget, gpointer client_data) ...@@ -2266,7 +2266,7 @@ CML_execute_load_from_file (GtkWidget *widget, gpointer client_data)
} }
static gint static gint
CML_load_parameter_file (guchar *filename, gint interactive_mode) CML_load_parameter_file (gchar *filename, gint interactive_mode)
{ {
FILE *file; FILE *file;
int channel_id; int channel_id;
...@@ -2282,7 +2282,7 @@ CML_load_parameter_file (guchar *filename, gint interactive_mode) ...@@ -2282,7 +2282,7 @@ CML_load_parameter_file (guchar *filename, gint interactive_mode)
if (!file) if (!file)
{ {
guchar buffer[CML_LINE_SIZE]; gchar buffer[CML_LINE_SIZE];
if (interactive_mode) if (interactive_mode)
{ {
...@@ -2293,7 +2293,7 @@ CML_load_parameter_file (guchar *filename, gint interactive_mode) ...@@ -2293,7 +2293,7 @@ CML_load_parameter_file (guchar *filename, gint interactive_mode)
} }
else else
{ {
guchar line[CML_LINE_SIZE]; gchar line[CML_LINE_SIZE];
gdouble version = 0.99; gdouble version = 0.99;
version = parse_line_to_gdouble (file, &flag); /* old format returns 1 */ version = parse_line_to_gdouble (file, &flag); /* old format returns 1 */
...@@ -2410,8 +2410,8 @@ CML_load_parameter_file (guchar *filename, gint interactive_mode) ...@@ -2410,8 +2410,8 @@ CML_load_parameter_file (guchar *filename, gint interactive_mode)
static gint static gint
parse_line_to_gint (FILE *file, gint *flag) parse_line_to_gint (FILE *file, gint *flag)