dnrops
/
gimp
mirror of https://github.com/GNOME/gimp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

*** empty log message ***

This commit is contained in:
Marc Lehmann 2000-05-10 03:02:55 +00:00
parent 8ffb40b7bf
commit a39fd6d69f
22 changed files with 108 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
Wed May 10 04:58:13 CEST 2000 Marc Lehmann <pcg@goof.com>
* 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 <jaycox@earthlink.net>
* app/image_map.[ch]: new function image_map_clear that removes

8
app/actions/plug-in-commands.c
View File

@ -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++;
}
}

8
app/gui/plug-in-commands.c
View File

@ -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++;
}
}

8
app/gui/plug-in-menus.c
View File

@ -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++;
}
}

8
app/menus/plug-in-menus.c
View File

@ -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++;
}
}

8
app/plug-in/gimpplugin-message.c
View File

@ -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++;
}
}

8
app/plug-in/gimpplugin-progress.c
View File

@ -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++;
}
}

8
app/plug-in/gimpplugin.c
View File

@ -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++;
}
}

8
app/plug-in/gimppluginmanager-call.c
View File

@ -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++;
}
}

8
app/plug-in/gimppluginmanager-run.c
View File

@ -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++;
}
}

8
app/plug-in/gimppluginmanager.c
View File

@ -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++;
}
}

8
app/plug-in/gimppluginshm.c
View File

@ -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++;
}
}

8
app/plug-in/plug-in-def.c
View File

@ -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++;
}
}

8
app/plug-in/plug-in-message.c
View File

@ -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++;
}
}

8
app/plug-in/plug-in-params.c
View File

@ -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++;
}
}

8
app/plug-in/plug-in-progress.c
View File

@ -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++;
}
}

8
app/plug-in/plug-in-run.c
View File

@ -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++;
}
}

8
app/plug-in/plug-in-shm.c
View File

@ -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++;
}
}

8
app/plug-in/plug-in.c
View File

@ -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++;
}
}

8
app/plug-in/plug-ins.c
View File

@ -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++;
}
}

8
app/plug_in.c
View File

@ -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++;
}
}

2
plug-ins/script-fu/scripts/asc2img.scm
View File

@ -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)