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

Unified Diff: third_party/freetype/include/ftmac.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/ftlzw.h ('k') | third_party/freetype/include/ftmm.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/freetype/include/ftmac.h
diff --git a/core/include/thirdparties/freetype/freetype/ftmac.h b/third_party/freetype/include/ftmac.h
similarity index 98%
rename from core/include/thirdparties/freetype/freetype/ftmac.h
rename to third_party/freetype/include/ftmac.h
index f40f3fb9eede2c25355c4b9c9ee77709d5250730..42874fe6fc1510249d61aaedb2701a434ceda5bc 100644
--- a/core/include/thirdparties/freetype/freetype/ftmac.h
+++ b/third_party/freetype/include/ftmac.h
@@ -4,7 +4,7 @@
/* */
/* Additional Mac-specific API. */
/* */
-/* Copyright 1996-2001, 2004, 2006, 2007 by */
+/* Copyright 1996-2001, 2004, 2006, 2007, 2013 by */
/* Just van Rossum, David Turner, Robert Wilhelm, and Werner Lemberg. */
/* */
/* This file is part of the FreeType project, and may only be used, */
@@ -18,7 +18,7 @@
/***************************************************************************/
/* */
-/* NOTE: Include this file after <freetype/freetype.h> and after any */
+/* NOTE: Include this file after FT_FREETYPE_H and after any */
/* Mac-specific headers (because this header uses Mac types such as */
/* Handle, FSSpec, FSRef, etc.) */
/* */
@@ -29,7 +29,7 @@
#define __FTMAC_H__
-#include "../ft2build.h"
+#include <ft2build.h>
FT_BEGIN_HEADER
@@ -168,7 +168,7 @@ FT_BEGIN_HEADER
/* */
/* <Description> */
/* Return a pathname of the disk file and face index for given font */
- /* name which is handled by ATS framework. */
+ /* name that is handled by ATS framework. */
/* */
/* <Input> */
/* fontName :: Mac OS name of the font in ATS framework. */
« no previous file with comments | « third_party/freetype/include/ftlzw.h ('k') | third_party/freetype/include/ftmm.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698