Index: third_party/freetype/src/base/ftwinfnt.c |
diff --git a/core/src/fxge/fx_freetype/fxft2.5.01/src/base/ftwinfnt.c b/third_party/freetype/src/base/ftwinfnt.c |
similarity index 74% |
rename from core/src/fxge/fx_freetype/fxft2.5.01/src/base/ftwinfnt.c |
rename to third_party/freetype/src/base/ftwinfnt.c |
index d5b81baf9718524b4815ce5f9f2c90b0d5f3e65e..8e337fbe5307045ccad77eba7ed8734acefae4f0 100644 |
--- a/core/src/fxge/fx_freetype/fxft2.5.01/src/base/ftwinfnt.c |
+++ b/third_party/freetype/src/base/ftwinfnt.c |
@@ -4,7 +4,7 @@ |
/* */ |
/* FreeType API for accessing Windows FNT specific info (body). */ |
/* */ |
-/* Copyright 2003, 2004 by */ |
+/* Copyright 2003, 2004, 2014 by */ |
/* David Turner, Robert Wilhelm, and Werner Lemberg. */ |
/* */ |
/* This file is part of the FreeType project, and may only be used, */ |
@@ -16,10 +16,11 @@ |
/***************************************************************************/ |
-#include "../../include/ft2build.h" |
-#include "../../include/freetype/ftwinfnt.h" |
-#include "../../include/freetype/internal/ftobjs.h" |
-#include "../../include/freetype/internal/services/svwinfnt.h" |
+#include <ft2build.h> |
+#include FT_INTERNAL_DEBUG_H |
+#include FT_WINFONTS_H |
+#include FT_INTERNAL_OBJECTS_H |
+#include FT_SERVICE_WINFNT_H |
/* documentation is in ftwinfnt.h */ |
@@ -32,17 +33,18 @@ |
FT_Error error; |
- error = FT_ERR( Invalid_Argument ); |
+ if ( !face ) |
+ return FT_THROW( Invalid_Face_Handle ); |
- if ( face != NULL ) |
- { |
- FT_FACE_LOOKUP_SERVICE( face, service, WINFNT ); |
+ if ( !header ) |
+ return FT_THROW( Invalid_Argument ); |
- if ( service != NULL ) |
- { |
- error = service->get_header( face, header ); |
- } |
- } |
+ FT_FACE_LOOKUP_SERVICE( face, service, WINFNT ); |
+ |
+ if ( service ) |
+ error = service->get_header( face, header ); |
+ else |
+ error = FT_THROW( Invalid_Argument ); |
return error; |
} |