Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1)

Unified Diff: third_party/freetype/include/ftsystem.h

Issue 815103002: Update freetype to 2.5.4. (Closed) Base URL: https://pdfium.googlesource.com/pdfium.git@master
Patch Set: Adjust GYP and GN Created 6 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « third_party/freetype/include/ftsynth.h ('k') | third_party/freetype/include/fttrigon.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/freetype/include/ftsystem.h
diff --git a/core/src/fxge/fx_freetype/fxft2.5.01/include/freetype/ftsystem.h b/third_party/freetype/include/ftsystem.h
similarity index 97%
rename from core/src/fxge/fx_freetype/fxft2.5.01/include/freetype/ftsystem.h
rename to third_party/freetype/include/ftsystem.h
index 1e92390acabe7b0955c73a853a2ecb769a87e211..2c95cbbda30959c7c0553db7fb1b370475c5e2c3 100644
--- a/core/src/fxge/fx_freetype/fxft2.5.01/include/freetype/ftsystem.h
+++ b/third_party/freetype/include/ftsystem.h
@@ -20,7 +20,7 @@
#define __FTSYSTEM_H__
-#include "../ft2build.h"
+#include <ft2build.h>
FT_BEGIN_HEADER
@@ -89,12 +89,6 @@ FT_BEGIN_HEADER
(*FT_Alloc_Func)( FT_Memory memory,
long size );
- /* Sunliang.Liu 20100915 sync 221's revison. */
- typedef void*
- (*FT_AllocDebug_Func)( FT_Memory memory,
- long size, const char* filename, int line);
-
-
/*************************************************************************
*
@@ -178,7 +172,6 @@ FT_BEGIN_HEADER
{
void* user;
FT_Alloc_Func alloc;
- FT_AllocDebug_Func allocdebug; /* Sunliang.Liu 20100915 sync 221's revison. */
FT_Free_Func free;
FT_Realloc_Func realloc;
};
@@ -342,7 +335,6 @@ FT_BEGIN_HEADER
} FT_StreamRec;
-
/* */
« no previous file with comments | « third_party/freetype/include/ftsynth.h ('k') | third_party/freetype/include/fttrigon.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698