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

new function which takes any string and returns UTF-8 (it returns 

2003-10-16  Michael Natterer  <mitch@gimp.org>

	* libgimpbase/gimputils.[ch]: new function which takes any string
	and returns UTF-8 (it returns "(invalid UTF-8 string)" if all
	conversion attempts fail).

	* app/core/gimpbrush.c
	* app/core/gimpgradient.c
	* app/core/gimppalette.c
	* app/core/gimppattern.c
	* app/xcf/xcf-read.c: use it. Fixes bug #79897.
This commit is contained in:
Michael Natterer 2003-10-16 12:24:58 +00:00 committed by Michael Natterer
parent 5dc57411a9
commit e18793056f
12 changed files with 194 additions and 95 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ChangeLog
View File

@ -1,3 +1,15 @@
2003-10-16 Michael Natterer <mitch@gimp.org>
* libgimpbase/gimputils.[ch]: new function which takes any string
and returns UTF-8 (it returns "(invalid UTF-8 string)" if all
conversion attempts fail).
* app/core/gimpbrush.c
* app/core/gimpgradient.c
* app/core/gimppalette.c
* app/core/gimppattern.c
* app/xcf/xcf-read.c: use it. Fixes bug #79897.
2003-10-16 Michael Natterer <mitch@gimp.org> 2003-10-16 Michael Natterer <mitch@gimp.org>
* app/widgets/gimppaletteeditor.c: added "realize" and * app/widgets/gimppaletteeditor.c: added "realize" and

17
app/core/gimpbrush-load.c
View File

@ -42,6 +42,8 @@
#include <stdio.h> #include <stdio.h>
#include "libgimpbase/gimpbase.h"
#include "core-types.h" #include "core-types.h"
#include "base/brush-scale.h" #include "base/brush-scale.h"
@ -585,7 +587,10 @@ gimp_brush_load_brush (gint fd,
/* Read in the brush name */ /* Read in the brush name */
if ((bn_size = (header.header_size - sizeof (header)))) if ((bn_size = (header.header_size - sizeof (header))))
{ {
gchar *utf8;
name = g_new (gchar, bn_size); name = g_new (gchar, bn_size);
if ((read (fd, name, bn_size)) < bn_size) if ((read (fd, name, bn_size)) < bn_size)
{ {
g_set_error (error, GIMP_DATA_ERROR, GIMP_DATA_ERROR_READ, g_set_error (error, GIMP_DATA_ERROR, GIMP_DATA_ERROR_READ,
@ -596,13 +601,11 @@ gimp_brush_load_brush (gint fd,
return NULL; return NULL;
} }
if (!g_utf8_validate (name, -1, NULL)) utf8 = gimp_any_to_utf8 (name, -1,
{ _("Invalid UTF-8 string in brush file '%s'."),
g_message (_("Invalid UTF-8 string in brush file '%s'."), filename);
filename); g_free (name);
g_free (name); name = utf8;
name = NULL;
}
} }
if (!name) if (!name)

17
app/core/gimpbrush.c
View File

@ -42,6 +42,8 @@
#include <stdio.h> #include <stdio.h>
#include "libgimpbase/gimpbase.h"
#include "core-types.h" #include "core-types.h"
#include "base/brush-scale.h" #include "base/brush-scale.h"
@ -585,7 +587,10 @@ gimp_brush_load_brush (gint fd,
/* Read in the brush name */ /* Read in the brush name */
if ((bn_size = (header.header_size - sizeof (header)))) if ((bn_size = (header.header_size - sizeof (header))))
{ {
gchar *utf8;
name = g_new (gchar, bn_size); name = g_new (gchar, bn_size);
if ((read (fd, name, bn_size)) < bn_size) if ((read (fd, name, bn_size)) < bn_size)
{ {
g_set_error (error, GIMP_DATA_ERROR, GIMP_DATA_ERROR_READ, g_set_error (error, GIMP_DATA_ERROR, GIMP_DATA_ERROR_READ,
@ -596,13 +601,11 @@ gimp_brush_load_brush (gint fd,
return NULL; return NULL;
} }
if (!g_utf8_validate (name, -1, NULL)) utf8 = gimp_any_to_utf8 (name, -1,
{ _("Invalid UTF-8 string in brush file '%s'."),
g_message (_("Invalid UTF-8 string in brush file '%s'."), filename);
filename); g_free (name);
g_free (name); name = utf8;
name = NULL;
}
} }
if (!name) if (!name)

26
app/core/gimpgradient.c
View File

@ -374,28 +374,30 @@ gimp_gradient_load (const gchar *filename,
fgets (line, 1024, file); fgets (line, 1024, file);
if (! strncmp (line, "Name: ", strlen ("Name: "))) if (! strncmp (line, "Name: ", strlen ("Name: ")))
{ {
if (g_utf8_validate (line, -1, NULL)) gchar *utf8;
{
gimp_object_set_name (GIMP_OBJECT (gradient), utf8 = gimp_any_to_utf8 (&line[strlen ("Name: ")], -1,
g_strstrip (&line[strlen ("Name: ")])); _("Invalid UTF-8 string in gradient file '%s'."),
} filename);
else g_strstrip (utf8);
{
g_message (_("Invalid UTF-8 string in gradient file '%s'."), gimp_object_set_name (GIMP_OBJECT (gradient), utf8);
filename); g_free (utf8);
gimp_object_set_name (GIMP_OBJECT (gradient), _("Unnamed"));
}
fgets (line, 1024, file); fgets (line, 1024, file);
} }
else /* old gradient format */ else /* old gradient format */
{ {
gchar *basename; gchar *basename;
gchar *utf8;
basename = g_path_get_basename (filename); basename = g_path_get_basename (filename);
gimp_object_set_name (GIMP_OBJECT (gradient), basename); utf8 = g_filename_to_utf8 (basename, -1, NULL, NULL, NULL);
g_free (basename); g_free (basename);
gimp_object_set_name (GIMP_OBJECT (gradient), utf8);
g_free (utf8);
} }
num_segments = atoi (line); num_segments = atoi (line);

25
app/core/gimppalette-load.c
View File

@ -28,6 +28,7 @@
#include <glib-object.h> #include <glib-object.h>
#include "libgimpbase/gimpbase.h"
#include "libgimpcolor/gimpcolor.h" #include "libgimpcolor/gimpcolor.h"
#include "core-types.h" #include "core-types.h"
@ -430,16 +431,14 @@ gimp_palette_load (const gchar *filename,
if (! strncmp (str, "Name: ", strlen ("Name: "))) if (! strncmp (str, "Name: ", strlen ("Name: ")))
{ {
if (g_utf8_validate (str, -1, NULL)) gchar *utf8;
{
gimp_object_set_name (GIMP_OBJECT (palette), utf8 = gimp_any_to_utf8 (&str[strlen ("Name: ")], -1,
g_strstrip (&str[strlen ("Name: ")])); _("Invalid UTF-8 string in palette file '%s'"),
} filename);
else g_strstrip (utf8);
{
g_message (_("Invalid UTF-8 string in palette file '%s'"), filename); gimp_object_set_name (GIMP_OBJECT (palette), utf8);
gimp_object_set_name (GIMP_OBJECT (palette), _("Unnamed"));
}
if (! fgets (str, 1024, fp)) if (! fgets (str, 1024, fp))
{ {
@ -485,11 +484,15 @@ gimp_palette_load (const gchar *filename,
else /* old palette format */ else /* old palette format */
{ {
gchar *basename; gchar *basename;
gchar *utf8;
basename = g_path_get_basename (filename); basename = g_path_get_basename (filename);
gimp_object_set_name (GIMP_OBJECT (palette), basename); utf8 = g_filename_to_utf8 (basename, -1, NULL, NULL, NULL);
g_free (basename); g_free (basename);
gimp_object_set_name (GIMP_OBJECT (palette), utf8);
g_free (utf8);
} }
while (! feof (fp)) while (! feof (fp))

25
app/core/gimppalette-save.c
View File

@ -28,6 +28,7 @@
#include <glib-object.h> #include <glib-object.h>
#include "libgimpbase/gimpbase.h"
#include "libgimpcolor/gimpcolor.h" #include "libgimpcolor/gimpcolor.h"
#include "core-types.h" #include "core-types.h"
@ -430,16 +431,14 @@ gimp_palette_load (const gchar *filename,
if (! strncmp (str, "Name: ", strlen ("Name: "))) if (! strncmp (str, "Name: ", strlen ("Name: ")))
{ {
if (g_utf8_validate (str, -1, NULL)) gchar *utf8;
{
gimp_object_set_name (GIMP_OBJECT (palette), utf8 = gimp_any_to_utf8 (&str[strlen ("Name: ")], -1,
g_strstrip (&str[strlen ("Name: ")])); _("Invalid UTF-8 string in palette file '%s'"),
} filename);
else g_strstrip (utf8);
{
g_message (_("Invalid UTF-8 string in palette file '%s'"), filename); gimp_object_set_name (GIMP_OBJECT (palette), utf8);
gimp_object_set_name (GIMP_OBJECT (palette), _("Unnamed"));
}
if (! fgets (str, 1024, fp)) if (! fgets (str, 1024, fp))
{ {
@ -485,11 +484,15 @@ gimp_palette_load (const gchar *filename,
else /* old palette format */ else /* old palette format */
{ {
gchar *basename; gchar *basename;
gchar *utf8;
basename = g_path_get_basename (filename); basename = g_path_get_basename (filename);
gimp_object_set_name (GIMP_OBJECT (palette), basename); utf8 = g_filename_to_utf8 (basename, -1, NULL, NULL, NULL);
g_free (basename); g_free (basename);
gimp_object_set_name (GIMP_OBJECT (palette), utf8);
g_free (utf8);
} }
while (! feof (fp)) while (! feof (fp))

25
app/core/gimppalette.c
View File

@ -28,6 +28,7 @@
#include <glib-object.h> #include <glib-object.h>
#include "libgimpbase/gimpbase.h"
#include "libgimpcolor/gimpcolor.h" #include "libgimpcolor/gimpcolor.h"
#include "core-types.h" #include "core-types.h"
@ -430,16 +431,14 @@ gimp_palette_load (const gchar *filename,
if (! strncmp (str, "Name: ", strlen ("Name: "))) if (! strncmp (str, "Name: ", strlen ("Name: ")))
{ {
if (g_utf8_validate (str, -1, NULL)) gchar *utf8;
{
gimp_object_set_name (GIMP_OBJECT (palette), utf8 = gimp_any_to_utf8 (&str[strlen ("Name: ")], -1,
g_strstrip (&str[strlen ("Name: ")])); _("Invalid UTF-8 string in palette file '%s'"),
} filename);
else g_strstrip (utf8);
{
g_message (_("Invalid UTF-8 string in palette file '%s'"), filename); gimp_object_set_name (GIMP_OBJECT (palette), utf8);
gimp_object_set_name (GIMP_OBJECT (palette), _("Unnamed"));
}
if (! fgets (str, 1024, fp)) if (! fgets (str, 1024, fp))
{ {
@ -485,11 +484,15 @@ gimp_palette_load (const gchar *filename,
else /* old palette format */ else /* old palette format */
{ {
gchar *basename; gchar *basename;
gchar *utf8;
basename = g_path_get_basename (filename); basename = g_path_get_basename (filename);
gimp_object_set_name (GIMP_OBJECT (palette), basename); utf8 = g_filename_to_utf8 (basename, -1, NULL, NULL, NULL);
g_free (basename); g_free (basename);
gimp_object_set_name (GIMP_OBJECT (palette), utf8);
g_free (utf8);
} }
while (! feof (fp)) while (! feof (fp))

16
app/core/gimppattern-load.c
View File

@ -41,6 +41,8 @@
#define _O_BINARY 0 #define _O_BINARY 0
#endif #endif
#include "libgimpbase/gimpbase.h"
#include "core-types.h" #include "core-types.h"
#include "config/gimpbaseconfig.h" #include "config/gimpbaseconfig.h"
@ -390,6 +392,8 @@ gimp_pattern_load (const gchar *filename,
/* Read in the pattern name */ /* Read in the pattern name */
if ((bn_size = (header.header_size - sizeof (header)))) if ((bn_size = (header.header_size - sizeof (header))))
{ {
gchar *utf8;
name = g_new (gchar, bn_size); name = g_new (gchar, bn_size);
if ((read (fd, name, bn_size)) < bn_size) if ((read (fd, name, bn_size)) < bn_size)
@ -400,13 +404,11 @@ gimp_pattern_load (const gchar *filename,
goto error; goto error;
} }
if (!g_utf8_validate (name, -1, NULL)) utf8 = gimp_any_to_utf8 (name, -1,
{ _("Invalid UTF-8 string in pattern file '%s'."),
g_message (_("Invalid UTF-8 string in pattern file '%s'."), filename);
filename); g_free (name);
g_free (name); name = utf8;
name = NULL;
}
} }
if (!name) if (!name)

16
app/core/gimppattern.c
View File

@ -41,6 +41,8 @@
#define _O_BINARY 0 #define _O_BINARY 0
#endif #endif
#include "libgimpbase/gimpbase.h"
#include "core-types.h" #include "core-types.h"
#include "config/gimpbaseconfig.h" #include "config/gimpbaseconfig.h"
@ -390,6 +392,8 @@ gimp_pattern_load (const gchar *filename,
/* Read in the pattern name */ /* Read in the pattern name */
if ((bn_size = (header.header_size - sizeof (header)))) if ((bn_size = (header.header_size - sizeof (header))))
{ {
gchar *utf8;
name = g_new (gchar, bn_size); name = g_new (gchar, bn_size);
if ((read (fd, name, bn_size)) < bn_size) if ((read (fd, name, bn_size)) < bn_size)
@ -400,13 +404,11 @@ gimp_pattern_load (const gchar *filename,
goto error; goto error;
} }
if (!g_utf8_validate (name, -1, NULL)) utf8 = gimp_any_to_utf8 (name, -1,
{ _("Invalid UTF-8 string in pattern file '%s'."),
g_message (_("Invalid UTF-8 string in pattern file '%s'."), filename);
filename); g_free (name);
g_free (name); name = utf8;
name = NULL;
}
} }
if (!name) if (!name)

19
app/xcf/xcf-read.c
View File

@ -22,6 +22,8 @@
#include <glib.h> #include <glib.h>
#include "libgimpbase/gimpbase.h"
#include "xcf-read.h" #include "xcf-read.h"
#include "gimp-intl.h" #include "gimp-intl.h"
@ -101,21 +103,10 @@ xcf_read_string (FILE *fp,
if (str[tmp - 1] != '\0') if (str[tmp - 1] != '\0')
str[tmp - 1] = '\0'; str[tmp - 1] = '\0';
if (! g_utf8_validate (str, -1, NULL)) data[i] = gimp_any_to_utf8 (str, -1,
{ _("Invalid UTF-8 string in XCF file"));
gchar *utf8_str;
utf8_str = g_locale_to_utf8 (str, -1, NULL, NULL, NULL); g_free (str);
g_free (str);
if (utf8_str)
str = utf8_str;
else
str = g_strdup (_("(invalid UTF-8 string)"));
}
data[i] = str;
} }
else else
{ {

77
libgimpbase/gimputils.c
View File

@ -40,7 +40,7 @@
* Creates a (possibly trimmed) copy of @str. The string is cut if it * Creates a (possibly trimmed) copy of @str. The string is cut if it
* exceeds @max_chars characters or on the first newline. The fact * exceeds @max_chars characters or on the first newline. The fact
* that the string was trimmed is indicated by appending an ellipsis. * that the string was trimmed is indicated by appending an ellipsis.
* *
* Returns: A (possibly trimmed) copy of @str which should be freed * Returns: A (possibly trimmed) copy of @str which should be freed
* using g_free() when it is not needed any longer. * using g_free() when it is not needed any longer.
**/ **/
@ -99,15 +99,86 @@ gimp_utf8_strtrim (const gchar *str,
return NULL; return NULL;
} }
/**
* gimp_any_to_utf8:
* @str: The string to be converted to UTF-8.
* @len: The length of the string, or -1 if the string
* is nul-terminated.
* @warning_format: The message format for the warning message if conversion
* to UTF-8 fails. See the <function>printf()</function>
* documentation.
* @Varargs: The parameters to insert into the format string.
*
* This function takes any string (UTF-8 or not) and always returns a valid
* UTF-8 string.
*
* If @str is valid UTF-8, a copy of the string is returned.
*
* If UTF-8 validation fails, g_locale_to_utf8() is tried and if it
* succeeds the resulting string is returned.
*
* Otherwise, the portion of @str that is UTF-8, concatenated
* with "(invalid UTF-8 string)" is returned. If not even the start
* of @str is valid UTF-8, only "(invalid UTF-8 string)" is returned.
*
* Return value: The UTF-8 string as described above.
**/
gchar *
gimp_any_to_utf8 (const gchar *str,
gssize len,
const gchar *warning_format,
...)
{
const gchar *start_invalid;
gchar *utf8;
g_return_val_if_fail (str != NULL, NULL);
if (g_utf8_validate (str, len, &start_invalid))
utf8 = g_strdup (str);
else
utf8 = g_locale_to_utf8 (str, len, NULL, NULL, NULL);
if (! utf8)
{
if (warning_format)
{
va_list warning_args;
va_start (warning_args, warning_format);
g_logv (G_LOG_DOMAIN, G_LOG_LEVEL_MESSAGE,
warning_format, warning_args);
va_end (warning_args);
}
if (start_invalid > str)
{
gchar *tmp;
tmp = g_strndup (str, start_invalid - str);
utf8 = g_strconcat (tmp, _("(invalid UTF-8 string)"), NULL);
g_free (tmp);
}
else
{
utf8 = g_strdup (_("(invalid UTF-8 string)"));
}
}
return utf8;
}
/** /**
* gimp_memsize_to_string: * gimp_memsize_to_string:
* @memsize: A memory size in bytes. * @memsize: A memory size in bytes.
* *
* This function returns a human readable, translated representation * This function returns a human readable, translated representation
* of the passed @memsize. Large values are rounded to the closest * of the passed @memsize. Large values are rounded to the closest
* reasonable memsize unit, e.g.: "3456" becomes "3456 Bytes", "4100" * reasonable memsize unit, e.g.: "3456" becomes "3456 Bytes", "4100"
* becomes "4 KB" and so on. * becomes "4 KB" and so on.
* *
* Return value: A human-readable, translated string. * Return value: A human-readable, translated string.
**/ **/
gchar * gchar *

14
libgimpbase/gimputils.h
View File

@ -1,14 +1,14 @@
/* LIBGIMP - The GIMP Library /* LIBGIMP - The GIMP Library
* Copyright (C) 1995-1997 Peter Mattis and Spencer Kimball * Copyright (C) 1995-1997 Peter Mattis and Spencer Kimball
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public * modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either * License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version. * version 2 of the License, or (at your option) any later version.
* *
* This library is distributed in the hope that it will be useful, * This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of * but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Library General Public License for more details. * Library General Public License for more details.
* *
* You should have received a copy of the GNU Lesser General Public * You should have received a copy of the GNU Lesser General Public
@ -23,6 +23,10 @@
gchar * gimp_utf8_strtrim (const gchar *str, gchar * gimp_utf8_strtrim (const gchar *str,
gint max_chars); gint max_chars);
gchar * gimp_any_to_utf8 (const gchar *str,
gssize len,
const gchar *warning_format,
...) G_GNUC_PRINTF (3, 4);
gchar * gimp_memsize_to_string (gulong memsize); gchar * gimp_memsize_to_string (gulong memsize);