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/include/ftincrem.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/ftimage.h ('k') | third_party/freetype/include/ftlcdfil.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/freetype/include/ftincrem.h
diff --git a/core/include/thirdparties/freetype/freetype/ftincrem.h b/third_party/freetype/include/ftincrem.h
similarity index 98%
rename from core/include/thirdparties/freetype/freetype/ftincrem.h
rename to third_party/freetype/include/ftincrem.h
index 3a3015edc6e7f05bbc81bba34325e88cf49b5536..4c0246c5df472e1d9b6fda0837ec4fdac12aad5f 100644
--- a/core/include/thirdparties/freetype/freetype/ftincrem.h
+++ b/third_party/freetype/include/ftincrem.h
@@ -4,7 +4,7 @@
/* */
/* FreeType incremental loading (specification). */
/* */
-/* Copyright 2002, 2003, 2006, 2007, 2008, 2010 by */
+/* Copyright 2002, 2003, 2006-2008, 2010, 2014 by */
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
/* */
/* This file is part of the FreeType project, and may only be used, */
@@ -19,8 +19,8 @@
#ifndef __FTINCREM_H__
#define __FTINCREM_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!"
@@ -45,7 +45,7 @@ FT_BEGIN_HEADER
* @description:
* This section contains various functions used to perform so-called
* `incremental' glyph loading. This is a mode where all glyphs loaded
- * from a given @FT_Face are provided by the client application,
+ * from a given @FT_Face are provided by the client application.
*
* Apart from that, all other tables are loaded normally from the font
* file. This mode is useful when FreeType is used within another
@@ -345,6 +345,7 @@ FT_BEGIN_HEADER
/* */
+
FT_END_HEADER
#endif /* __FTINCREM_H__ */
« no previous file with comments | « third_party/freetype/include/ftimage.h ('k') | third_party/freetype/include/ftlcdfil.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698