tizen 2.3.1 release

[framework/graphics/freetype.git] / src / base / ftgxval.c

diff --git a/src/base/ftgxval.c b/src/base/ftgxval.c
index aeeb8ce..a65f4c8 100644 (file)
--- a/src/base/ftgxval.c
+++ b/src/base/ftgxval.c
@@ -4,7 +4,7 @@
 /*                                                                         */
 /*    FreeType API for validating TrueTyepGX/AAT tables (body).            */
 /*                                                                         */
-/*  Copyright 2004, 2005, 2006, 2010 by                                    */
+/*  Copyright 2004-2006, 2010, 2013, 2014 by                               */
 /*  Masatake YAMATO, Redhat K.K,                                           */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
@@ -26,6 +26,8 @@
 
 
 #include <ft2build.h>
+#include FT_INTERNAL_DEBUG_H
+
 #include FT_INTERNAL_OBJECTS_H
 #include FT_SERVICE_GX_VALIDATE_H
 
@@ -44,13 +46,13 @@
 
     if ( !face )
     {
-      error = FT_Err_Invalid_Face_Handle;
+      error = FT_THROW( Invalid_Face_Handle );
       goto Exit;
     }
 
-    if ( tables == NULL )
+    if ( !tables )
     {
-      error = FT_Err_Invalid_Argument;
+      error = FT_THROW( Invalid_Argument );
       goto Exit;
     }
 
@@ -62,7 +64,7 @@
                                  tables,
                                  table_length );
     else
-      error = FT_Err_Unimplemented_Feature;
+      error = FT_THROW( Unimplemented_Feature );
 
   Exit:
     return error;
@@ -96,13 +98,13 @@
 
     if ( !face )
     {
-      error = FT_Err_Invalid_Face_Handle;
+      error = FT_THROW( Invalid_Face_Handle );
       goto Exit;
     }
 
-    if ( ckern_table == NULL )
+    if ( !ckern_table )
     {
-      error = FT_Err_Invalid_Argument;
+      error = FT_THROW( Invalid_Argument );
       goto Exit;
     }
 
@@ -113,7 +115,7 @@
                                  validation_flags,
                                  ckern_table );
     else
-      error = FT_Err_Unimplemented_Feature;
+      error = FT_THROW( Unimplemented_Feature );
 
   Exit:
     return error;