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

Unified Diff: third_party/freetype/src/base/ftdbgmem.c

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/src/base/ftcid.c ('k') | third_party/freetype/src/base/ftdebug.c » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/freetype/src/base/ftdbgmem.c
diff --git a/core/src/fxge/fx_freetype/fxft2.5.01/src/base/ftdbgmem.c b/third_party/freetype/src/base/ftdbgmem.c
similarity index 98%
rename from core/src/fxge/fx_freetype/fxft2.5.01/src/base/ftdbgmem.c
rename to third_party/freetype/src/base/ftdbgmem.c
index 55f59372d8f83b439ba19129157f0652bffa1caa..6fb86fe77ded968c42420333ad52f727380c12f0 100644
--- a/core/src/fxge/fx_freetype/fxft2.5.01/src/base/ftdbgmem.c
+++ b/third_party/freetype/src/base/ftdbgmem.c
@@ -16,13 +16,13 @@
/***************************************************************************/
-#include "../../include/ft2build.h"
-#include "../../include/freetype/config/ftconfig.h"
-#include "../../include/freetype/internal/ftdebug.h"
-#include "../../include/freetype/internal/ftmemory.h"
-#include "../../include/freetype/ftsystem.h"
-#include "../../include/freetype/fterrors.h"
-#include "../../include/freetype/fttypes.h"
+#include <ft2build.h>
+#include FT_CONFIG_CONFIG_H
+#include FT_INTERNAL_DEBUG_H
+#include FT_INTERNAL_MEMORY_H
+#include FT_SYSTEM_H
+#include FT_ERRORS_H
+#include FT_TYPES_H
#ifdef FT_DEBUG_MEMORY
@@ -33,7 +33,7 @@
* memory, however.
*/
-#include "../../include/freetype/config/ftstdlib.h"
+#include FT_CONFIG_STANDARD_LIBRARY_H
FT_BASE_DEF( const char* ) _ft_debug_file = 0;
FT_BASE_DEF( long ) _ft_debug_lineno = 0;
@@ -822,7 +822,7 @@
FT_Int result = 0;
- if (1)/* XYQ: always enable ( getenv( "FT2_DEBUG_MEMORY" ) ) */
+ if ( getenv( "FT2_DEBUG_MEMORY" ) )
{
table = ft_mem_table_new( memory );
if ( table )
« no previous file with comments | « third_party/freetype/src/base/ftcid.c ('k') | third_party/freetype/src/base/ftdebug.c » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698