summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorKris De Gussem <kris.degussem@gmail.com>2012-03-01 19:46:50 +0000
committerKris <Kris.De.Gussem@hotmail.com>2012-03-01 19:46:50 +0000
commitde497c9274d8cbd32cddd86d24e07abe11c32017 (patch)
tree058982c7a8077f57885102ea81f5f95e89aba008 /src
parentpatch by Veronika Irvine for filter effects dialog sizing (Bug 932474) (diff)
downloadinkscape-de497c9274d8cbd32cddd86d24e07abe11c32017.tar.gz
inkscape-de497c9274d8cbd32cddd86d24e07abe11c32017.zip
fix issues introduced with revision 10932
(bzr r11035)
Diffstat (limited to 'src')
-rw-r--r--src/extension/internal/gimpgrad.cpp2
-rw-r--r--src/text-context.cpp6
2 files changed, 4 insertions, 4 deletions
diff --git a/src/extension/internal/gimpgrad.cpp b/src/extension/internal/gimpgrad.cpp
index 5a1bbe1c3..8c348dfbb 100644
--- a/src/extension/internal/gimpgrad.cpp
+++ b/src/extension/internal/gimpgrad.cpp
@@ -224,7 +224,7 @@ GimpGrad::open (Inkscape::Extension::Input */*module*/, gchar const *filename)
* add some intermediate stops to convert to the linear/sRGB interpolation */
int type; /* enum: linear, curved, sine, sphere increasing, sphere decreasing. */
int color_interpolation; /* enum: rgb, hsv anticlockwise, hsv clockwise. */
- if (sscanf(p, "%.8d %.8d", &type, &color_interpolation) != 2) {
+ if (sscanf(p, "%8d %8d", &type, &color_interpolation) != 2) {
continue;
}
}
diff --git a/src/text-context.cpp b/src/text-context.cpp
index 6bb153780..f1becb58d 100644
--- a/src/text-context.cpp
+++ b/src/text-context.cpp
@@ -512,7 +512,7 @@ static void insert_uni_char(SPTextContext *const tc)
&& tc->uni[tc->unipos] == '\0');
unsigned int uv;
std::stringstream ss;
- ss << tc->uni;
+ ss << std::hex << tc->uni;
ss >> uv;
tc->unipos = 0;
tc->uni[tc->unipos] = '\0';
@@ -540,11 +540,11 @@ static void insert_uni_char(SPTextContext *const tc)
}
}
-static void hex_to_printable_utf8_buf(char const *const hex, char *utf8)
+static void hex_to_printable_utf8_buf(char const *const ehex, char *utf8)
{
unsigned int uv;
std::stringstream ss;
- ss << hex;
+ ss << std::hex << ehex;
ss >> uv;
if (!g_unichar_isprint((gunichar) uv)) {
uv = 0xfffd;