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/ftwinfnt.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/fttypes.h ('k') | third_party/freetype/include/ftxf86.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/freetype/include/ftwinfnt.h
diff --git a/core/include/thirdparties/freetype/freetype/ftwinfnt.h b/third_party/freetype/include/ftwinfnt.h
similarity index 97%
rename from core/include/thirdparties/freetype/freetype/ftwinfnt.h
rename to third_party/freetype/include/ftwinfnt.h
index af4334e200721354ed7170825a7d9d522975fea4..50261581a2127a2b4e6b20eba06d08d332972e96 100644
--- a/core/include/thirdparties/freetype/freetype/ftwinfnt.h
+++ b/third_party/freetype/include/ftwinfnt.h
@@ -19,8 +19,8 @@
#ifndef __FTWINFNT_H__
#define __FTWINFNT_H__
-#include "../ft2build.h"
-#include "freetype.h"
+#include <ft2build.h>
+#include FT_FREETYPE_H
#ifdef FREETYPE_H
#error "freetype.h of FreeType 1 has been loaded!"
@@ -58,9 +58,10 @@ FT_BEGIN_HEADER
* @description:
* A list of valid values for the `charset' byte in
* @FT_WinFNT_HeaderRec. Exact mapping tables for the various cpXXXX
- * encodings (except for cp1361) can be found at ftp://ftp.unicode.org
- * in the MAPPINGS/VENDORS/MICSFT/WINDOWS subdirectory. cp1361 is
- * roughly a superset of MAPPINGS/OBSOLETE/EASTASIA/KSC/JOHAB.TXT.
+ * encodings (except for cp1361) can be found at
+ * ftp://ftp.unicode.org/public in the MAPPINGS/VENDORS/MICSFT/WINDOWS
+ * subdirectory. cp1361 is roughly a superset of
+ * MAPPINGS/OBSOLETE/EASTASIA/KSC/JOHAB.TXT.
*
* @values:
* FT_WinFNT_ID_DEFAULT ::
@@ -258,9 +259,9 @@ FT_BEGIN_HEADER
FT_Get_WinFNT_Header( FT_Face face,
FT_WinFNT_HeaderRec *aheader );
-
/* */
+
FT_END_HEADER
#endif /* __FTWINFNT_H__ */
« no previous file with comments | « third_party/freetype/include/fttypes.h ('k') | third_party/freetype/include/ftxf86.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698