* include/freetype/config/ftoption.h, src/autofit/afcjk.c,

    src/base/ftobjs.c, src/base/ftutil.c, src/cff/cffobjs.c,
    src/psaux/afmparse.c, src/sfnt/ttbdf.c, src/tools/apinames.c,
    src/truetype/ttdriver.c:

       solved compiler warnings as well as C++ compilation problems

1 files changed, 7 insertions, 5 deletions

diff --git a/src/sfnt/ttbdf.c b/src/sfnt/ttbdf.c
index 52bbce09e..9372384d8 100644
--- a/src/sfnt/ttbdf.c
+++ b/src/sfnt/ttbdf.c
@@ -92,11 +92,7 @@
            ( strings - 8 ) / 4 < num_strikes ||

            strings + 1 > length              )

       {

-      BadTable:

-        FT_FRAME_RELEASE( bdf->table );

-        FT_ZERO( bdf );

-        error = FT_Err_Invalid_Table;

-        goto Exit;

+        goto BadTable;

       }

 

       bdf->num_strikes  = num_strikes;

@@ -132,6 +128,12 @@
 

   Exit:

     return error;

+

+  BadTable:

+    FT_FRAME_RELEASE( bdf->table );

+    FT_ZERO( bdf );

+    error = FT_Err_Invalid_Table;

+    goto Exit;

   }