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

Unified Diff: third_party/freetype/src/base/ftpic.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/ftpfr.c ('k') | third_party/freetype/src/base/ftrfork.c » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/freetype/src/base/ftpic.c
diff --git a/core/src/fxge/fx_freetype/fxft2.5.01/src/base/ftpic.c b/third_party/freetype/src/base/ftpic.c
similarity index 87%
rename from core/src/fxge/fx_freetype/fxft2.5.01/src/base/ftpic.c
rename to third_party/freetype/src/base/ftpic.c
index 45c9ad20f1d77dd3d19b9d8793b3298d1a51b177..9bd92f785a11d6572837481ee6dbfebad6718574 100644
--- a/core/src/fxge/fx_freetype/fxft2.5.01/src/base/ftpic.c
+++ b/third_party/freetype/src/base/ftpic.c
@@ -4,7 +4,7 @@
/* */
/* The FreeType position independent code services (body). */
/* */
-/* Copyright 2009 by */
+/* Copyright 2009, 2013 by */
/* Oran Agra and Mickey Gabel. */
/* */
/* This file is part of the FreeType project, and may only be used, */
@@ -16,9 +16,9 @@
/***************************************************************************/
-#include "../../include/ft2build.h"
-#include "../../include/freetype/freetype.h"
-#include "../../include/freetype/internal/ftobjs.h"
+#include <ft2build.h>
+#include FT_FREETYPE_H
+#include FT_INTERNAL_OBJECTS_H
#include "basepic.h"
#ifdef FT_CONFIG_OPTION_PIC
@@ -29,7 +29,7 @@
ft_pic_container_init( FT_Library library )
{
FT_PIC_Container* pic_container = &library->pic_container;
- FT_Error error = FT_Err_Ok;
+ FT_Error error;
FT_MEM_SET( pic_container, 0, sizeof ( *pic_container ) );
« no previous file with comments | « third_party/freetype/src/base/ftpfr.c ('k') | third_party/freetype/src/base/ftrfork.c » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698