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

Unified Diff: third_party/freetype/src/type1/t1objs.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/type1/t1objs.h ('k') | third_party/freetype/src/type1/t1parse.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/freetype/src/type1/t1objs.c
diff --git a/core/src/fxge/fx_freetype/fxft2.5.01/src/type1/t1objs.c b/third_party/freetype/src/type1/t1objs.c
similarity index 97%
rename from core/src/fxge/fx_freetype/fxft2.5.01/src/type1/t1objs.c
rename to third_party/freetype/src/type1/t1objs.c
index 81b230381cc571b5e2e35f223d3c6fce69026007..e11770feefc7965a704e9b27912db6937d7796be 100644
--- a/core/src/fxge/fx_freetype/fxft2.5.01/src/type1/t1objs.c
+++ b/third_party/freetype/src/type1/t1objs.c
@@ -16,11 +16,11 @@
/***************************************************************************/
-#include "../../include/ft2build.h"
-#include "../../include/freetype/internal/ftcalc.h"
-#include "../../include/freetype/internal/ftdebug.h"
-#include "../../include/freetype/internal/ftstream.h"
-#include "../../include/freetype/ttnameid.h"
+#include <ft2build.h>
+#include FT_INTERNAL_CALC_H
+#include FT_INTERNAL_DEBUG_H
+#include FT_INTERNAL_STREAM_H
+#include FT_TRUETYPE_IDS_H
#include "t1gload.h"
#include "t1load.h"
@@ -31,8 +31,8 @@
#include "t1afm.h"
#endif
-#include "../../include/freetype/internal/services/svpscmap.h"
-#include "../../include/freetype/internal/psaux.h"
+#include FT_SERVICE_POSTSCRIPT_CMAPS_H
+#include FT_INTERNAL_POSTSCRIPT_AUX_H
/*************************************************************************/
@@ -364,10 +364,10 @@
root->num_glyphs = type1->num_glyphs;
root->face_index = 0;
- root->face_flags = FT_FACE_FLAG_SCALABLE |
- FT_FACE_FLAG_HORIZONTAL |
- FT_FACE_FLAG_GLYPH_NAMES |
- FT_FACE_FLAG_HINTER;
+ root->face_flags |= FT_FACE_FLAG_SCALABLE |
+ FT_FACE_FLAG_HORIZONTAL |
+ FT_FACE_FLAG_GLYPH_NAMES |
+ FT_FACE_FLAG_HINTER;
if ( info->is_fixed_pitch )
root->face_flags |= FT_FACE_FLAG_FIXED_WIDTH;
« no previous file with comments | « third_party/freetype/src/type1/t1objs.h ('k') | third_party/freetype/src/type1/t1parse.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698