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/src/base/ftgxval.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/ftglyph.c ('k') | third_party/freetype/src/base/ftinit.c » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/freetype/src/base/ftgxval.c
diff --git a/core/src/fxge/fx_freetype/fxft2.5.01/src/base/ftgxval.c b/third_party/freetype/src/base/ftgxval.c
similarity index 92%
rename from core/src/fxge/fx_freetype/fxft2.5.01/src/base/ftgxval.c
rename to third_party/freetype/src/base/ftgxval.c
index 3b5884ec92fd210b195f49173ac8528c8b1e0a5d..a65f4c879b0c76e495006ae4d9bbfb6f1251979f 100644
--- a/core/src/fxge/fx_freetype/fxft2.5.01/src/base/ftgxval.c
+++ b/third_party/freetype/src/base/ftgxval.c
@@ -4,7 +4,7 @@
/* */
/* FreeType API for validating TrueTyepGX/AAT tables (body). */
/* */
-/* Copyright 2004-2006, 2010, 2013 by */
+/* Copyright 2004-2006, 2010, 2013, 2014 by */
/* Masatake YAMATO, Redhat K.K, */
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
/* */
@@ -25,11 +25,11 @@
/***************************************************************************/
-#include "../../include/ft2build.h"
-#include "../../include/freetype/internal/ftdebug.h"
+#include <ft2build.h>
+#include FT_INTERNAL_DEBUG_H
-#include "../../include/freetype/internal/ftobjs.h"
-#include "../../include/freetype/internal/services/svgxval.h"
+#include FT_INTERNAL_OBJECTS_H
+#include FT_SERVICE_GX_VALIDATE_H
/* documentation is in ftgxval.h */
@@ -50,7 +50,7 @@
goto Exit;
}
- if ( tables == NULL )
+ if ( !tables )
{
error = FT_THROW( Invalid_Argument );
goto Exit;
@@ -102,7 +102,7 @@
goto Exit;
}
- if ( ckern_table == NULL )
+ if ( !ckern_table )
{
error = FT_THROW( Invalid_Argument );
goto Exit;
« no previous file with comments | « third_party/freetype/src/base/ftglyph.c ('k') | third_party/freetype/src/base/ftinit.c » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698