AuroraMiddleware/freetype
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

* builds/unix/ftsystem.c, include/freetype/config/ftheader.h,

Browse Source 
include/freetype/internal/services/svotval.h,
    include/freetype/internal/services/svpfr.h,
    src/base/ftsystem.c, src/bdf/bdfdrivr.c, src/cache/ftcbasic.c,
    src/cff/cffcmap.c, src/gzip/ftgzip.c, src/lzw/ftlzw.c,
    src/lzw/ftlzw2.c, src/psaux/t1cmap.c, src/sfnt/ttbdf.c,
    src/smooth/ftgrays.c:

       solved -Wmissing-prototypes warnings with GCC
This commit is contained in:
David Turner 2006-02-25 14:53:02 +00:00
parent 6c71c6b968
commit de271ab8f0
15 changed files with 78 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ChangeLog
View File

@ -7,6 +7,17 @@
solved compiler warnings as well as C++ compilation problems
* builds/unix/ftsystem.c, include/freetype/config/ftheader.h,
include/freetype/internal/services/svotval.h,
include/freetype/internal/services/svpfr.h,
src/base/ftsystem.c, src/bdf/bdfdrivr.c, src/cache/ftcbasic.c,
src/cff/cffcmap.c, src/gzip/ftgzip.c, src/lzw/ftlzw.c,
src/lzw/ftlzw2.c, src/psaux/t1cmap.c, src/sfnt/ttbdf.c,
src/smooth/ftgrays.c:
solved -Wmissing-prototypes warnings with GCC
2006-02-24 Chia-I Wu <b90201047@ntu.edu.tw>

2
builds/unix/ftsystem.c
View File

@ -23,7 +23,7 @@
#include FT_SYSTEM_H
#include FT_ERRORS_H
#include FT_TYPES_H
#include FT_INTERNAL_OBJECTS_H
#include FT_INTERNAL_STREAM_H
/* memory-mapping includes and definitions */
#ifdef HAVE_UNISTD_H

13
include/freetype/config/ftheader.h
View File

@ -602,6 +602,19 @@
*/
#define FT_GX_VALIDATE_H <freetype/ftgxval.h>
/*************************************************************************
*
* @macro:
* FT_PFR_H
*
* @description:
* A macro used in #include statements to name the file containing the
* FreeType 2 API used to access PFR-specific data.
*
*/
#define FT_PFR_H <freetype/ftpfr.h>
/* */

2
include/freetype/internal/services/svotval.h
View File

@ -19,6 +19,8 @@
#ifndef __SVOTVAL_H__
#define __SVOTVAL_H__
#include FT_OPENTYPE_VALIDATE_H
#include FT_INTERNAL_VALIDATE_H
FT_BEGIN_HEADER

1
include/freetype/internal/services/svpfr.h
View File

@ -19,6 +19,7 @@
#ifndef __SVPFR_H__
#define __SVPFR_H__
#include FT_PFR_H
#include FT_INTERNAL_SERVICE_H

3
src/base/ftsystem.c
View File

