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

Unified Diff: third_party/freetype/include/ttnameid.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/t1tables.h ('k') | third_party/freetype/include/tttables.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/freetype/include/ttnameid.h
diff --git a/core/src/fxge/fx_freetype/fxft2.5.01/include/freetype/ttnameid.h b/third_party/freetype/include/ttnameid.h
similarity index 99%
rename from core/src/fxge/fx_freetype/fxft2.5.01/include/freetype/ttnameid.h
rename to third_party/freetype/include/ttnameid.h
index 862bf927c23bc02f6f59cd07e7f03021e86cb0dd..9711d1d9475e855864b1353b2543959f17b7bcb0 100644
--- a/core/src/fxge/fx_freetype/fxft2.5.01/include/freetype/ttnameid.h
+++ b/third_party/freetype/include/ttnameid.h
@@ -4,7 +4,7 @@
/* */
/* TrueType name ID definitions (specification only). */
/* */
-/* Copyright 1996-2004, 2006-2008, 2012 by */
+/* Copyright 1996-2004, 2006-2008, 2012, 2013 by */
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
/* */
/* This file is part of the FreeType project, and may only be used, */
@@ -20,7 +20,7 @@
#define __TTNAMEID_H__
-#include "../ft2build.h"
+#include <ft2build.h>
FT_BEGIN_HEADER
@@ -1208,7 +1208,7 @@ FT_BEGIN_HEADER
/* */
/* Here some alias #defines in order to be clearer. */
/* */
- /* These are not always #defined to stay within the 31~character limit */
+ /* These are not always #defined to stay within the 31~character limit, */
/* which some compilers have. */
/* */
/* Credits go to Dave Hoo <dhoo@flash.net> for pointing out that modern */
« no previous file with comments | « third_party/freetype/include/t1tables.h ('k') | third_party/freetype/include/tttables.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698