diff --git a/ChangeLog b/ChangeLog index 55b411aabe..9ac6a09d0b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +Wed May 10 04:58:13 CEST 2000 Marc Lehmann + + * app/plug_in.c: Fix endless loop problem for certain image_types, + added a warning. + * plug-ins/script-fu/scripts/asc2img.scm: Change image_types argument + from "bar" to "". + 2000-05-08 Jay Cox * app/image_map.[ch]: new function image_map_clear that removes diff --git a/app/actions/plug-in-commands.c b/app/actions/plug-in-commands.c index 1567091246..ca5ffee17b 100644 --- a/app/actions/plug-in-commands.c +++ b/app/actions/plug-in-commands.c @@ -3315,6 +3315,7 @@ plug_in_args_destroy (Argument *args, gint plug_in_image_types_parse (gchar *image_types) { + gchar *type_spec = image_types; gint types = 0; /* @@ -3388,10 +3389,11 @@ plug_in_image_types_parse (gchar *image_types) } else { + g_warning ("image_type contains unrecognizable parts: '%s'", type_spec); while (*image_types && - (*image_types != 'R') && - (*image_types != 'G') && - (*image_types != 'I')) + ((*image_types != ' ') || + (*image_types != '\t') || + (*image_types != ','))) image_types++; } } diff --git a/app/gui/plug-in-commands.c b/app/gui/plug-in-commands.c index 1567091246..ca5ffee17b 100644 --- a/app/gui/plug-in-commands.c +++ b/app/gui/plug-in-commands.c @@ -3315,6 +3315,7 @@ plug_in_args_destroy (Argument *args, gint plug_in_image_types_parse (gchar *image_types) { + gchar *type_spec = image_types; gint types = 0; /* @@ -3388,10 +3389,11 @@ plug_in_image_types_parse (gchar *image_types) } else { + g_warning ("image_type contains unrecognizable parts: '%s'", type_spec); while (*image_types && - (*image_types != 'R') && - (*image_types != 'G') && - (*image_types != 'I')) + ((*image_types != ' ') || + (*image_types != '\t') || + (*image_types != ','))) image_types++; } } diff --git a/app/gui/plug-in-menus.c b/app/gui/plug-in-menus.c index 1567091246..ca5ffee17b 100644 --- a/app/gui/plug-in-menus.c +++ b/app/gui/plug-in-menus.c @@ -3315,6 +3315,7 @@ plug_in_args_destroy (Argument *args, gint plug_in_image_types_parse (gchar *image_types) { + gchar *type_spec = image_types; gint types = 0; /* @@ -3388,10 +3389,11 @@ plug_in_image_types_parse (gchar *image_types) } else { + g_warning ("image_type contains unrecognizable parts: '%s'", type_spec); while (*image_types && - (*image_types != 'R') && - (*image_types != 'G') && - (*image_types != 'I')) + ((*image_types != ' ') || + (*image_types != '\t') || + (*image_types != ','))) image_types++; } } diff --git a/app/menus/plug-in-menus.c b/app/menus/plug-in-menus.c index 1567091246..ca5ffee17b 100644 --- a/app/menus/plug-in-menus.c +++ b/app/menus/plug-in-menus.c @@ -3315,6 +3315,7 @@ plug_in_args_destroy (Argument *args, gint plug_in_image_types_parse (gchar *image_types) { + gchar *type_spec = image_types; gint types = 0; /* @@ -3388,10 +3389,11 @@ plug_in_image_types_parse (gchar *image_types) } else { + g_warning ("image_type contains unrecognizable parts: '%s'", type_spec); while (*image_types && - (*image_types != 'R') && - (*image_types != 'G') && - (*image_types != 'I')) + ((*image_types != ' ') || + (*image_types != '\t') || + (*image_types != ','))) image_types++; } } diff --git a/app/plug-in/gimpplugin-message.c b/app/plug-in/gimpplugin-message.c index 1567091246..ca5ffee17b 100644 --- a/app/plug-in/gimpplugin-message.c +++ b/app/plug-in/gimpplugin-message.c @@ -3315,6 +3315,7 @@ plug_in_args_destroy (Argument *args, gint plug_in_image_types_parse (gchar *image_types) { + gchar *type_spec = image_types; gint types = 0; /* @@ -3388,10 +3389,11 @@ plug_in_image_types_parse (gchar *image_types) } else { + g_warning ("image_type contains unrecognizable parts: '%s'", type_spec); while (*image_types && - (*image_types != 'R') && - (*image_types != 'G') && - (*image_types != 'I')) + ((*image_types != ' ') || + (*image_types != '\t') || + (*image_types != ','))) image_types++; } } diff --git a/app/plug-in/gimpplugin-progress.c b/app/plug-in/gimpplugin-progress.c index 1567091246..ca5ffee17b 100644 --- a/app/plug-in/gimpplugin-progress.c +++ b/app/plug-in/gimpplugin-progress.c @@ -3315,6 +3315,7 @@ plug_in_args_destroy (Argument *args, gint plug_in_image_types_parse (gchar *image_types) { + gchar *type_spec = image_types; gint types = 0; /* @@ -3388,10 +3389,11 @@ plug_in_image_types_parse (gchar *image_types) } else { + g_warning ("image_type contains unrecognizable parts: '%s'", type_spec); while (*image_types && - (*image_types != 'R') && - (*image_types != 'G') && - (*image_types != 'I')) + ((*image_types != ' ') || + (*image_types != '\t') || + (*image_types != ','))) image_types++; } } diff --git a/app/plug-in/gimpplugin.c b/app/plug-in/gimpplugin.c index 1567091246..ca5ffee17b 100644 --- a/app/plug-in/gimpplugin.c +++ b/app/plug-in/gimpplugin.c @@ -3315,6 +3315,7 @@ plug_in_args_destroy (Argument *args, gint plug_in_image_types_parse (gchar *image_types) { + gchar *type_spec = image_types; gint types = 0; /* @@ -3388,10 +3389,11 @@ plug_in_image_types_parse (gchar *image_types) } else { + g_warning ("image_type contains unrecognizable parts: '%s'", type_spec); while (*image_types && - (*image_types != 'R') && - (*image_types != 'G') && - (*image_types != 'I')) + ((*image_types != ' ') || + (*image_types != '\t') || + (*image_types != ','))) image_types++; } } diff --git a/app/plug-in/gimppluginmanager-call.c b/app/plug-in/gimppluginmanager-call.c index 1567091246..ca5ffee17b 100644 --- a/app/plug-in/gimppluginmanager-call.c +++ b/app/plug-in/gimppluginmanager-call.c @@ -3315,6 +3315,7 @@ plug_in_args_destroy (Argument *args, gint plug_in_image_types_parse (gchar *image_types) { + gchar *type_spec = image_types; gint types = 0; /* @@ -3388,10 +3389,11 @@ plug_in_image_types_parse (gchar *image_types) } else { + g_warning ("image_type contains unrecognizable parts: '%s'", type_spec); while (*image_types && - (*image_types != 'R') && - (*image_types != 'G') && - (*image_types != 'I')) + ((*image_types != ' ') || + (*image_types != '\t') || + (*image_types != ','))) image_types++; } } diff --git a/app/plug-in/gimppluginmanager-run.c b/app/plug-in/gimppluginmanager-run.c index 1567091246..ca5ffee17b 100644 --- a/app/plug-in/gimppluginmanager-run.c +++ b/app/plug-in/gimppluginmanager-run.c @@ -3315,6 +3315,7 @@ plug_in_args_destroy (Argument *args, gint plug_in_image_types_parse (gchar *image_types) { + gchar *type_spec = image_types; gint types = 0; /* @@ -3388,10 +3389,11 @@ plug_in_image_types_parse (gchar *image_types) } else { + g_warning ("image_type contains unrecognizable parts: '%s'", type_spec); while (*image_types && - (*image_types != 'R') && - (*image_types != 'G') && - (*image_types != 'I')) + ((*image_types != ' ') || + (*image_types != '\t') || + (*image_types != ','))) image_types++; } } diff --git a/app/plug-in/gimppluginmanager.c b/app/plug-in/gimppluginmanager.c index 1567091246..ca5ffee17b 100644 --- a/app/plug-in/gimppluginmanager.c +++ b/app/plug-in/gimppluginmanager.c @@ -3315,6 +3315,7 @@ plug_in_args_destroy (Argument *args, gint plug_in_image_types_parse (gchar *image_types) { + gchar *type_spec = image_types; gint types = 0; /* @@ -3388,10 +3389,11 @@ plug_in_image_types_parse (gchar *image_types) } else { + g_warning ("image_type contains unrecognizable parts: '%s'", type_spec); while (*image_types && - (*image_types != 'R') && - (*image_types != 'G') && - (*image_types != 'I')) + ((*image_types != ' ') || + (*image_types != '\t') || + (*image_types != ','))) image_types++; } } diff --git a/app/plug-in/gimppluginshm.c b/app/plug-in/gimppluginshm.c index 1567091246..ca5ffee17b 100644 --- a/app/plug-in/gimppluginshm.c +++ b/app/plug-in/gimppluginshm.c @@ -3315,6 +3315,7 @@ plug_in_args_destroy (Argument *args, gint plug_in_image_types_parse (gchar *image_types) { + gchar *type_spec = image_types; gint types = 0; /* @@ -3388,10 +3389,11 @@ plug_in_image_types_parse (gchar *image_types) } else { + g_warning ("image_type contains unrecognizable parts: '%s'", type_spec); while (*image_types && - (*image_types != 'R') && - (*image_types != 'G') && - (*image_types != 'I')) + ((*image_types != ' ') || + (*image_types != '\t') || + (*image_types != ','))) image_types++; } } diff --git a/app/plug-in/plug-in-def.c b/app/plug-in/plug-in-def.c index 1567091246..ca5ffee17b 100644 --- a/app/plug-in/plug-in-def.c +++ b/app/plug-in/plug-in-def.c @@ -3315,6 +3315,7 @@ plug_in_args_destroy (Argument *args, gint plug_in_image_types_parse (gchar *image_types) { + gchar *type_spec = image_types; gint types = 0; /* @@ -3388,10 +3389,11 @@ plug_in_image_types_parse (gchar *image_types) } else { + g_warning ("image_type contains unrecognizable parts: '%s'", type_spec); while (*image_types && - (*image_types != 'R') && - (*image_types != 'G') && - (*image_types != 'I')) + ((*image_types != ' ') || + (*image_types != '\t') || + (*image_types != ','))) image_types++; } } diff --git a/app/plug-in/plug-in-message.c b/app/plug-in/plug-in-message.c index 1567091246..ca5ffee17b 100644 --- a/app/plug-in/plug-in-message.c +++ b/app/plug-in/plug-in-message.c @@ -3315,6 +3315,7 @@ plug_in_args_destroy (Argument *args, gint plug_in_image_types_parse (gchar *image_types) { + gchar *type_spec = image_types; gint types = 0; /* @@ -3388,10 +3389,11 @@ plug_in_image_types_parse (gchar *image_types) } else { + g_warning ("image_type contains unrecognizable parts: '%s'", type_spec); while (*image_types && - (*image_types != 'R') && - (*image_types != 'G') && - (*image_types != 'I')) + ((*image_types != ' ') || + (*image_types != '\t') || + (*image_types != ','))) image_types++; } } diff --git a/app/plug-in/plug-in-params.c b/app/plug-in/plug-in-params.c index 1567091246..ca5ffee17b 100644 --- a/app/plug-in/plug-in-params.c +++ b/app/plug-in/plug-in-params.c @@ -3315,6 +3315,7 @@ plug_in_args_destroy (Argument *args, gint plug_in_image_types_parse (gchar *image_types) { + gchar *type_spec = image_types; gint types = 0; /* @@ -3388,10 +3389,11 @@ plug_in_image_types_parse (gchar *image_types) } else { + g_warning ("image_type contains unrecognizable parts: '%s'", type_spec); while (*image_types && - (*image_types != 'R') && - (*image_types != 'G') && - (*image_types != 'I')) + ((*image_types != ' ') || + (*image_types != '\t') || + (*image_types != ','))) image_types++; } } diff --git a/app/plug-in/plug-in-progress.c b/app/plug-in/plug-in-progress.c index 1567091246..ca5ffee17b 100644 --- a/app/plug-in/plug-in-progress.c +++ b/app/plug-in/plug-in-progress.c @@ -3315,6 +3315,7 @@ plug_in_args_destroy (Argument *args, gint plug_in_image_types_parse (gchar *image_types) { + gchar *type_spec = image_types; gint types = 0; /* @@ -3388,10 +3389,11 @@ plug_in_image_types_parse (gchar *image_types) } else { + g_warning ("image_type contains unrecognizable parts: '%s'", type_spec); while (*image_types && - (*image_types != 'R') && - (*image_types != 'G') && - (*image_types != 'I')) + ((*image_types != ' ') || + (*image_types != '\t') || + (*image_types != ','))) image_types++; } } diff --git a/app/plug-in/plug-in-run.c b/app/plug-in/plug-in-run.c index 1567091246..ca5ffee17b 100644 --- a/app/plug-in/plug-in-run.c +++ b/app/plug-in/plug-in-run.c @@ -3315,6 +3315,7 @@ plug_in_args_destroy (Argument *args, gint plug_in_image_types_parse (gchar *image_types) { + gchar *type_spec = image_types; gint types = 0; /* @@ -3388,10 +3389,11 @@ plug_in_image_types_parse (gchar *image_types) } else { + g_warning ("image_type contains unrecognizable parts: '%s'", type_spec); while (*image_types && - (*image_types != 'R') && - (*image_types != 'G') && - (*image_types != 'I')) + ((*image_types != ' ') || + (*image_types != '\t') || + (*image_types != ','))) image_types++; } } diff --git a/app/plug-in/plug-in-shm.c b/app/plug-in/plug-in-shm.c index 1567091246..ca5ffee17b 100644 --- a/app/plug-in/plug-in-shm.c +++ b/app/plug-in/plug-in-shm.c @@ -3315,6 +3315,7 @@ plug_in_args_destroy (Argument *args, gint plug_in_image_types_parse (gchar *image_types) { + gchar *type_spec = image_types; gint types = 0; /* @@ -3388,10 +3389,11 @@ plug_in_image_types_parse (gchar *image_types) } else { + g_warning ("image_type contains unrecognizable parts: '%s'", type_spec); while (*image_types && - (*image_types != 'R') && - (*image_types != 'G') && - (*image_types != 'I')) + ((*image_types != ' ') || + (*image_types != '\t') || + (*image_types != ','))) image_types++; } } diff --git a/app/plug-in/plug-in.c b/app/plug-in/plug-in.c index 1567091246..ca5ffee17b 100644 --- a/app/plug-in/plug-in.c +++ b/app/plug-in/plug-in.c @@ -3315,6 +3315,7 @@ plug_in_args_destroy (Argument *args, gint plug_in_image_types_parse (gchar *image_types) { + gchar *type_spec = image_types; gint types = 0; /* @@ -3388,10 +3389,11 @@ plug_in_image_types_parse (gchar *image_types) } else { + g_warning ("image_type contains unrecognizable parts: '%s'", type_spec); while (*image_types && - (*image_types != 'R') && - (*image_types != 'G') && - (*image_types != 'I')) + ((*image_types != ' ') || + (*image_types != '\t') || + (*image_types != ','))) image_types++; } } diff --git a/app/plug-in/plug-ins.c b/app/plug-in/plug-ins.c index 1567091246..ca5ffee17b 100644 --- a/app/plug-in/plug-ins.c +++ b/app/plug-in/plug-ins.c @@ -3315,6 +3315,7 @@ plug_in_args_destroy (Argument *args, gint plug_in_image_types_parse (gchar *image_types) { + gchar *type_spec = image_types; gint types = 0; /* @@ -3388,10 +3389,11 @@ plug_in_image_types_parse (gchar *image_types) } else { + g_warning ("image_type contains unrecognizable parts: '%s'", type_spec); while (*image_types && - (*image_types != 'R') && - (*image_types != 'G') && - (*image_types != 'I')) + ((*image_types != ' ') || + (*image_types != '\t') || + (*image_types != ','))) image_types++; } } diff --git a/app/plug_in.c b/app/plug_in.c index 1567091246..ca5ffee17b 100644 --- a/app/plug_in.c +++ b/app/plug_in.c @@ -3315,6 +3315,7 @@ plug_in_args_destroy (Argument *args, gint plug_in_image_types_parse (gchar *image_types) { + gchar *type_spec = image_types; gint types = 0; /* @@ -3388,10 +3389,11 @@ plug_in_image_types_parse (gchar *image_types) } else { + g_warning ("image_type contains unrecognizable parts: '%s'", type_spec); while (*image_types && - (*image_types != 'R') && - (*image_types != 'G') && - (*image_types != 'I')) + ((*image_types != ' ') || + (*image_types != '\t') || + (*image_types != ','))) image_types++; } } diff --git a/plug-ins/script-fu/scripts/asc2img.scm b/plug-ins/script-fu/scripts/asc2img.scm index a7935684e5..109c0ce9f3 100644 --- a/plug-ins/script-fu/scripts/asc2img.scm +++ b/plug-ins/script-fu/scripts/asc2img.scm @@ -213,7 +213,7 @@ "Chris Gutteridge: cjg@ecs.soton.ac.uk" "8th April 1998" "Chris Gutteridge / ECS @ University of Southampton, England" - "bar" + "" SF-FILENAME _"Filename" "afile" SF-FONT _"Font" "-*-Charter-*-r-*-*-24-*-*-*-p-*-*-*" SF-ADJUSTMENT _"Font Size (pixels)" '(45 2 1000 1 10 0 1)