summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBehdad Esfahbod <behdad@gnome.org>2006-02-10 00:33:28 +0000
committerBehdad Esfahbod <behdad@src.gnome.org>2006-02-10 00:33:28 +0000
commitc8c1c05937fd743dc49709bf8bfeff04ac0c0d00 (patch)
tree6c9f3d5da78597b0bbcbd30a8fb40b3d0a3bf3ea
parent6a1d710752a012cb3e2f8646841a583b7d00d87c (diff)
downloadpango-c8c1c05937fd743dc49709bf8bfeff04ac0c0d00.tar.gz
Bug 330602 – pango_parse_weight Reported by Morten Welinder.
2006-02-09 Behdad Esfahbod <behdad@gnome.org> Bug 330602 – pango_parse_weight Reported by Morten Welinder. * pango/pango-utils.c (pango_parse_weight): Pass 10 as base to strtol.
-rw-r--r--ChangeLog8
-rw-r--r--pango/pango-utils.c2
2 files changed, 9 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 8058694f..20e2c35d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
2006-02-09 Behdad Esfahbod <behdad@gnome.org>
+ Bug 330602 – pango_parse_weight
+ Reported by Morten Welinder.
+
+ * pango/pango-utils.c (pango_parse_weight): Pass 10 as base to
+ strtol.
+
+2006-02-09 Behdad Esfahbod <behdad@gnome.org>
+
Bug 314548 – pango_shape() is missing const correctness
Patch from Antoine Dopffer.
diff --git a/pango/pango-utils.c b/pango/pango-utils.c
index 9c570230..7758c27f 100644
--- a/pango/pango-utils.c
+++ b/pango/pango-utils.c
@@ -817,7 +817,7 @@ pango_parse_weight (const char *str,
{
char *end;
- *weight = strtol (str, &end, 0);
+ *weight = strtol (str, &end, 10);
if (*end != '\0')
{
if (warn)