ref: 248aa63973094c1f635a1290ab4575fcb213408b
parent: f3e2a97d5b8f437efefb0de65a4baceb526feac4
author: suzuki toshiya <[email protected]>
date: Tue Jun 14 19:47:21 EDT 2011
[gxvalid] Preparation to fix gcc4.6 compiler warnings.
* src/gxvalid/gxvcommn.h (GXV_LOAD_TRACE_VARS): New macro to
conditionalize the variable which is only used for trace messages.
Automatically set by FT_DEBUG_LEVEL_TRACE.
(GXV_LOAD_UNUSED_VARS): New macro to conditionalize the loading of
unvalidated variables. Undefined by default to calm gcc4.6 warning.
(GXV_ValidatorRec.{min_gid,max_gid}): New variables to hold defined
GID ranges, for the comparison of GID ranges in different subtables.
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2011-06-14 suzuki toshiya <[email protected]>
+
+ [gxvalid] Preparation to fix gcc4.6 compiler warnings.
+
+ * src/gxvalid/gxvcommn.h (GXV_LOAD_TRACE_VARS): New macro to
+ conditionalize the variable which is only used for trace messages.
+ Automatically set by FT_DEBUG_LEVEL_TRACE.
+ (GXV_LOAD_UNUSED_VARS): New macro to conditionalize the loading of
+ unvalidated variables. Undefined by default to calm gcc4.6 warning.
+ (GXV_ValidatorRec.{min_gid,max_gid}): New variables to hold defined+ GID ranges, for the comparison of GID ranges in different subtables.
+
2011-06-08 Werner Lemberg <[email protected]>
[autofit] Remove unused structure member.
--- a/src/gxvalid/gxvcommn.h
+++ b/src/gxvalid/gxvcommn.h
@@ -51,6 +51,17 @@
FT_BEGIN_HEADER
+ /* some variables are not evaluated or only used in trace */
+
+#ifdef FT_DEBUG_LEVEL_TRACE
+#define GXV_LOAD_TRACE_VARS
+#else
+#undef GXV_LOAD_TRACE_VARS
+#endif
+
+#undef GXV_LOAD_UNUSED_VARS /* debug purpose */
+
+
/*************************************************************************/
/*************************************************************************/
/***** *****/
@@ -233,6 +244,9 @@
GXV_Lookup_Value_Validate_Func lookupval_func;
GXV_Lookup_Fmt4_Transit_Func lookupfmt4_trans;
FT_Bytes lookuptbl_head;
+
+ FT_UShort min_gid;
+ FT_UShort max_gid;
GXV_StateTable_ValidatorRec statetable;
GXV_XStateTable_ValidatorRec xstatetable;