Commit c879f24562cc21bb062fb2faa86633a6c8c2371a
2013-03-11T10:11:57
[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'.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91
diff --git a/ChangeLog b/ChangeLog
index 5d3af72..739fdde 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
2013-03-11 Werner Lemberg <wl@gnu.org>
+ [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 <wl@gnu.org>
+
Always use module related error codes.
* src/cff/cffobjs.c (cff_face_init), src/type1/t1objs.c
diff --git a/include/freetype/ftmoderr.h b/include/freetype/ftmoderr.h
index 1bf3b38..83beb0b 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 7d2ef78..c64bf06 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