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

plugged tiny memory leak. 

2007-07-17  Sven Neumann  <sven@gimp.org>

	* app/plug-in/gimppluginprocedure.c
	(gimp_plug_in_procedure_set_file_proc): plugged tiny memory 
leak.

	* libgimpcolor/gimprgb.c (gimp_rgb_min) (gimp_rgb_max): 
formatting.


svn path=/trunk/; revision=22940
This commit is contained in:
Sven Neumann 2007-07-17 07:22:20 +00:00 committed by Sven Neumann
parent a9efcaa935
commit de7d46d6e2
3 changed files with 42 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
2007-07-17 Sven Neumann <sven@gimp.org>
* app/plug-in/gimppluginprocedure.c
(gimp_plug_in_procedure_set_file_proc): plugged tiny memory leak.
* libgimpcolor/gimprgb.c (gimp_rgb_min) (gimp_rgb_max): formatting.
2007-07-17 Sven Neumann <sven@gimp.org>
* libgimpconfig/gimpconfigwriter.c (gimp_config_writer_finish):

30
app/plug-in/gimppluginprocedure.c
View File

@ -824,12 +824,13 @@ extensions_parse (gchar *extensions)
{
GSList *list = NULL;
/* EXTENSIONS can be NULL. Avoid calling strtok if it is. */
/* extensions can be NULL. Avoid calling strtok if it is. */
if (extensions)
{
gchar *extension;
gchar *next_token;
/* work on a copy */
extensions = g_strdup (extensions);
next_token = extensions;
@ -857,31 +858,58 @@ gimp_plug_in_procedure_set_file_proc (GimpPlugInProcedure *proc,
proc->file_proc = TRUE;
/* extensions */
if (proc->extensions != extensions)
{
if (proc->extensions)
g_free (proc->extensions);
proc->extensions = g_strdup (extensions);
}
if (proc->extensions_list)
{
g_slist_foreach (proc->extensions_list, (GFunc) g_free, NULL);
g_slist_free (proc->extensions_list);
}
proc->extensions_list = extensions_parse (proc->extensions);
/* prefixes */
if (proc->prefixes != prefixes)
{
if (proc->prefixes)
g_free (proc->prefixes);
proc->prefixes = g_strdup (prefixes);
}
if (proc->prefixes_list)
{
g_slist_foreach (proc->prefixes_list, (GFunc) g_free, NULL);
g_slist_free (proc->prefixes_list);
}
proc->prefixes_list = extensions_parse (proc->prefixes);
/* magics */
if (proc->magics != magics)
{
if (proc->magics)
g_free (proc->magics);
proc->magics = g_strdup (magics);
}
if (proc->magics_list)
{
g_slist_foreach (proc->magics_list, (GFunc) g_free, NULL);
g_slist_free (proc->magics_list);
}
proc->magics_list = extensions_parse (proc->magics);
}

10
libgimpcolor/gimprgb.c
View File

@ -211,8 +211,9 @@ gimp_rgb_max (const GimpRGB *rgb)
g_return_val_if_fail (rgb != NULL, 0.0);
if (rgb->r > rgb->g)
return (rgb->r > rgb->b) ? rgb->r : rgb->b;
return (rgb->g > rgb->b) ? rgb->g : rgb->b;
return (rgb->r > rgb->b) ? rgb->r : rgb->b;
else
return (rgb->g > rgb->b) ? rgb->g : rgb->b;
}
gdouble
@ -221,8 +222,9 @@ gimp_rgb_min (const GimpRGB *rgb)
g_return_val_if_fail (rgb != NULL, 0.0);
if (rgb->r < rgb->g)
return (rgb->r < rgb->b) ? rgb->r : rgb->b;
return (rgb->g < rgb->b) ? rgb->g : rgb->b;
return (rgb->r < rgb->b) ? rgb->r : rgb->b;
else
return (rgb->g < rgb->b) ? rgb->g : rgb->b;
}
void