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

Unified Diff: third_party/freetype/src/truetype/ttobjs.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/src/truetype/ttinterp.c ('k') | third_party/freetype/src/truetype/ttobjs.c » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/freetype/src/truetype/ttobjs.h
diff --git a/core/src/fxge/fx_freetype/fxft2.5.01/src/truetype/ttobjs.h b/third_party/freetype/src/truetype/ttobjs.h
similarity index 97%
rename from core/src/fxge/fx_freetype/fxft2.5.01/src/truetype/ttobjs.h
rename to third_party/freetype/src/truetype/ttobjs.h
index 21dfb7ac45a6e6e05d49f53389b7e4f918954290..859164f86be100ee5b17a80b82238aaa29549e83 100644
--- a/core/src/fxge/fx_freetype/fxft2.5.01/src/truetype/ttobjs.h
+++ b/third_party/freetype/src/truetype/ttobjs.h
@@ -4,7 +4,7 @@
/* */
/* Objects manager (specification). */
/* */
-/* Copyright 1996-2009, 2011-2013 by */
+/* Copyright 1996-2009, 2011-2014 by */
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
/* */
/* This file is part of the FreeType project, and may only be used, */
@@ -20,9 +20,9 @@
#define __TTOBJS_H__
-#include "../../include/ft2build.h"
-#include "../../include/freetype/internal/ftobjs.h"
-#include "../../include/freetype/internal/tttypes.h"
+#include <ft2build.h>
+#include FT_INTERNAL_OBJECTS_H
+#include FT_INTERNAL_TRUETYPE_TYPES_H
FT_BEGIN_HEADER
@@ -95,8 +95,8 @@ FT_BEGIN_HEADER
FT_F26Dot6 control_value_cutin;
FT_F26Dot6 single_width_cutin;
FT_F26Dot6 single_width_value;
- FT_Short delta_base;
- FT_Short delta_shift;
+ FT_UShort delta_base;
+ FT_UShort delta_shift;
FT_Byte instruct_control;
/* According to Greg Hitchcock from Microsoft, the `scan_control' */
@@ -333,8 +333,10 @@ FT_BEGIN_HEADER
FT_Bool debug;
TT_ExecContext context;
- FT_Bool bytecode_ready;
- FT_Bool cvt_ready;
+ /* if negative, `fpgm' (resp. `prep'), wasn't executed yet; */
+ /* otherwise it is the returned error code */
+ FT_Error bytecode_ready;
+ FT_Error cvt_ready;
#endif /* TT_USE_BYTECODE_INTERPRETER */
« no previous file with comments | « third_party/freetype/src/truetype/ttinterp.c ('k') | third_party/freetype/src/truetype/ttobjs.c » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698