partial 64 bit support and misc. fixes (#271)

adobe-type-tools · Mar 27, 2018 · 56a27ca · 56a27ca
1 parent 85184b2
commit 56a27ca
Show file tree

Hide file tree

Showing 31 changed files with 358 additions and 350 deletions.
diff --git a/afdko/Tools/Programs/makeotf/makeotf_lib/api/cffread.h b/afdko/Tools/Programs/makeotf/makeotf_lib/api/cffread.h
@@ -4,7 +4,8 @@ This software is licensed as OpenSource, under the Apache License, Version 2.0.
 #ifndef CFFREAD_H
 #define CFFREAD_H
 
-#include <stddef.h>             /* For size_t */
+#include <stddef.h>             /* For [u]int32_t */
+#include <stdint.h>             /* For size_t */
 
 #define CFF_VERSION 0x010005    /* Library version */
 
@@ -124,7 +125,7 @@ struct cffStdCallbacks_
        input functions. */
     };
 
-typedef long cffFixed;          /* 16.16 fixed point */
+typedef int32_t cffFixed;          /* 16.16 fixed point */
 
 void cffSetUDV(cffCtx h, int nAxes, cffFixed *UDV);
 void cffSetWV(cffCtx h, int nMasters, cffFixed *WV);

diff --git a/afdko/Tools/Programs/makeotf/makeotf_lib/api/hotconv.h b/afdko/Tools/Programs/makeotf/makeotf_lib/api/hotconv.h
@@ -5,6 +5,7 @@ This software is licensed as OpenSource, under the Apache License, Version 2.0.
 #define HOT_H
 
 #include <stddef.h>             /* For size_t */
+#include <stdint.h>             /* For int32_t */
 
 #ifdef __cplusplus
 extern "C" {
@@ -637,7 +638,7 @@ void hotAddUnencChar(hotCtx g, int iChar, char *name);
    glyphs of a kern pair with a name when one or both glyphs are unencoded.
    This name is subsequently converted into a glyph id by the library. */
 
-typedef long hotFixed;          /* 16.16 fixed point */
+typedef int32_t hotFixed;          /* 16.16 fixed point */
 void hotAddAxisData(hotCtx g, int iAxis,
                     char *type, char *longLabel, char *shortLabel,
                     hotFixed minRange, hotFixed maxRange);

diff --git a/afdko/Tools/Programs/makeotf/makeotf_lib/api/pstoken.h b/afdko/Tools/Programs/makeotf/makeotf_lib/api/pstoken.h
@@ -9,7 +9,7 @@
 
 #ifndef PSTOKEN_H
 #define PSTOKEN_H
-
+#include <stdint.h>
 #include <stddef.h>
 
 #include "dynarr.h"
@@ -122,17 +122,17 @@ psToken *psFindToken(psCtx h, int type, char *value);
 int psMatchValue(psCtx h, psToken *token, char *strng);
 char *psGetValue(psCtx h, psToken *token);
 
-long psGetInteger(psCtx h);
+int32_t psGetInteger(psCtx h);
 double psGetReal(psCtx h);
 char *psGetString(psCtx h, unsigned *length);
 int psGetHexLength(psCtx h, psToken *token);
-unsigned long psGetHexString(psCtx h, int *length);
+uint32_t psGetHexString(psCtx h, int *length);
 
-long psConvInteger(psCtx h, psToken *token);
+int32_t psConvInteger(psCtx h, psToken *token);
 double psConvReal(psCtx h, psToken *token);
 char *psConvString(psCtx h, psToken *token, unsigned *length);
 char *psConvLiteral(psCtx h, psToken *token, unsigned *length);
-unsigned long psConvHexString(psCtx h, psToken *token);
+uint32_t psConvHexString(psCtx h, psToken *token);
 
 /* Exception handling */
 void CDECL psWarning(psCtx h, char *fmt, ...);