From c879f24562cc21bb062fb2faa86633a6c8c2371a Mon Sep 17 00:00:00 2001 From: Werner Lemberg Date: Mon, 11 Mar 2013 10:11:57 +0100 Subject: [PATCH] [gxvalid] Fix module error. * src/gxvalid/gxverror.h (FT_ERR_BASE): Define as FT_Mod_Err_GXvalid. * include/freetype/ftmoderr.h: Add module error for `GXvalid'. --- ChangeLog | 8 ++++++++ include/freetype/ftmoderr.h | 33 +++++++++++++++++---------------- src/gxvalid/gxverror.h | 4 ++-- 3 files changed, 27 insertions(+), 18 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5d3af72d4..739fddefa 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2013-03-11 Werner Lemberg + + [gxvalid] Fix module error. + + * src/gxvalid/gxverror.h (FT_ERR_BASE): Define as + FT_Mod_Err_GXvalid. + * include/freetype/ftmoderr.h: Add module error for `GXvalid'. + 2013-03-11 Werner Lemberg Always use module related error codes. diff --git a/include/freetype/ftmoderr.h b/include/freetype/ftmoderr.h index 1bf3b384a..83beb0be1 100644 --- a/include/freetype/ftmoderr.h +++ b/include/freetype/ftmoderr.h @@ -4,7 +4,7 @@ /* */ /* FreeType module error offsets (specification). */ /* */ -/* Copyright 2001, 2002, 2003, 2004, 2005, 2010 by */ +/* Copyright 2001-2005, 2010, 2013 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -109,21 +109,22 @@ FT_MODERRDEF( Cache, 0x400, "cache module" ) FT_MODERRDEF( CFF, 0x500, "CFF module" ) FT_MODERRDEF( CID, 0x600, "CID module" ) - FT_MODERRDEF( Gzip, 0x700, "Gzip module" ) - FT_MODERRDEF( LZW, 0x800, "LZW module" ) - FT_MODERRDEF( OTvalid, 0x900, "OpenType validation module" ) - FT_MODERRDEF( PCF, 0xA00, "PCF module" ) - FT_MODERRDEF( PFR, 0xB00, "PFR module" ) - FT_MODERRDEF( PSaux, 0xC00, "PS auxiliary module" ) - FT_MODERRDEF( PShinter, 0xD00, "PS hinter module" ) - FT_MODERRDEF( PSnames, 0xE00, "PS names module" ) - FT_MODERRDEF( Raster, 0xF00, "raster module" ) - FT_MODERRDEF( SFNT, 0x1000, "SFNT module" ) - FT_MODERRDEF( Smooth, 0x1100, "smooth raster module" ) - FT_MODERRDEF( TrueType, 0x1200, "TrueType module" ) - FT_MODERRDEF( Type1, 0x1300, "Type 1 module" ) - FT_MODERRDEF( Type42, 0x1400, "Type 42 module" ) - FT_MODERRDEF( Winfonts, 0x1500, "Windows FON/FNT module" ) + FT_MODERRDEF( GXvalid, 0x700, "GX validation module" ) + FT_MODERRDEF( Gzip, 0x800, "Gzip module" ) + FT_MODERRDEF( LZW, 0x900, "LZW module" ) + FT_MODERRDEF( OTvalid, 0xA00, "OpenType validation module" ) + FT_MODERRDEF( PCF, 0xB00, "PCF module" ) + FT_MODERRDEF( PFR, 0xC00, "PFR module" ) + FT_MODERRDEF( PSaux, 0xD00, "PS auxiliary module" ) + FT_MODERRDEF( PShinter, 0xE00, "PS hinter module" ) + FT_MODERRDEF( PSnames, 0xF00, "PS names module" ) + FT_MODERRDEF( Raster, 0x1000, "raster module" ) + FT_MODERRDEF( SFNT, 0x1100, "SFNT module" ) + FT_MODERRDEF( Smooth, 0x1200, "smooth raster module" ) + FT_MODERRDEF( TrueType, 0x1300, "TrueType module" ) + FT_MODERRDEF( Type1, 0x1400, "Type 1 module" ) + FT_MODERRDEF( Type42, 0x1500, "Type 42 module" ) + FT_MODERRDEF( Winfonts, 0x1600, "Windows FON/FNT module" ) #ifdef FT_MODERR_END_LIST diff --git a/src/gxvalid/gxverror.h b/src/gxvalid/gxverror.h index 7d2ef7809..c64bf06e8 100644 --- a/src/gxvalid/gxverror.h +++ b/src/gxvalid/gxverror.h @@ -4,7 +4,7 @@ /* */ /* TrueTypeGX/AAT validation module error codes (specification only). */ /* */ -/* Copyright 2004, 2005, 2012 */ +/* Copyright 2004, 2005, 2012-2013 */ /* by suzuki toshiya, Masatake YAMATO, Red Hat K.K., */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ @@ -41,7 +41,7 @@ #undef FT_ERR_PREFIX #define FT_ERR_PREFIX GXV_Err_ -#define FT_ERR_BASE FT_Mod_Err_GXV +#define FT_ERR_BASE FT_Mod_Err_GXvalid #define FT_KEEP_ERR_PREFIX