Index: third_party/freetype/src/base/ftpfr.c |
diff --git a/core/src/fxge/fx_freetype/fxft2.5.01/src/base/ftpfr.c b/third_party/freetype/src/base/ftpfr.c |
similarity index 91% |
rename from core/src/fxge/fx_freetype/fxft2.5.01/src/base/ftpfr.c |
rename to third_party/freetype/src/base/ftpfr.c |
index 1ea6888efa6497a876401543f72b52ca22bc0353..7425abe33c2034cb47f85235726a520cd3351f5b 100644 |
--- a/core/src/fxge/fx_freetype/fxft2.5.01/src/base/ftpfr.c |
+++ b/third_party/freetype/src/base/ftpfr.c |
@@ -4,7 +4,7 @@ |
/* */ |
/* FreeType API for accessing PFR-specific data (body). */ |
/* */ |
-/* Copyright 2002-2004, 2008, 2010, 2013 by */ |
+/* Copyright 2002-2004, 2008, 2010, 2013, 2014 by */ |
/* David Turner, Robert Wilhelm, and Werner Lemberg. */ |
/* */ |
/* This file is part of the FreeType project, and may only be used, */ |
@@ -15,11 +15,11 @@ |
/* */ |
/***************************************************************************/ |
-#include "../../include/ft2build.h" |
-#include "../../include/freetype/internal/ftdebug.h" |
+#include <ft2build.h> |
+#include FT_INTERNAL_DEBUG_H |
-#include "../../include/freetype/internal/ftobjs.h" |
-#include "../../include/freetype/internal/services/svpfr.h" |
+#include FT_INTERNAL_OBJECTS_H |
+#include FT_SERVICE_PFR_H |
/* check the format */ |
@@ -50,7 +50,7 @@ |
if ( !face ) |
- return FT_THROW( Invalid_Argument ); |
+ return FT_THROW( Invalid_Face_Handle ); |
service = ft_pfr_check( face ); |
if ( service ) |
@@ -106,6 +106,9 @@ |
if ( !face ) |
+ return FT_THROW( Invalid_Face_Handle ); |
+ |
+ if ( !avector ) |
return FT_THROW( Invalid_Argument ); |
service = ft_pfr_check( face ); |
@@ -130,11 +133,15 @@ |
FT_Service_PfrMetrics service; |
+ if ( !face ) |
+ return FT_THROW( Invalid_Face_Handle ); |
+ |
+ if ( !aadvance ) |
+ return FT_THROW( Invalid_Argument ); |
+ |
service = ft_pfr_check( face ); |
if ( service ) |
- { |
error = service->get_advance( face, gindex, aadvance ); |
- } |
else |
/* XXX: TODO: PROVIDE ADVANCE-LOADING METHOD TO ALL FONT DRIVERS */ |
error = FT_THROW( Invalid_Argument ); |