Index: third_party/freetype/src/base/ftpic.c |
diff --git a/core/src/fxge/fx_freetype/fxft2.5.01/src/base/ftpic.c b/third_party/freetype/src/base/ftpic.c |
similarity index 87% |
rename from core/src/fxge/fx_freetype/fxft2.5.01/src/base/ftpic.c |
rename to third_party/freetype/src/base/ftpic.c |
index 45c9ad20f1d77dd3d19b9d8793b3298d1a51b177..9bd92f785a11d6572837481ee6dbfebad6718574 100644 |
--- a/core/src/fxge/fx_freetype/fxft2.5.01/src/base/ftpic.c |
+++ b/third_party/freetype/src/base/ftpic.c |
@@ -4,7 +4,7 @@ |
/* */ |
/* The FreeType position independent code services (body). */ |
/* */ |
-/* Copyright 2009 by */ |
+/* Copyright 2009, 2013 by */ |
/* Oran Agra and Mickey Gabel. */ |
/* */ |
/* This file is part of the FreeType project, and may only be used, */ |
@@ -16,9 +16,9 @@ |
/***************************************************************************/ |
-#include "../../include/ft2build.h" |
-#include "../../include/freetype/freetype.h" |
-#include "../../include/freetype/internal/ftobjs.h" |
+#include <ft2build.h> |
+#include FT_FREETYPE_H |
+#include FT_INTERNAL_OBJECTS_H |
#include "basepic.h" |
#ifdef FT_CONFIG_OPTION_PIC |
@@ -29,7 +29,7 @@ |
ft_pic_container_init( FT_Library library ) |
{ |
FT_PIC_Container* pic_container = &library->pic_container; |
- FT_Error error = FT_Err_Ok; |
+ FT_Error error; |
FT_MEM_SET( pic_container, 0, sizeof ( *pic_container ) ); |