Various compiler warning fixes for `make multi'.

* src/autofit/afcjk.c (af_cjk_hints_compute_blue_edges),
src/autofit/aflatin.c (af_latin_hint_compute_blue_edges,
af_latin_hint_edges), src/autofit/aflatin2.c
(af_latin2_hints_compute_blue_edges, af_latin2_hint_edges): Declare
as `static'.

* src/cache/ftccmap.c (FTC_CMAP_QUERY_HASH, FTC_CMAP_NODE_HASH):
Removed.  Unused.
* src/cache/ftcimage.c: Include FT_INTERNAL_OBJECTS_H.
* src/cache/ftcmanag.c (FTC_LRU_GET_MANAGER): Removed.  Unused.

* src/cff/cf2intrp.c: Include `cf2intrp.h'.
* src/cff/cffdrivr.c (PAIR_TAG): Removed.  Unused.

* src/gzip/ftgzip.c (NO_DUMMY_DECL): Removed.  Unused.

* src/psaux/afmparse.c (afm_parser_read_int): Declare as `static'.

* src/pshinter/pshalgo.c (STRONGER, PSH_ZONE_MIN, PSH_ZONE_MAX):
Removed.  Unused.

* src/raster/ftraster.c (Render_Glyph): Declare as `static'.

* src/sfnt/ttpost.c (load_format_20): Fix signedness warning.

* src/truetype/ttdriver.c (PAIR_TAG): Removed.  Unused.
* src/truetype/ttsubpix.c (is_member_of_family_class,
is_member_of_style_class): Declare as `static'.

* src/type1/t1gload.c (T1_Parse_Glyph_And_Get_Char_String): Declare
as `static'.
* src/type1/t1load.c (mm_axis_unmap, mm_weights_unmap): Declare as
`static'.
(T1_FIELD_COUNT): Removed.  Unused.
* src/type1/t1parse.h (T1_Done_Table): Removed.  Unused.

* src/type42/t42parse.c (T1_Done_Table): Removed.  Unused.
This commit is contained in:
Werner Lemberg 2015-03-01 19:27:09 +01:00
parent bd133c352e
commit 851e815127
20 changed files with 57 additions and 61 deletions

View File

@ -1,3 +1,45 @@
2015-02-25 Werner Lemberg <wl@gnu.org>
Various compiler warning fixes for `make multi'.
* src/autofit/afcjk.c (af_cjk_hints_compute_blue_edges),
src/autofit/aflatin.c (af_latin_hint_compute_blue_edges,
af_latin_hint_edges), src/autofit/aflatin2.c
(af_latin2_hints_compute_blue_edges, af_latin2_hint_edges): Declare
as `static'.
* src/cache/ftccmap.c (FTC_CMAP_QUERY_HASH, FTC_CMAP_NODE_HASH):
Removed. Unused.
* src/cache/ftcimage.c: Include FT_INTERNAL_OBJECTS_H.
* src/cache/ftcmanag.c (FTC_LRU_GET_MANAGER): Removed. Unused.
* src/cff/cf2intrp.c: Include `cf2intrp.h'.
* src/cff/cffdrivr.c (PAIR_TAG): Removed. Unused.
* src/gzip/ftgzip.c (NO_DUMMY_DECL): Removed. Unused.
* src/psaux/afmparse.c (afm_parser_read_int): Declare as `static'.
* src/pshinter/pshalgo.c (STRONGER, PSH_ZONE_MIN, PSH_ZONE_MAX):
Removed. Unused.
* src/raster/ftraster.c (Render_Glyph): Declare as `static'.
* src/sfnt/ttpost.c (load_format_20): Fix signedness warning.
* src/truetype/ttdriver.c (PAIR_TAG): Removed. Unused.
* src/truetype/ttsubpix.c (is_member_of_family_class,
is_member_of_style_class): Declare as `static'.
* src/type1/t1gload.c (T1_Parse_Glyph_And_Get_Char_String): Declare
as `static'.
* src/type1/t1load.c (mm_axis_unmap, mm_weights_unmap): Declare as
`static'.
(T1_FIELD_COUNT): Removed. Unused.
* src/type1/t1parse.h (T1_Done_Table): Removed. Unused.
* src/type42/t42parse.c (T1_Done_Table): Removed. Unused.
2015-02-25 Werner Lemberg <wl@gnu.org> 2015-02-25 Werner Lemberg <wl@gnu.org>
[psaux] Signedness fixes. [psaux] Signedness fixes.

