summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWerner Lemberg <wl@gnu.org>2009-01-25 16:27:04 +0000
committerWerner Lemberg <wl@gnu.org>2009-01-25 16:27:04 +0000
commit1e5e7aa0732d17609bb5cfa02258820a59511c54 (patch)
tree081655b3e436346692ea09ac490f95ec36a87220
parent5184ed6d53de2978de6812995f841c188d9125e6 (diff)
downloadfreetype2-1e5e7aa0732d17609bb5cfa02258820a59511c54.tar.gz
Fix SCANCTRL handling in TTFs.
Problem reported by Alexey Kryukov <anagnost@yandex.ru>. * src/truetype/ttinterp.c (Ins_SCANCTRL): Fix threshold handling.
-rw-r--r--ChangeLog7
-rw-r--r--src/truetype/ttinterp.c6
2 files changed, 10 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index fd384685a..5976c8134 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2009-01-25 Werner Lemberg <wl@gnu.org>
+
+ Fix SCANCTRL handling in TTFs.
+ Problem reported by Alexey Kryukov <anagnost@yandex.ru>.
+
+ * src/truetype/ttinterp.c (Ins_SCANCTRL): Fix threshold handling.
+
2009-01-23 Werner Lemberg <wl@gnu.org>
Move FT_Get_FSType_Flags to a separate file.
diff --git a/src/truetype/ttinterp.c b/src/truetype/ttinterp.c
index 0b6a74464..2279a62cb 100644
--- a/src/truetype/ttinterp.c
+++ b/src/truetype/ttinterp.c
@@ -4,7 +4,7 @@
/* */
/* TrueType bytecode interpreter (body). */
/* */
-/* Copyright 1996-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 by */
+/* Copyright 1996-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 by */
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
/* */
/* This file is part of the FreeType project, and may only be used, */
@@ -5099,7 +5099,7 @@
return;
}
- if ( ( args[0] & 0x100 ) != 0 && CUR.tt_metrics.ppem < A )
+ if ( ( args[0] & 0x100 ) != 0 && CUR.tt_metrics.ppem <= A )
CUR.GS.scan_control = TRUE;
if ( ( args[0] & 0x200 ) != 0 && CUR.tt_metrics.rotated )
@@ -5108,7 +5108,7 @@
if ( ( args[0] & 0x400 ) != 0 && CUR.tt_metrics.stretched )
CUR.GS.scan_control = TRUE;
- if ( ( args[0] & 0x800 ) != 0 && CUR.tt_metrics.ppem >= A )
+ if ( ( args[0] & 0x800 ) != 0 && CUR.tt_metrics.ppem > A )
CUR.GS.scan_control = FALSE;
if ( ( args[0] & 0x1000 ) != 0 && CUR.tt_metrics.rotated )