* src/base/ftdebug.c (ft_debug_init): Highest debug level is 7,

ChangeLog

@@ -1,3 +1,8 @@
+2004-09-03  Werner Lemberg  <wl@gnu.org>
+
+	* src/base/ftdebug.c (ft_debug_init): Highest debug level is 7,
+	not 6.
+
 2004-08-30  Werner Lemberg  <wl@gnu.org>
 
 	* include/freetype/tttags.h (TTAG_BASE, TTAG_GDEF, TTAG_GPOS,

devel/ftoption.h

@@ -446,7 +446,7 @@ FT_BEGIN_HEADER
   /* work-around hinting system.  Note that for the moment, the algorithm  */
   /* is only used when selected at runtime through the parameter tag       */
   /* FT_PARAM_TAG_UNPATENTED_HINTING; or when the debug hook               */
-  /* FT_DEBUG_HOOK_UNPATENTED_HINTING is globally actived                  */
+  /* FT_DEBUG_HOOK_UNPATENTED_HINTING is globally activated.               */
   /*                                                                       */
 #define TT_CONFIG_OPTION_UNPATENTED_HINTING
 

include/freetype/config/ftoption.h

@@ -446,7 +446,7 @@ FT_BEGIN_HEADER
   /* work-around hinting system.  Note that for the moment, the algorithm  */
   /* is only used when selected at runtime through the parameter tag       */
   /* FT_PARAM_TAG_UNPATENTED_HINTING; or when the debug hook               */
-  /* FT_DEBUG_HOOK_UNPATENTED_HINTING is globally actived                  */
+  /* FT_DEBUG_HOOK_UNPATENTED_HINTING is globally actived.                 */
   /*                                                                       */
 #define TT_CONFIG_OPTION_UNPATENTED_HINTING
 

include/freetype/ftcache.h

@@ -86,14 +86,6 @@ FT_BEGIN_HEADER
   /*   FTC_CMapCache_New                                                   */
   /*   FTC_CMapCache_Lookup                                                */
   /*                                                                       */
-  /*                                                                       */
-  /*   FTC_Image_Desc                                                      */
-  /*   FTC_Image_Cache                                                     */
-  /*   FTC_Image_Cache_Lookup                                              */
-  /*                                                                       */
-  /*   FTC_SBit_Cache                                                      */
-  /*   FTC_SBit_Cache_Lookup                                               */
-  /*                                                                       */
   /*************************************************************************/
 
 

src/base/ftdebug.c

@@ -125,17 +125,17 @@
   /* value of the `FT2_DEBUG' environment variable.  It must be a list of  */
   /* toggles, separated by spaces, `;', or `,'.  Example:                  */
   /*                                                                       */
-  /*    export FT2_DEBUG="any:3 memory:6 stream:5"                         */
+  /*    export FT2_DEBUG="any:3 memory:7 stream:5"                         */
   /*                                                                       */
   /* This requests that all levels be set to 3, except the trace level for */
-  /* the memory and stream components which are set to 6 and 5,            */
+  /* the memory and stream components which are set to 7 and 5,            */
   /* respectively.                                                         */
   /*                                                                       */
   /* See the file <include/freetype/internal/fttrace.h> for details of the */
   /* available toggle names.                                               */
   /*                                                                       */
-  /* The level must be between 0 and 6; 0 means quiet (except for serious  */
-  /* runtime errors), and 6 means _very_ verbose.                          */
+  /* The level must be between 0 and 7; 0 means quiet (except for serious  */
+  /* runtime errors), and 7 means _very_ verbose.                          */
   /*                                                                       */
   FT_BASE_DEF( void )
   ft_debug_init( void )
@@ -189,7 +189,7 @@
           if ( *p )
           {
             level = *p++ - '0';
-            if ( level < 0 || level > 6 )
+            if ( level < 0 || level > 7 )
               level = -1;
           }