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

Unified Diff: third_party/freetype/src/base/ftstream.c

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/src/base/ftsnames.c ('k') | third_party/freetype/src/base/ftstroke.c » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/freetype/src/base/ftstream.c
diff --git a/core/src/fxge/fx_freetype/fxft2.5.01/src/base/ftstream.c b/third_party/freetype/src/base/ftstream.c
similarity index 99%
rename from core/src/fxge/fx_freetype/fxft2.5.01/src/base/ftstream.c
rename to third_party/freetype/src/base/ftstream.c
index 8037506fa317142c45342d676d11772719da0c09..759fd8fc07a66508904ea78c56117b17cdcbe875 100644
--- a/core/src/fxge/fx_freetype/fxft2.5.01/src/base/ftstream.c
+++ b/third_party/freetype/src/base/ftstream.c
@@ -16,9 +16,9 @@
/***************************************************************************/
-#include "../../include/ft2build.h"
-#include "../../include/freetype/internal/ftstream.h"
-#include "../../include/freetype/internal/ftdebug.h"
+#include <ft2build.h>
+#include FT_INTERNAL_STREAM_H
+#include FT_INTERNAL_DEBUG_H
/*************************************************************************/
@@ -728,9 +728,12 @@
FT_Byte* cursor;
- if ( !fields || !stream )
+ if ( !fields )
return FT_THROW( Invalid_Argument );
+ if ( !stream )
+ return FT_THROW( Invalid_Stream_Handle );
+
cursor = stream->cursor;
error = FT_Err_Ok;
« no previous file with comments | « third_party/freetype/src/base/ftsnames.c ('k') | third_party/freetype/src/base/ftstroke.c » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698