Use C++ true/false in ttconv.

Not much to it, but one less thing to consider when actually doing to work of unraveling ttconv.
tonyfast · Jan 4, 2020 · 634c6f0 · 634c6f0
1 parent 745dcae
commit 634c6f0
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 49 deletions.
diff --git a/extern/ttconv/global_defines.h b/extern/ttconv/global_defines.h
diff --git a/extern/ttconv/pprdrv_tt.cpp b/extern/ttconv/pprdrv_tt.cpp
@@ -24,7 +24,6 @@
 ** Last revised 19 December 1995.
 */
 
-#include "global_defines.h"
 #include <cstdio>
 #include <cstdlib>
 #include <cstring>
@@ -130,7 +129,7 @@ BYTE *GetTable(struct TTFONT *font, const char *name)
     /* We must search the table directory. */
     ptr = font->offset_table + 12;
     x=0;
-    while (TRUE)
+    while (true)
     {
         if ( strncmp((const char*)ptr,name,4) == 0 )
         {
@@ -559,15 +558,15 @@ void ttfont_FontInfo(TTStreamWriter& stream, struct TTFONT *font)
 -------------------------------------------------------------------*/
 int string_len;
 int line_len;
-int in_string;
+bool in_string;
 
 /*
 ** This is called once at the start.
 */
 void sfnts_start(TTStreamWriter& stream)
 {
     stream.puts("/sfnts[<");
-    in_string=TRUE;
+    in_string=true;
     string_len=0;
     line_len=8;
 } /* end of sfnts_start() */
@@ -584,7 +583,7 @@ void sfnts_pputBYTE(TTStreamWriter& stream, BYTE n)
         stream.put_char('<');
         string_len=0;
         line_len++;
-        in_string=TRUE;
+        in_string=true;
     }
 
     stream.put_char( hexdigits[ n / 16 ] );
@@ -650,7 +649,7 @@ void sfnts_end_string(TTStreamWriter& stream)
         stream.put_char('>');
         line_len++;
     }
-    in_string=FALSE;
+    in_string=false;
 } /* end of sfnts_end_string() */
 
 /*

diff --git a/extern/ttconv/pprdrv_tt2.cpp b/extern/ttconv/pprdrv_tt2.cpp
@@ -32,7 +32,6 @@
 ** Last revised 11 July 1995.
 */
 
-#include "global_defines.h"
 #include <cstdlib>
 #include <cmath>
 #include <cstring>

diff --git a/extern/ttconv/ttutil.cpp b/extern/ttconv/ttutil.cpp
@@ -9,7 +9,6 @@
 /* Very simple interface to the ppr TT routines */
 /* (c) Frank Siegert 1996 */
 
-#include "global_defines.h"
 #include <cstdio>
 #include <cstdarg>
 #include <cstdlib>