summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsuzuki toshiya <mpsuzuki@hiroshima-u.ac.jp>2009-07-03 18:01:32 +0900
committersuzuki toshiya <mpsuzuki@hiroshima-u.ac.jp>2009-07-03 18:01:32 +0900
commit74d4783ec11a6700fe437af528cffefcd9959106 (patch)
tree7181c13de19333fd5c96792cfdd18bb14113a006
parent8ffff6864415733659bb9da932f44aece18b1a7b (diff)
downloadfreetype2-74d4783ec11a6700fe437af528cffefcd9959106.tar.gz
pcf: Fix some data types mismatching with their sources.
-rw-r--r--ChangeLog8
-rw-r--r--src/pcf/pcfread.c2
2 files changed, 9 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 26f15a632..bd3572c76 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
2009-07-03 suzuki toshiya <mpsuzuki@hiroshima-u.ac.jp>
+ pcf: Fix some data types mismatching with their sources.
+
+ * src/pcf/pcfread.c (pcf_get_bitmaps): The types
+ of `nbitmaps', `i', `sizebitmaps' are matched with
+ the type of area FT_Bitmap.pitch * FT_Bitmap.rows.
+
+2009-07-03 suzuki toshiya <mpsuzuki@hiroshima-u.ac.jp>
+
pcf: Handle the string length by size_t variables.
* src/pcf/pcfread.c (pcf_interpret_style): The types
diff --git a/src/pcf/pcfread.c b/src/pcf/pcfread.c
index cbbd10589..9cce3f570 100644
--- a/src/pcf/pcfread.c
+++ b/src/pcf/pcfread.c
@@ -661,7 +661,7 @@ THE SOFTWARE.
FT_Long* offsets;
FT_Long bitmapSizes[GLYPHPADOPTIONS];
FT_ULong format, size;
- int nbitmaps, i, sizebitmaps = 0;
+ FT_ULong nbitmaps, i, sizebitmaps = 0;
error = pcf_seek_to_table_type( stream,