commit ca0247af92ca62c84449f2d4aaf926c27e0e302f
author Alexei Podtelezhnikov <apodtele@gmail.com> Tue Aug 19 23:39:02 2025 -0400
committer Alexei Podtelezhnikov <apodtele@gmail.com> Tue Aug 19 23:39:02 2025 -0400
tree 65e50628f94dd037fc1d985f2d8490ad9ea44a88
parent cff66748990592a27853792b8fc563650687bd43

[truetype] Fix compilation without bytecode.

Fixes #1351 and various warnings about unused variables.

* src/truetype/ttinterp.c: Put the entire body under #ifdef.
* src/truetype/ttgload.c (TT_Process_Composite_Glyph): Relocate
some declarations.
* src/truetype/ttinterp.h: Remove some #ifdef conditions.
* src/truetype/ttobjs.c (tt_size_done): Modified.

src/truetype/ttgload.c

diff --git a/src/truetype/ttgload.c b/src/truetype/ttgload.c
index 0abfb0b..61731a5 100644
--- a/src/truetype/ttgload.c
+++ b/src/truetype/ttgload.c
@@ -1181,8 +1181,6 @@
   {
     FT_Error     error;
     FT_Outline*  outline = &loader->gloader->base.outline;
-    FT_Stream    stream = loader->stream;
-    FT_UShort    n_ins;
     FT_UInt      i;
 
 
@@ -1201,8 +1199,10 @@
 #ifdef TT_USE_BYTECODE_INTERPRETER
 
     {
-      TT_ExecContext  exec = loader->exec;
+      TT_ExecContext  exec   = loader->exec;
       FT_Memory       memory = exec->memory;
+      FT_Stream       stream = loader->stream;
+      FT_UShort       n_ins;
 
 
       if ( exec->glyphSize )

src/truetype/ttinterp.c

diff --git a/src/truetype/ttinterp.c b/src/truetype/ttinterp.c
index cfad9d7..d400e47 100644
--- a/src/truetype/ttinterp.c
+++ b/src/truetype/ttinterp.c
@@ -20,6 +20,9 @@
 /* issues; many thanks!                                                */
 
 
+#ifdef TT_USE_BYTECODE_INTERPRETER
+
+
 #include <freetype/internal/ftdebug.h>
 #include <freetype/internal/ftcalc.h>
 #include <freetype/fttrigon.h>
@@ -34,9 +37,6 @@
 #endif
 
 
-#ifdef TT_USE_BYTECODE_INTERPRETER
-
-
   /**************************************************************************
    *
    * The macro FT_COMPONENT is used in trace mode.  It is an implicit

src/truetype/ttinterp.h

diff --git a/src/truetype/ttinterp.h b/src/truetype/ttinterp.h
index c485371..f0e7cee 100644
--- a/src/truetype/ttinterp.h
+++ b/src/truetype/ttinterp.h
@@ -401,7 +401,6 @@
   extern const TT_GraphicsState  tt_default_graphics_state;
 
 
-#ifdef TT_USE_BYTECODE_INTERPRETER
   FT_LOCAL( void )
   TT_Set_CodeRange( TT_ExecContext  exec,
                     FT_Int          range,
@@ -411,7 +410,6 @@
   FT_LOCAL( void )
   TT_Clear_CodeRange( TT_ExecContext  exec,
                       FT_Int          range );
-#endif /* TT_USE_BYTECODE_INTERPRETER */
 
 
   /**************************************************************************
@@ -438,7 +436,6 @@
   TT_New_Context( TT_Driver  driver );
 
 
-#ifdef TT_USE_BYTECODE_INTERPRETER
   FT_LOCAL( void )
   TT_Done_Context( TT_ExecContext  exec );
 
@@ -454,7 +451,6 @@
   FT_LOCAL( FT_Error )
   TT_Run_Context( TT_ExecContext  exec,
                   TT_Size         size );
-#endif /* TT_USE_BYTECODE_INTERPRETER */
 
 
   /**************************************************************************

src/truetype/ttobjs.c

diff --git a/src/truetype/ttobjs.c b/src/truetype/ttobjs.c
index ac54e01..e9a73bd 100644
--- a/src/truetype/ttobjs.c
+++ b/src/truetype/ttobjs.c
@@ -1156,11 +1156,10 @@
   FT_LOCAL_DEF( void )
   tt_size_done( FT_Size  ttsize )           /* TT_Size */
   {
-    TT_Size  size = (TT_Size)ttsize;
-
-
 #ifdef TT_USE_BYTECODE_INTERPRETER
-    tt_size_done_bytecode( size );
+    tt_size_done_bytecode( (TT_Size)ttsize );
+#else
+    FT_UNUSED( ttsize );
 #endif
   }