View File

@ -1190,7 +1190,7 @@
/* Compute all edges which lie within blue zones. */ /* Compute all edges which lie within blue zones. */
FT_LOCAL_DEF( void ) static void
af_cjk_hints_compute_blue_edges( AF_GlyphHints hints, af_cjk_hints_compute_blue_edges( AF_GlyphHints hints,
AF_CJKMetrics metrics, AF_CJKMetrics metrics,
AF_Dimension dim ) AF_Dimension dim )

View File

@ -1825,7 +1825,7 @@
/* Compute all edges which lie within blue zones. */ /* Compute all edges which lie within blue zones. */
FT_LOCAL_DEF( void ) static void
af_latin_hints_compute_blue_edges( AF_GlyphHints hints, af_latin_hints_compute_blue_edges( AF_GlyphHints hints,
AF_LatinMetrics metrics ) AF_LatinMetrics metrics )
{ {
@ -2280,7 +2280,7 @@
/* The main grid-fitting routine. */ /* The main grid-fitting routine. */
FT_LOCAL_DEF( void ) static void
af_latin_hint_edges( AF_GlyphHints hints, af_latin_hint_edges( AF_GlyphHints hints,
AF_Dimension dim ) AF_Dimension dim )
{ {

View File

@ -1382,7 +1382,7 @@
} }
FT_LOCAL_DEF( void ) static void
af_latin2_hints_compute_blue_edges( AF_GlyphHints hints, af_latin2_hints_compute_blue_edges( AF_GlyphHints hints,
AF_LatinMetrics metrics ) AF_LatinMetrics metrics )
{ {
@ -1829,7 +1829,7 @@
/*************************************************************************/ /*************************************************************************/
FT_LOCAL_DEF( void ) static void
af_latin2_hint_edges( AF_GlyphHints hints, af_latin2_hint_edges( AF_GlyphHints hints,
AF_Dimension dim ) AF_Dimension dim )
{ {

4
src/cache/ftccmap.c vendored
View File

@ -63,8 +63,6 @@
} FTC_CMapQueryRec, *FTC_CMapQuery; } FTC_CMapQueryRec, *FTC_CMapQuery;
#define FTC_CMAP_QUERY( x ) ((FTC_CMapQuery)(x)) #define FTC_CMAP_QUERY( x ) ((FTC_CMapQuery)(x))
#define FTC_CMAP_QUERY_HASH( x ) \
FTC_CMAP_HASH( (x)->face_id, (x)->cmap_index, (x)->char_code )
/* the cmap cache node */ /* the cmap cache node */
typedef struct FTC_CMapNodeRec_ typedef struct FTC_CMapNodeRec_
@ -78,8 +76,6 @@
} FTC_CMapNodeRec, *FTC_CMapNode; } FTC_CMapNodeRec, *FTC_CMapNode;
#define FTC_CMAP_NODE( x ) ( (FTC_CMapNode)( x ) ) #define FTC_CMAP_NODE( x ) ( (FTC_CMapNode)( x ) )
#define FTC_CMAP_NODE_HASH( x ) \
FTC_CMAP_HASH( (x)->face_id, (x)->cmap_index, (x)->first )
/* if (indices[n] == FTC_CMAP_UNKNOWN), we assume that the corresponding */ /* if (indices[n] == FTC_CMAP_UNKNOWN), we assume that the corresponding */
/* glyph indices haven't been queried through FT_Get_Glyph_Index() yet */ /* glyph indices haven't been queried through FT_Get_Glyph_Index() yet */

View File

@ -20,6 +20,7 @@
#include FT_CACHE_H #include FT_CACHE_H
#include "ftcimage.h" #include "ftcimage.h"
#include FT_INTERNAL_MEMORY_H #include FT_INTERNAL_MEMORY_H
#include FT_INTERNAL_OBJECTS_H
#include "ftccback.h" #include "ftccback.h"
#include "ftcerror.h" #include "ftcerror.h"

View File

@ -34,8 +34,6 @@
#undef FT_COMPONENT #undef FT_COMPONENT
#define FT_COMPONENT trace_cache #define FT_COMPONENT trace_cache
#define FTC_LRU_GET_MANAGER( lru ) ( (FTC_Manager)(lru)->user_data )
static FT_Error static FT_Error
ftc_scaler_lookup_size( FTC_Manager manager, ftc_scaler_lookup_size( FTC_Manager manager,

View File

@ -43,6 +43,7 @@
#include "cf2font.h" #include "cf2font.h"
#include "cf2stack.h" #include "cf2stack.h"
#include "cf2hints.h" #include "cf2hints.h"
#include "cf2intrp.h"
#include "cf2error.h" #include "cf2error.h"

View File

@ -64,11 +64,6 @@
/*************************************************************************/ /*************************************************************************/
#undef PAIR_TAG
#define PAIR_TAG( left, right ) ( ( (FT_ULong)left << 16 ) | \
(FT_ULong)right )
/*************************************************************************/ /*************************************************************************/
/* */ /* */
/* <Function> */ /* <Function> */
@ -121,9 +116,6 @@
} }
#undef PAIR_TAG
/*************************************************************************/ /*************************************************************************/
/* */ /* */
/* <Function> */ /* <Function> */

View File

@ -58,7 +58,6 @@
/* conflicts when a program is linked with both FreeType and the */ /* conflicts when a program is linked with both FreeType and the */
/* original ZLib. */ /* original ZLib. */
#define NO_DUMMY_DECL
#ifndef USE_ZLIB_ZCALLOC #ifndef USE_ZLIB_ZCALLOC
#define MY_ZCALLOC /* prevent all zcalloc() & zfree() in zutils.c */ #define MY_ZCALLOC /* prevent all zcalloc() & zfree() in zutils.c */
#endif #endif

View File

@ -562,7 +562,7 @@
} }
FT_LOCAL_DEF( FT_Error ) static FT_Error
afm_parser_read_int( AFM_Parser parser, afm_parser_read_int( AFM_Parser parser,
FT_Int* aint ) FT_Int* aint )
{ {

View File

@ -38,8 +38,6 @@
#define COMPUTE_INFLEXS /* compute inflection points to optimize `S' */ #define COMPUTE_INFLEXS /* compute inflection points to optimize `S' */
/* and similar glyphs */ /* and similar glyphs */
#define STRONGER /* slightly increase the contrast of smooth */
/* hinting */
/*************************************************************************/ /*************************************************************************/
@ -890,9 +888,6 @@
/*************************************************************************/ /*************************************************************************/
/*************************************************************************/ /*************************************************************************/
#define PSH_ZONE_MIN -3200000L
#define PSH_ZONE_MAX +3200000L
#define xxDEBUG_ZONES #define xxDEBUG_ZONES
@ -910,10 +905,6 @@
zone->max ); zone->max );
} }
#else
#define psh_print_zone( x ) do { } while ( 0 )
#endif /* DEBUG_ZONES */ #endif /* DEBUG_ZONES */

