ref: 16dc51feaec4086a8b93292804223d6b4e93def9
parent: c567ff279b7b2ed3dc0b4fb02df4f2861b072cd8
author: Werner Lemberg <[email protected]>
date: Sun May 18 13:36:15 EDT 2008
* src/base/ftdebug.c (FT_Message, FT_Panic): Send output to stderr. This fixes Savannah bug #23280. * docs/CHANGES: Updated. Some formatting.
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,11 +1,18 @@
+2008-05-18 Werner Lemberg <[email protected]>
+
+ * src/base/ftdebug.c (FT_Message, FT_Panic): Send output to stderr.
+ This fixes Savannah bug #23280.
+
+ * docs/CHANGES: Updated.
+
2008-05-18 David Turner <[email protected]>
- * src/psnames/psmodule.c: using 'static' to make declarations
- non-global for ft_wgl_extra_unicodes, ft_wgl_extra_glyph_names,
- ft_wgl_extra_glyph_name_offsets, ps_check_wgl_name and
- ps_check_wgl_unicode
+ * src/psnames/psmodule.c (ft_wgl_extra_unicodes,
+ ft_wgl_extra_glyph_names, ft_wgl_extra_glyph_name_offsets,
+ ps_check_wgl_name, ps_check_wgl_unicode): Use `static' to make
+ declarations non-global.
- * src/type1/t1load.c: add missing comment
+ * src/type1/t1load.c: Add missing comment.
2008-05-17 Sam Hocevar <samh>
--- a/docs/CHANGES
+++ b/docs/CHANGES
@@ -20,6 +20,7 @@
- A call to FT_Open_Face with `face_index' < 0 crashed FreeType if
the font was a Windows (bitmap) FNT/FON.
+
II. IMPORTANT CHANGES
- The new function `FT_Get_CID_Registry_Ordering_Supplement' gives
@@ -44,9 +45,11 @@
- Better WGL4 glyph name support, contributed by Sergey Tolstov.
+ - Debugging output of the various FT_TRACEX macros is now sent to
+ stderr.
-======================================================================
+======================================================================
CHANGES BETWEEN 2.3.5 and 2.3.4
--- a/include/freetype/internal/ftdebug.h
+++ b/include/freetype/internal/ftdebug.h
@@ -4,7 +4,7 @@
/* */
/* Debugging and logging component (specification). */
/* */
-/* Copyright 1996-2001, 2002, 2004, 2006, 2007 by */
+/* Copyright 1996-2001, 2002, 2004, 2006, 2007, 2008 by */
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
/* */
/* This file is part of the FreeType project, and may only be used, */
@@ -146,10 +146,12 @@
/*************************************************************************/
/* */
- /* You need two opening resp. closing parentheses! */
+ /* You need two opening and closing parentheses! */
/* */
/* Example: FT_TRACE0(( "Value is %i", foo )) */
/* */
+ /* Output of the FT_TRACEX macros is sent to stderr. */
+ /* */
/*************************************************************************/
#define FT_TRACE0( varformat ) FT_TRACE( 0, varformat )
@@ -164,8 +166,10 @@
/*************************************************************************/
/* */
- /* Define the FT_ERROR macro */
+ /* Define the FT_ERROR macro. */
/* */
+ /* Output of this macro is sent to stderr. */
+ /* */
/*************************************************************************/
#ifdef FT_DEBUG_LEVEL_ERROR
@@ -181,7 +185,7 @@
/*************************************************************************/
/* */
- /* Define the FT_ASSERT macro */
+ /* Define the FT_ASSERT macro. */
/* */
/*************************************************************************/
@@ -204,21 +208,23 @@
/*************************************************************************/
/* */
- /* Define `FT_Message' and `FT_Panic' when needed */
+ /* Define `FT_Message' and `FT_Panic' when needed. */
/* */
/*************************************************************************/
#ifdef FT_DEBUG_LEVEL_ERROR
-#include "stdio.h" /* for vprintf() */
+#include "stdio.h" /* for vfprintf() */
/* print a message */
FT_BASE( void )
- FT_Message( const char* fmt, ... );
+ FT_Message( const char* fmt,
+ ... );
/* print a message and exit */
FT_BASE( void )
- FT_Panic( const char* fmt, ... );
+ FT_Panic( const char* fmt,
+ ... );
#endif /* FT_DEBUG_LEVEL_ERROR */
@@ -229,8 +235,8 @@
#if defined( _MSC_VER ) /* Visual C++ (and Intel C++) */
- /* we disable the warning `conditional expression is constant' here */
- /* in order to compile cleanly with the maximum level of warnings */
+ /* We disable the warning `conditional expression is constant' here */
+ /* in order to compile cleanly with the maximum level of warnings. */
#pragma warning( disable : 4127 )
#endif /* _MSC_VER */
--- a/src/base/ftdebug.c
+++ b/src/base/ftdebug.c
@@ -4,7 +4,7 @@
/* */
/* Debugging and logging component (body). */
/* */
-/* Copyright 1996-2001, 2002, 2004 by */
+/* Copyright 1996-2001, 2002, 2004, 2008 by */
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
/* */
/* This file is part of the FreeType project, and may only be used, */
@@ -57,7 +57,7 @@
va_start( ap, fmt );
- vprintf( fmt, ap );
+ vfprintf( stderr, fmt, ap );
va_end( ap );
}
@@ -71,7 +71,7 @@
va_start( ap, fmt );
- vprintf( fmt, ap );
+ vfprintf( stderr, fmt, ap );
va_end( ap );
exit( EXIT_FAILURE );
--- a/src/type1/t1load.c
+++ b/src/type1/t1load.c
@@ -1397,9 +1397,9 @@
FT_Byte* temp;
- /* some fonts define empty subr records. this is not totally
- * compliant to the spec (which says they should at least
- * contain a 'return') but we support them */
+ /* some fonts define empty subr records -- this is not totally */
+ /* compliant to the specification (which says they should at */
+ /* least contain a `return'), but we support them anyway */
if ( size < face->type1.private_dict.lenIV )
{error = T1_Err_Invalid_File_Format;