@ -28,6 +28,7 @@
#include <ft2build.h>
#include FT_CONFIG_CONFIG_H
#include FT_INTERNAL_DEBUG_H
#include FT_INTERNAL_STREAM_H
#include FT_SYSTEM_H
#include FT_ERRORS_H
#include FT_TYPES_H
@ -213,7 +214,7 @@
}
/* documentation is in ftobjs.h */
/* documentation is in ftstream.h */
FT_BASE_DEF( FT_Error )
FT_Stream_Open( FT_Stream stream,

2
src/bdf/bdfdrivr.c
View File

@ -337,7 +337,7 @@ THE SOFTWARE.
BDF_Face face = (BDF_Face)bdfface;
FT_Memory memory = FT_FACE_MEMORY( face );
bdf_font_t* font;
bdf_font_t* font = NULL;
bdf_options_t options;
FT_UNUSED( num_params );

49
src/cache/ftcbasic.c vendored
View File

@ -385,20 +385,12 @@
#ifdef FT_CONFIG_OPTION_OLD_INTERNALS
FT_EXPORT_DEF( FT_Error )
FTC_Image_Cache_New( FTC_Manager manager,
FTC_ImageCache *acache )
{
return FTC_ImageCache_New( manager, (FTC_ImageCache*)acache );
}
/* yet another backwards-legacy structure */
typedef struct FTC_OldImage_Desc_
{
FTC_FontRec font;
FT_UInt image_type;
} FTC_OldImage_Desc;
@ -434,7 +426,7 @@
typ->face_id = desc->font.face_id;
typ->width = desc->font.pix_width;
typ->height = desc->font.pix_height;
/* convert image type flags to load flags */
{
FT_UInt load_flags = FT_LOAD_DEFAULT;
@ -473,7 +465,27 @@
typ->flags = load_flags;
}
}
}
FT_EXPORT( FT_Error )
FTC_Image_Cache_New( FTC_Manager manager,
FTC_ImageCache *acache );
FT_EXPORT( FT_Error )
FTC_Image_Cache_Lookup( FTC_ImageCache icache,
FTC_OldImage_Desc* desc,
FT_UInt gindex,
FT_Glyph *aglyph );
FT_EXPORT_DEF( FT_Error )
FTC_Image_Cache_New( FTC_Manager manager,
FTC_ImageCache *acache )
{
return FTC_ImageCache_New( manager, (FTC_ImageCache*)acache );
}
FT_EXPORT_DEF( FT_Error )
@ -642,6 +654,17 @@
#ifdef FT_CONFIG_OPTION_OLD_INTERNALS
FT_EXPORT( FT_Error )
FTC_SBit_Cache_New( FTC_Manager manager,
FTC_SBitCache *acache );
FT_EXPORT( FT_Error )
FTC_SBit_Cache_Lookup( FTC_SBitCache cache,
FTC_OldImage_Desc* desc,
FT_UInt gindex,
FTC_SBit *ansbit );
FT_EXPORT_DEF( FT_Error )
FTC_SBit_Cache_New( FTC_Manager manager,
FTC_SBitCache *acache )
@ -657,11 +680,11 @@
FTC_SBit *ansbit )
{
FTC_ImageTypeRec type0;
if ( !desc )
return FT_Err_Invalid_Argument;
ftc_image_type_from_old_desc( &type0, desc );
return FTC_SBitCache_Lookup( (FTC_SBitCache)cache,

2
src/cff/cffcmap.c
View File

@ -119,7 +119,7 @@
/*************************************************************************/
/*************************************************************************/
const char *
FT_CALLBACK_DEF( const char* )
cff_sid_to_glyph_name( CFF_Font cff,
FT_UInt idx )
{

1
src/gzip/ftgzip.c
View File

@ -24,6 +24,7 @@
#include FT_INTERNAL_MEMORY_H
#include FT_INTERNAL_STREAM_H
#include FT_INTERNAL_DEBUG_H
#include FT_GZIP_H
#include <string.h>

1
src/lzw/ftlzw.c
View File

@ -26,6 +26,7 @@
#include FT_INTERNAL_MEMORY_H
#include FT_INTERNAL_STREAM_H
#include FT_INTERNAL_DEBUG_H
#include FT_LZW_H
#include <string.h>
#include <stdio.h>

1
src/lzw/ftlzw2.c
View File

@ -26,6 +26,7 @@
#include FT_INTERNAL_MEMORY_H
#include FT_INTERNAL_STREAM_H
#include FT_INTERNAL_DEBUG_H
#include FT_LZW_H
#include <string.h>
#include <stdio.h>

2
src/psaux/t1cmap.c
View File

@ -257,7 +257,7 @@
/*************************************************************************/
/*************************************************************************/
const char *
FT_CALLBACK_DEF( const char * )
t1_get_glyph_name( T1_Face face,
FT_UInt idx )
{

11
src/sfnt/ttbdf.c
View File

@ -85,6 +85,8 @@
FT_UInt version = FT_NEXT_USHORT( p );
FT_UInt num_strikes = FT_NEXT_USHORT( p );
FT_UInt32 strings = FT_NEXT_ULONG ( p );
FT_UInt count;
FT_Byte* strike;
if ( version != 0x0001 ||
@ -98,13 +100,10 @@
bdf->num_strikes = num_strikes;
bdf->strings = bdf->table + strings;
bdf->strings_size = length - strings;
}
/* check the strike descriptors */
{
FT_UInt count = bdf->num_strikes;
FT_Byte* p = bdf->table + 8;
FT_Byte* strike = p + count * 4;
count = bdf->num_strikes;
p = bdf->table + 8;
strike = p + count * 4;
for ( ; count > 0; count-- )

2
src/smooth/ftgrays.c
View File

@ -1959,7 +1959,7 @@
}
extern int
static int
gray_raster_render( PRaster raster,
const FT_Raster_Params* params )
{