ref: 023a4bf3bee24599ae0760042685f18624860641
parent: 685dd4f7b8e6437093424a1931f4b1cb72f8c900
author: Werner Lemberg <[email protected]>
date: Thu Oct 14 07:33:04 EDT 2004
* include/freetype/config/ftstdlib.h: Include `stddef.h'. (ft_ptrdiff_t): Define. * include/freetype/fttypes.h (FT_PtrDist): Use `ft_ptrdiff_t'. * src/cid/cidload.c (cid_parse_dict), src/type1/t1load.c (parse_dict): Fix compiler warning.
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2004-10-13 Werner Lemberg <[email protected]>
+
+ * include/freetype/config/ftstdlib.h: Include `stddef.h'.
+ (ft_ptrdiff_t): Define.
+
+ * include/freetype/fttypes.h (FT_PtrDist): Use `ft_ptrdiff_t'.
+
+ * src/cid/cidload.c (cid_parse_dict), src/type1/t1load.c
+ (parse_dict): Fix compiler warning.
+
2004-10-11 Joshua Neal <[email protected]>
* src/sfnt/ttcmap.c (tt_face_build_cmaps): Check for pointer
--- a/include/freetype/config/ftstdlib.h
+++ b/include/freetype/config/ftstdlib.h
@@ -33,6 +33,11 @@
#define __FTSTDLIB_H__
+#include <stddef.h>
+
+#define ft_ptrdiff_t ptrdiff_t
+
+
/**********************************************************************/
/* */
/* integer limits */
--- a/include/freetype/fttypes.h
+++ b/include/freetype/fttypes.h
@@ -325,7 +325,7 @@
/* largest _signed_ integer type used to express the distance */
/* between two pointers. */
/* */
- typedef size_t FT_PtrDist;
+ typedef ft_ptrdiff_t FT_PtrDist;
/*************************************************************************/
--- a/src/cid/cidload.c
+++ b/src/cid/cidload.c
@@ -324,8 +324,8 @@
if ( !name )
break;
- if ( cur[0] == name[0] &&
- len == ft_strlen( (const char*)name ) )
+ if ( cur[0] == name[0] &&
+ len == (FT_PtrDist)ft_strlen( (const char*)name ) )
{FT_PtrDist n;
--- a/src/type1/t1load.c
+++ b/src/type1/t1load.c
@@ -1820,9 +1820,9 @@
if ( !name )
break;
- if ( cur[0] == name[0] &&
- len == ft_strlen( (const char *)name ) &&
- ft_memcmp( cur, name, len ) == 0 )
+ if ( cur[0] == name[0] &&
+ len == (FT_PtrDist)ft_strlen( (const char *)name ) &&
+ ft_memcmp( cur, name, len ) == 0 )
{/* We found it -- run the parsing callback! */
/* We only record the first instance of any */