View File

@ -2920,7 +2920,7 @@
/* <Return> */ /* <Return> */
/* FreeType error code. 0 means success. */ /* FreeType error code. 0 means success. */
/* */ /* */
FT_LOCAL_DEF( FT_Error ) static FT_Error
Render_Glyph( RAS_ARG ) Render_Glyph( RAS_ARG )
{ {
FT_Error error; FT_Error error;

View File

@ -246,7 +246,7 @@
if ( len > post_limit || if ( len > post_limit ||
FT_STREAM_POS() > post_limit - len ) FT_STREAM_POS() > post_limit - len )
{ {
FT_Int d = post_limit - FT_STREAM_POS(); FT_Int d = (FT_Int)post_limit - (FT_Int)FT_STREAM_POS();
FT_ERROR(( "load_format_20:" FT_ERROR(( "load_format_20:"

View File

@ -134,11 +134,6 @@
/*************************************************************************/ /*************************************************************************/
#undef PAIR_TAG
#define PAIR_TAG( left, right ) ( ( (FT_ULong)left << 16 ) | \
(FT_ULong)right )
/*************************************************************************/ /*************************************************************************/
/* */ /* */
/* <Function> */ /* <Function> */
@ -191,9 +186,6 @@
} }
#undef PAIR_TAG
static FT_Error static FT_Error
tt_get_advances( FT_Face ttface, tt_get_advances( FT_Face ttface,
FT_UInt start, FT_UInt start,

View File

@ -744,7 +744,7 @@
#endif /* FORCE_NATURAL_WIDTHS */ #endif /* FORCE_NATURAL_WIDTHS */
FT_LOCAL_DEF( FT_Bool ) static FT_Bool
is_member_of_family_class( const FT_String* detected_font_name, is_member_of_family_class( const FT_String* detected_font_name,
const FT_String* rule_font_name ) const FT_String* rule_font_name )
{ {
@ -779,7 +779,7 @@
} }
FT_LOCAL_DEF( FT_Bool ) static FT_Bool
is_member_of_style_class( const FT_String* detected_font_style, is_member_of_style_class( const FT_String* detected_font_style,
const FT_String* rule_font_style ) const FT_String* rule_font_style )
{ {

View File

@ -54,7 +54,7 @@
/*************************************************************************/ /*************************************************************************/
FT_LOCAL_DEF( FT_Error ) static FT_Error
T1_Parse_Glyph_And_Get_Char_String( T1_Decoder decoder, T1_Parse_Glyph_And_Get_Char_String( T1_Decoder decoder,
FT_UInt glyph_index, FT_UInt glyph_index,
FT_Data* char_string ) FT_Data* char_string )

View File

@ -226,7 +226,7 @@
/* Given a normalized (blend) coordinate, figure out the design */ /* Given a normalized (blend) coordinate, figure out the design */
/* coordinate appropriate for that value. */ /* coordinate appropriate for that value. */
/* */ /* */
FT_LOCAL_DEF( FT_Fixed ) static FT_Fixed
mm_axis_unmap( PS_DesignMap axismap, mm_axis_unmap( PS_DesignMap axismap,
FT_Fixed ncv ) FT_Fixed ncv )
{ {
@ -255,7 +255,7 @@
/* Given a vector of weights, one for each design, figure out the */ /* Given a vector of weights, one for each design, figure out the */
/* normalized axis coordinates which gave rise to those weights. */ /* normalized axis coordinates which gave rise to those weights. */
/* */ /* */
FT_LOCAL_DEF( void ) static void
mm_weights_unmap( FT_Fixed* weights, mm_weights_unmap( FT_Fixed* weights,
FT_Fixed* axiscoords, FT_Fixed* axiscoords,
FT_UInt axis_count ) FT_UInt axis_count )
@ -1843,10 +1843,6 @@
}; };
#define T1_FIELD_COUNT \
( sizeof ( t1_keywords ) / sizeof ( t1_keywords[0] ) )
static FT_Error static FT_Error
parse_dict( T1_Face face, parse_dict( T1_Face face,
T1_Loader loader, T1_Loader loader,

View File

@ -77,12 +77,6 @@ FT_BEGIN_HEADER
#define T1_Add_Table( p, i, o, l ) (p)->funcs.add( (p), i, o, l ) #define T1_Add_Table( p, i, o, l ) (p)->funcs.add( (p), i, o, l )
#define T1_Done_Table( p ) \
do \
{ \
if ( (p)->funcs.done ) \
(p)->funcs.done( p ); \
} while ( 0 )
#define T1_Release_Table( p ) \ #define T1_Release_Table( p ) \
do \ do \
{ \ { \

View File

@ -104,12 +104,6 @@
#define T1_Add_Table( p, i, o, l ) (p)->funcs.add( (p), i, o, l ) #define T1_Add_Table( p, i, o, l ) (p)->funcs.add( (p), i, o, l )
#define T1_Done_Table( p ) \
do \
{ \
if ( (p)->funcs.done ) \
(p)->funcs.done( p ); \
} while ( 0 )
#define T1_Release_Table( p ) \ #define T1_Release_Table( p ) \
do \ do \
{ \ { \