third_party/freetype/include/freetype/fterrors.h - Issue 1416993005: Merge to XFA: Update bundled freetype to 2.6.1

Unified Diff: third_party/freetype/include/freetype/fterrors.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/fterrors.h

diff --git a/third_party/freetype/include/fterrors.h b/third_party/freetype/include/freetype/fterrors.h

similarity index 61%

rename from third_party/freetype/include/fterrors.h

rename to third_party/freetype/include/freetype/fterrors.h

index 0fa3e4dce19e179a66e7581c09af2035edc89538..0507b9ad7dcf318a7ecc3bdc3a179db1b4b31cdb 100644

--- a/third_party/freetype/include/fterrors.h

+++ b/third_party/freetype/include/freetype/fterrors.h

@@ -4,7 +4,7 @@

/* */

/* FreeType error code handling (specification). */

/* */

/* David Turner, Robert Wilhelm, and Werner Lemberg. */

/* */

/* This file is part of the FreeType project, and may only be used, */

@@ -18,68 +18,86 @@

/*************************************************************************/

/* */

- /* This special header file is used to define the handling of FT2 */

- /* enumeration constants. It can also be used to generate error message */

- /* strings with a small macro trick explained below. */

+ /* <Section> */

+ /* error_enumerations */

/* */

- /* I - Error Formats */

- /* ----------------- */

+ /* <Title> */

+ /* Error Enumerations */

+ /* */

+ /* <Abstract> */

+ /* How to handle errors and error strings. */

+ /* */

+ /* <Description> */

+ /* The header file `fterrors.h' (which is automatically included by */

+ /* `freetype.h' defines the handling of FreeType's enumeration */

+ /* constants. It can also be used to generate error message strings */

+ /* with a small macro trick explained below. */

+ /* */

+ /* *Error* *Formats* */

/* */

/* The configuration macro FT_CONFIG_OPTION_USE_MODULE_ERRORS can be */

- /* defined in ftoption.h in order to make the higher byte indicate */

+ /* defined in `ftoption.h' in order to make the higher byte indicate */

/* the module where the error has happened (this is not compatible */

- /* with standard builds of FreeType 2). See the file `ftmoderr.h' for */

- /* more details. */

+ /* with standard builds of FreeType 2, however). See the file */

+ /* `ftmoderr.h' for more details. */

/* */

+ /* *Error* *Message* *Strings* */

/* */

- /* II - Error Message strings */

- /* -------------------------- */

- /* */

- /* The error definitions below are made through special macros that */

- /* allow client applications to build a table of error message strings */

- /* if they need it. The strings are not included in a normal build of */

- /* FreeType 2 to save space (most client applications do not use */

- /* them). */

+ /* Error definitions are set up with special macros that allow client */

+ /* applications to build a table of error message strings. The */

+ /* strings are not included in a normal build of FreeType 2 to */

+ /* save space (most client applications do not use them). */

/* */

/* To do so, you have to define the following macros before including */

- /* this file: */

+ /* this file. */

/* */

- /* FT_ERROR_START_LIST :: */

- /* This macro is called before anything else to define the start of */

- /* the error list. It is followed by several FT_ERROR_DEF calls */

- /* (see below). */

+ /* { */

+ /* FT_ERROR_START_LIST */

+ /* } */

/* */

- /* FT_ERROR_DEF( e, v, s ) :: */

- /* This macro is called to define one single error. */

- /* `e' is the error code identifier (e.g. FT_Err_Invalid_Argument). */

- /* `v' is the error numerical value. */

- /* `s' is the corresponding error string. */

+ /* This macro is called before anything else to define the start of */

+ /* the error list. It is followed by several FT_ERROR_DEF calls. */

/* */

- /* FT_ERROR_END_LIST :: */

- /* This macro ends the list. */

+ /* { */

+ /* FT_ERROR_DEF( e, v, s ) */

+ /* } */

/* */

- /* Additionally, you have to undefine __FTERRORS_H__ before #including */

- /* this file. */

+ /* This macro is called to define one single error. `e' is the error */

+ /* code identifier (e.g., `Invalid_Argument'), `v' is the error's */

+ /* numerical value, and `s' is the corresponding error string. */

+ /* */

+ /* { */

+ /* FT_ERROR_END_LIST */

+ /* } */

+ /* */

+ /* This macro ends the list. */

+ /* */

+ /* Additionally, you have to undefine `__FTERRORS_H__' before */

+ /* #including this file. */

+ /* */

+ /* Here is a simple example. */

/* */

- /* Here is a simple example: */

+ /* { */

+ /* #undef __FTERRORS_H__ */

+ /* #define FT_ERRORDEF( e, v, s ) { e, s }, */

+ /* #define FT_ERROR_START_LIST { */

+ /* #define FT_ERROR_END_LIST { 0, NULL } }; */

/* */

+ /* const struct */

/* { */

- /* #undef __FTERRORS_H__ */

- /* #define FT_ERRORDEF( e, v, s ) { e, s }, */

- /* #define FT_ERROR_START_LIST { */

- /* #define FT_ERROR_END_LIST { 0, 0 } }; */

+ /* int err_code; */

+ /* const char* err_msg; */

+ /* } ft_errors[] = */

/* */

- /* const struct */

- /* { */

- /* int err_code; */

- /* const char* err_msg; */

- /* } ft_errors[] = */

+ /* #include FT_ERRORS_H */

+ /* } */

/* */

- /* #include FT_ERRORS_H */

- /* } */

+ /* Note that `FT_Err_Ok' is _not_ defined with `FT_ERRORDEF' but with */

+ /* `FT_NOERRORDEF'; it is always zero. */

/* */

/*************************************************************************/

+ /* */

#ifndef __FTERRORS_H__

#define __FTERRORS_H__

« no previous file with comments | « third_party/freetype/include/freetype/fterrdef.h ('k') | third_party/freetype/include/freetype/ftfntfmt.h » ('j') | no next file with comments »