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/freetype/internal/ftstream.h

Issue 1416993005: Merge to XFA: Update bundled freetype to 2.6.1 (Closed) Base URL: https://pdfium.googlesource.com/pdfium.git@xfa
Patch Set: Created 5 years, 1 month 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
Index: third_party/freetype/include/freetype/internal/ftstream.h
diff --git a/third_party/freetype/include/internal/ftstream.h b/third_party/freetype/include/freetype/internal/ftstream.h
similarity index 99%
rename from third_party/freetype/include/internal/ftstream.h
rename to third_party/freetype/include/freetype/internal/ftstream.h
index 26618583209bc05fc6c380bf002dfa1e4b7aeb8a..384e5df305cdacb59e3cf0d19cc735fffc3df502 100644
--- a/third_party/freetype/include/internal/ftstream.h
+++ b/third_party/freetype/include/freetype/internal/ftstream.h
@@ -4,7 +4,7 @@
/* */
/* Stream handling (specification). */
/* */
-/* Copyright 1996-2002, 2004-2006, 2011, 2013 by */
+/* Copyright 1996-2015 by */
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
/* */
/* This file is part of the FreeType project, and may only be used, */
@@ -361,7 +361,7 @@ FT_BEGIN_HEADER
FT_Long distance );
/* return current stream position */
- FT_BASE( FT_Long )
+ FT_BASE( FT_ULong )
FT_Stream_Pos( FT_Stream stream );
/* read bytes from a stream into a user-allocated buffer, returns an */
« no previous file with comments | « third_party/freetype/include/freetype/internal/ftserv.h ('k') | third_party/freetype/include/freetype/internal/fttrace.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698