diff options
| author | Jon A. Cruz <jon@joncruz.org> | 2009-12-20 09:40:55 +0000 |
|---|---|---|
| committer | Jon A. Cruz <jon@joncruz.org> | 2009-12-20 09:40:55 +0000 |
| commit | e29cecc01b6fa0a8984ef780819e8e812b5505fc (patch) | |
| tree | 98683cbf5950202016d242044c27612da0e653d0 /src/svg | |
| parent | modify exit message if non-Ascii characters (diff) | |
| download | inkscape-e29cecc01b6fa0a8984ef780819e8e812b5505fc.tar.gz inkscape-e29cecc01b6fa0a8984ef780819e8e812b5505fc.zip | |
Warning cleanup
(bzr r8895)
Diffstat (limited to 'src/svg')
| -rw-r--r-- | src/svg/svg-color.cpp | 4 | ||||
| -rw-r--r-- | src/svg/svg-length.cpp | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/svg/svg-color.cpp b/src/svg/svg-color.cpp index 46779311e..ff5a6c2d3 100644 --- a/src/svg/svg-color.cpp +++ b/src/svg/svg-color.cpp @@ -351,9 +351,9 @@ sp_svg_read_color(gchar const *str, gchar const **end_ptr, guint32 dfl) * this check wrapper. */ gchar const *end = str; guint32 const ret = internal_sp_svg_read_color(str, &end, dfl); - assert(ret == dfl && end == str + assert(((ret == dfl) && (end == str)) || (((ret & 0xff) == 0) - && str < end)); + && (str < end))); if (str < end) { gchar *buf = (gchar *) g_malloc(end + 1 - str); memcpy(buf, str, end - str); diff --git a/src/svg/svg-length.cpp b/src/svg/svg-length.cpp index 942f74d46..94f1cf312 100644 --- a/src/svg/svg-length.cpp +++ b/src/svg/svg-length.cpp @@ -64,6 +64,7 @@ unsigned int sp_svg_number_read_d(gchar const *str, double *val) return 1; } +// TODO must add a buffer length parameter for safety: static unsigned int sp_svg_number_write_ui(gchar *buf, unsigned int val) { unsigned int i = 0; |