[librsvg] No need to validate UTF-8 in rsvg_extra_handler_characters()
- From: Federico Mena Quintero <federico src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [librsvg] No need to validate UTF-8 in rsvg_extra_handler_characters()
- Date: Mon, 19 Feb 2018 15:37:56 +0000 (UTC)
commit 4bb8914a7e062cad29480c7f2f2b8fa0ed82a1d3
Author: Federico Mena Quintero <federico gnome org>
Date: Mon Feb 19 09:36:49 2018 -0600
No need to validate UTF-8 in rsvg_extra_handler_characters()
Libxml2 already guarantees valid UTF-8.
With this we drop the glib requirement down to 2.48.0.
configure.ac | 2 +-
rsvg-base.c | 9 +--------
2 files changed, 2 insertions(+), 9 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 98465b34..ced65ff1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -44,7 +44,7 @@ dnl This corresponds to Freetype2 2.8
FREETYPE2_REQUIRED=20.0.14
GDK_PIXBUF_REQUIRED=2.20
GIO_REQUIRED=2.24.0
-GLIB_REQUIRED=2.52.0
+GLIB_REQUIRED=2.48.0
GTK3_REQUIRED=3.10.0
LIBXML_REQUIRED=2.9.0
PANGO_REQUIRED=1.38.0
diff --git a/rsvg-base.c b/rsvg-base.c
index a88d83da..c8da9c26 100644
--- a/rsvg-base.c
+++ b/rsvg-base.c
@@ -478,14 +478,7 @@ rsvg_extra_handler_characters (RsvgSaxHandler * self, const char *ch, gssize len
if (!ch || !len)
return;
- if (!g_utf8_validate ((char *) ch, len, NULL)) {
- char *utf8;
- utf8 = g_utf8_make_valid (ch, len);
- g_string_append (z->string, utf8);
- g_free (utf8);
- } else {
- g_string_append_len (z->string, (char *) ch, len);
- }
+ g_string_append_len (z->string, ch, len);
}
static void
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]