2001-06-27 21:46:12 +02:00
|
|
|
/* pcfread.c
|
2001-01-01 18:24:31 +01:00
|
|
|
|
|
|
|
FreeType font driver for pcf fonts
|
|
|
|
|
2004-02-08 17:30:37 +01:00
|
|
|
Copyright 2000, 2001, 2002, 2003, 2004 by
|
2001-06-27 21:46:12 +02:00
|
|
|
Francesco Zappa Nardelli
|
2001-01-01 18:24:31 +01:00
|
|
|
|
|
|
|
Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
|
|
of this software and associated documentation files (the "Software"), to deal
|
|
|
|
in the Software without restriction, including without limitation the rights
|
|
|
|
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
|
|
copies of the Software, and to permit persons to whom the Software is
|
|
|
|
furnished to do so, subject to the following conditions:
|
|
|
|
|
|
|
|
The above copyright notice and this permission notice shall be included in
|
|
|
|
all copies or substantial portions of the Software.
|
|
|
|
|
|
|
|
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
|
|
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
|
|
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
|
|
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
|
|
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
|
|
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
|
|
|
THE SOFTWARE.
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
|
|
#include <ft2build.h>
|
|
|
|
|
|
|
|
#include FT_INTERNAL_DEBUG_H
|
|
|
|
#include FT_INTERNAL_STREAM_H
|
|
|
|
#include FT_INTERNAL_OBJECTS_H
|
|
|
|
|
2001-03-20 12:14:24 +01:00
|
|
|
#include "pcf.h"
|
2003-06-07 06:02:21 +02:00
|
|
|
#include "pcfdrivr.h"
|
2003-01-22 23:45:28 +01:00
|
|
|
#include "pcfread.h"
|
2001-01-01 18:24:31 +01:00
|
|
|
|
Complete redesign of error codes. Please check ftmoderr.h for more
details.
* include/freetype/internal/cfferrs.h,
include/freetype/internal/tterrors.h,
include/freetype/internal/t1errors.h: Removed. Replaced with files
local to the module. All extra error codes have been moved to
`fterrors.h'.
* src/sfnt/ttpost.h: Move error codes to `fterrors.h'.
* src/autohint/aherrors.h, src/cache/ftcerror.h, src/cff/cfferrs.h,
src/cid/ciderrs.h, src/pcf/pcferror.h, src/psaux/psauxerr.h,
src/psnames/psnamerr.h, src/raster/rasterrs.h, src/sfnt/sferrors.h,
src/smooth/ftsmerrs.h, src/truetype/tterrors.h,
src/type1/t1errors.h, src/winfonts/fnterrs.h: New files defining the
error names for the module it belongs to.
* include/freetype/ftmoderr.h: New file, defining the module error
offsets. Its structure is similar to `fterrors.h'.
* include/freetype/fterrors.h (FT_NOERRORDEF): New macro.
(FT_ERRORDEF): Redefined to use module error offsets.
All internal error codes are now public; unused error codes have
been removed, some are new.
* include/freetype/config/ftheader.h (FT_MODULE_ERRORS_H): New
macro.
* include/freetype/config/ftoption.h
(FT_CONFIG_OPTION_USE_MODULE_ERRORS): New macro.
All other source files have been updated to use the new error codes;
some already existing (internal) error codes local to a module have
been renamed to give them the same name as in the base module.
All make files have been updated to include the local error files.
* src/cid/cidtokens.h: Replaced with...
* src/cid/cidtoken.h: This file for 8+3 consistency.
* src/raster/ftraster.c: Use macros for header file names.
2001-06-06 19:30:41 +02:00
|
|
|
#include "pcferror.h"
|
|
|
|
|
2001-06-27 21:46:12 +02:00
|
|
|
|
2001-01-01 18:24:31 +01:00
|
|
|
/*************************************************************************/
|
|
|
|
/* */
|
|
|
|
/* The macro FT_COMPONENT is used in trace mode. It is an implicit */
|
|
|
|
/* parameter of the FT_TRACE() and FT_ERROR() macros, used to print/log */
|
|
|
|
/* messages during execution. */
|
|
|
|
/* */
|
|
|
|
#undef FT_COMPONENT
|
|
|
|
#define FT_COMPONENT trace_pcfread
|
|
|
|
|
|
|
|
|
|
|
|
#if defined( FT_DEBUG_LEVEL_TRACE )
|
2004-04-21 16:30:37 +02:00
|
|
|
static const char* const tableNames[] =
|
2001-01-01 18:24:31 +01:00
|
|
|
{
|
|
|
|
"prop", "accl", "mtrcs", "bmps", "imtrcs",
|
|
|
|
"enc", "swidth", "names", "accel"
|
|
|
|
};
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
2001-06-27 21:46:12 +02:00
|
|
|
static
|
2001-01-01 18:24:31 +01:00
|
|
|
const FT_Frame_Field pcf_toc_header[] =
|
|
|
|
{
|
|
|
|
#undef FT_STRUCTURE
|
|
|
|
#define FT_STRUCTURE PCF_TocRec
|
|
|
|
|
|
|
|
FT_FRAME_START( 8 ),
|
|
|
|
FT_FRAME_ULONG_LE( version ),
|
|
|
|
FT_FRAME_ULONG_LE( count ),
|
|
|
|
FT_FRAME_END
|
|
|
|
};
|
|
|
|
|
|
|
|
|
2001-06-27 21:46:12 +02:00
|
|
|
static
|
2001-01-01 18:24:31 +01:00
|
|
|
const FT_Frame_Field pcf_table_header[] =
|
|
|
|
{
|
|
|
|
#undef FT_STRUCTURE
|
|
|
|
#define FT_STRUCTURE PCF_TableRec
|
|
|
|
|
|
|
|
FT_FRAME_START( 16 ),
|
|
|
|
FT_FRAME_ULONG_LE( type ),
|
|
|
|
FT_FRAME_ULONG_LE( format ),
|
|
|
|
FT_FRAME_ULONG_LE( size ),
|
|
|
|
FT_FRAME_ULONG_LE( offset ),
|
|
|
|
FT_FRAME_END
|
|
|
|
};
|
|
|
|
|
|
|
|
|
2001-06-27 21:46:12 +02:00
|
|
|
static FT_Error
|
|
|
|
pcf_read_TOC( FT_Stream stream,
|
|
|
|
PCF_Face face )
|
2001-01-01 18:24:31 +01:00
|
|
|
{
|
|
|
|
FT_Error error;
|
|
|
|
PCF_Toc toc = &face->toc;
|
|
|
|
PCF_Table tables;
|
|
|
|
|
2002-02-06 12:22:56 +01:00
|
|
|
FT_Memory memory = FT_FACE(face)->memory;
|
|
|
|
FT_UInt n;
|
2001-01-01 18:24:31 +01:00
|
|
|
|
|
|
|
|
2002-03-31 08:56:56 +02:00
|
|
|
if ( FT_STREAM_SEEK ( 0 ) ||
|
2002-03-20 11:49:31 +01:00
|
|
|
FT_STREAM_READ_FIELDS ( pcf_toc_header, toc ) )
|
Complete redesign of error codes. Please check ftmoderr.h for more
details.
* include/freetype/internal/cfferrs.h,
include/freetype/internal/tterrors.h,
include/freetype/internal/t1errors.h: Removed. Replaced with files
local to the module. All extra error codes have been moved to
`fterrors.h'.
* src/sfnt/ttpost.h: Move error codes to `fterrors.h'.
* src/autohint/aherrors.h, src/cache/ftcerror.h, src/cff/cfferrs.h,
src/cid/ciderrs.h, src/pcf/pcferror.h, src/psaux/psauxerr.h,
src/psnames/psnamerr.h, src/raster/rasterrs.h, src/sfnt/sferrors.h,
src/smooth/ftsmerrs.h, src/truetype/tterrors.h,
src/type1/t1errors.h, src/winfonts/fnterrs.h: New files defining the
error names for the module it belongs to.
* include/freetype/ftmoderr.h: New file, defining the module error
offsets. Its structure is similar to `fterrors.h'.
* include/freetype/fterrors.h (FT_NOERRORDEF): New macro.
(FT_ERRORDEF): Redefined to use module error offsets.
All internal error codes are now public; unused error codes have
been removed, some are new.
* include/freetype/config/ftheader.h (FT_MODULE_ERRORS_H): New
macro.
* include/freetype/config/ftoption.h
(FT_CONFIG_OPTION_USE_MODULE_ERRORS): New macro.
All other source files have been updated to use the new error codes;
some already existing (internal) error codes local to a module have
been renamed to give them the same name as in the base module.
All make files have been updated to include the local error files.
* src/cid/cidtokens.h: Replaced with...
* src/cid/cidtoken.h: This file for 8+3 consistency.
* src/raster/ftraster.c: Use macros for header file names.
2001-06-06 19:30:41 +02:00
|
|
|
return PCF_Err_Cannot_Open_Resource;
|
2001-06-27 21:46:12 +02:00
|
|
|
|
2005-03-16 00:31:48 +01:00
|
|
|
if ( toc->version != PCF_FILE_VERSION ||
|
|
|
|
toc->count > FT_ARRAY_MAX( face->toc.tables ) )
|
Complete redesign of error codes. Please check ftmoderr.h for more
details.
* include/freetype/internal/cfferrs.h,
include/freetype/internal/tterrors.h,
include/freetype/internal/t1errors.h: Removed. Replaced with files
local to the module. All extra error codes have been moved to
`fterrors.h'.
* src/sfnt/ttpost.h: Move error codes to `fterrors.h'.
* src/autohint/aherrors.h, src/cache/ftcerror.h, src/cff/cfferrs.h,
src/cid/ciderrs.h, src/pcf/pcferror.h, src/psaux/psauxerr.h,
src/psnames/psnamerr.h, src/raster/rasterrs.h, src/sfnt/sferrors.h,
src/smooth/ftsmerrs.h, src/truetype/tterrors.h,
src/type1/t1errors.h, src/winfonts/fnterrs.h: New files defining the
error names for the module it belongs to.
* include/freetype/ftmoderr.h: New file, defining the module error
offsets. Its structure is similar to `fterrors.h'.
* include/freetype/fterrors.h (FT_NOERRORDEF): New macro.
(FT_ERRORDEF): Redefined to use module error offsets.
All internal error codes are now public; unused error codes have
been removed, some are new.
* include/freetype/config/ftheader.h (FT_MODULE_ERRORS_H): New
macro.
* include/freetype/config/ftoption.h
(FT_CONFIG_OPTION_USE_MODULE_ERRORS): New macro.
All other source files have been updated to use the new error codes;
some already existing (internal) error codes local to a module have
been renamed to give them the same name as in the base module.
All make files have been updated to include the local error files.
* src/cid/cidtokens.h: Replaced with...
* src/cid/cidtoken.h: This file for 8+3 consistency.
* src/raster/ftraster.c: Use macros for header file names.
2001-06-06 19:30:41 +02:00
|
|
|
return PCF_Err_Invalid_File_Format;
|
2001-01-01 18:24:31 +01:00
|
|
|
|
2002-03-22 14:52:37 +01:00
|
|
|
if ( FT_NEW_ARRAY( face->toc.tables, toc->count ) )
|
Complete redesign of error codes. Please check ftmoderr.h for more
details.
* include/freetype/internal/cfferrs.h,
include/freetype/internal/tterrors.h,
include/freetype/internal/t1errors.h: Removed. Replaced with files
local to the module. All extra error codes have been moved to
`fterrors.h'.
* src/sfnt/ttpost.h: Move error codes to `fterrors.h'.
* src/autohint/aherrors.h, src/cache/ftcerror.h, src/cff/cfferrs.h,
src/cid/ciderrs.h, src/pcf/pcferror.h, src/psaux/psauxerr.h,
src/psnames/psnamerr.h, src/raster/rasterrs.h, src/sfnt/sferrors.h,
src/smooth/ftsmerrs.h, src/truetype/tterrors.h,
src/type1/t1errors.h, src/winfonts/fnterrs.h: New files defining the
error names for the module it belongs to.
* include/freetype/ftmoderr.h: New file, defining the module error
offsets. Its structure is similar to `fterrors.h'.
* include/freetype/fterrors.h (FT_NOERRORDEF): New macro.
(FT_ERRORDEF): Redefined to use module error offsets.
All internal error codes are now public; unused error codes have
been removed, some are new.
* include/freetype/config/ftheader.h (FT_MODULE_ERRORS_H): New
macro.
* include/freetype/config/ftoption.h
(FT_CONFIG_OPTION_USE_MODULE_ERRORS): New macro.
All other source files have been updated to use the new error codes;
some already existing (internal) error codes local to a module have
been renamed to give them the same name as in the base module.
All make files have been updated to include the local error files.
* src/cid/cidtokens.h: Replaced with...
* src/cid/cidtoken.h: This file for 8+3 consistency.
* src/raster/ftraster.c: Use macros for header file names.
2001-06-06 19:30:41 +02:00
|
|
|
return PCF_Err_Out_Of_Memory;
|
2001-01-01 18:24:31 +01:00
|
|
|
|
|
|
|
tables = face->toc.tables;
|
2001-12-05 02:22:05 +01:00
|
|
|
for ( n = 0; n < toc->count; n++ )
|
2001-01-01 18:24:31 +01:00
|
|
|
{
|
2002-03-20 11:49:31 +01:00
|
|
|
if ( FT_STREAM_READ_FIELDS( pcf_table_header, tables ) )
|
2001-01-01 18:24:31 +01:00
|
|
|
goto Exit;
|
|
|
|
tables++;
|
|
|
|
}
|
|
|
|
|
|
|
|
#if defined( FT_DEBUG_LEVEL_TRACE )
|
|
|
|
|
|
|
|
{
|
2002-02-06 12:22:56 +01:00
|
|
|
FT_UInt i, j;
|
|
|
|
const char* name = "?";
|
2001-01-01 18:24:31 +01:00
|
|
|
|
|
|
|
|
2004-06-22 08:24:09 +02:00
|
|
|
FT_TRACE4(( "pcf_read_TOC:\n" ));
|
|
|
|
|
|
|
|
FT_TRACE4(( " number of tables: %ld\n", face->toc.count ));
|
|
|
|
|
2001-01-01 18:24:31 +01:00
|
|
|
tables = face->toc.tables;
|
|
|
|
for ( i = 0; i < toc->count; i++ )
|
|
|
|
{
|
|
|
|
for( j = 0; j < sizeof ( tableNames ) / sizeof ( tableNames[0] ); j++ )
|
2002-02-06 12:22:56 +01:00
|
|
|
if ( tables[i].type == (FT_UInt)( 1 << j ) )
|
2001-12-05 02:22:05 +01:00
|
|
|
name = tableNames[j];
|
2002-03-31 08:56:56 +02:00
|
|
|
|
2004-06-22 08:24:09 +02:00
|
|
|
FT_TRACE4(( " %d: type=%s, format=0x%X, "
|
|
|
|
"size=%ld (0x%lX), offset=%ld (0x%lX)\n",
|
2001-01-01 18:24:31 +01:00
|
|
|
i, name,
|
|
|
|
tables[i].format,
|
2001-06-27 21:46:12 +02:00
|
|
|
tables[i].size, tables[i].size,
|
2004-06-22 08:24:09 +02:00
|
|
|
tables[i].offset, tables[i].offset ));
|
2001-01-01 18:24:31 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
#endif
|
|
|
|
|
Complete redesign of error codes. Please check ftmoderr.h for more
details.
* include/freetype/internal/cfferrs.h,
include/freetype/internal/tterrors.h,
include/freetype/internal/t1errors.h: Removed. Replaced with files
local to the module. All extra error codes have been moved to
`fterrors.h'.
* src/sfnt/ttpost.h: Move error codes to `fterrors.h'.
* src/autohint/aherrors.h, src/cache/ftcerror.h, src/cff/cfferrs.h,
src/cid/ciderrs.h, src/pcf/pcferror.h, src/psaux/psauxerr.h,
src/psnames/psnamerr.h, src/raster/rasterrs.h, src/sfnt/sferrors.h,
src/smooth/ftsmerrs.h, src/truetype/tterrors.h,
src/type1/t1errors.h, src/winfonts/fnterrs.h: New files defining the
error names for the module it belongs to.
* include/freetype/ftmoderr.h: New file, defining the module error
offsets. Its structure is similar to `fterrors.h'.
* include/freetype/fterrors.h (FT_NOERRORDEF): New macro.
(FT_ERRORDEF): Redefined to use module error offsets.
All internal error codes are now public; unused error codes have
been removed, some are new.
* include/freetype/config/ftheader.h (FT_MODULE_ERRORS_H): New
macro.
* include/freetype/config/ftoption.h
(FT_CONFIG_OPTION_USE_MODULE_ERRORS): New macro.
All other source files have been updated to use the new error codes;
some already existing (internal) error codes local to a module have
been renamed to give them the same name as in the base module.
All make files have been updated to include the local error files.
* src/cid/cidtokens.h: Replaced with...
* src/cid/cidtoken.h: This file for 8+3 consistency.
* src/raster/ftraster.c: Use macros for header file names.
2001-06-06 19:30:41 +02:00
|
|
|
return PCF_Err_Ok;
|
2001-01-01 18:24:31 +01:00
|
|
|
|
|
|
|
Exit:
|
2002-03-22 14:52:37 +01:00
|
|
|
FT_FREE( face->toc.tables );
|
2001-01-01 18:24:31 +01:00
|
|
|
return error;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2001-06-27 21:46:12 +02:00
|
|
|
static
|
2001-01-01 18:24:31 +01:00
|
|
|
const FT_Frame_Field pcf_metric_header[] =
|
|
|
|
{
|
|
|
|
#undef FT_STRUCTURE
|
|
|
|
#define FT_STRUCTURE PCF_MetricRec
|
|
|
|
|
|
|
|
FT_FRAME_START( 12 ),
|
|
|
|
FT_FRAME_SHORT_LE( leftSideBearing ),
|
|
|
|
FT_FRAME_SHORT_LE( rightSideBearing ),
|
|
|
|
FT_FRAME_SHORT_LE( characterWidth ),
|
|
|
|
FT_FRAME_SHORT_LE( ascent ),
|
|
|
|
FT_FRAME_SHORT_LE( descent ),
|
|
|
|
FT_FRAME_SHORT_LE( attributes ),
|
|
|
|
FT_FRAME_END
|
|
|
|
};
|
|
|
|
|
|
|
|
|
2001-06-27 21:46:12 +02:00
|
|
|
static
|
2001-01-01 18:24:31 +01:00
|
|
|
const FT_Frame_Field pcf_metric_msb_header[] =
|
|
|
|
{
|
|
|
|
#undef FT_STRUCTURE
|
|
|
|
#define FT_STRUCTURE PCF_MetricRec
|
|
|
|
|
|
|
|
FT_FRAME_START( 12 ),
|
|
|
|
FT_FRAME_SHORT( leftSideBearing ),
|
|
|
|
FT_FRAME_SHORT( rightSideBearing ),
|
|
|
|
FT_FRAME_SHORT( characterWidth ),
|
|
|
|
FT_FRAME_SHORT( ascent ),
|
|
|
|
FT_FRAME_SHORT( descent ),
|
|
|
|
FT_FRAME_SHORT( attributes ),
|
|
|
|
FT_FRAME_END
|
|
|
|
};
|
|
|
|
|
|
|
|
|
2001-06-27 21:46:12 +02:00
|
|
|
static
|
2001-01-01 18:24:31 +01:00
|
|
|
const FT_Frame_Field pcf_compressed_metric_header[] =
|
|
|
|
{
|
|
|
|
#undef FT_STRUCTURE
|
|
|
|
#define FT_STRUCTURE PCF_Compressed_MetricRec
|
|
|
|
|
|
|
|
FT_FRAME_START( 5 ),
|
|
|
|
FT_FRAME_BYTE( leftSideBearing ),
|
|
|
|
FT_FRAME_BYTE( rightSideBearing ),
|
|
|
|
FT_FRAME_BYTE( characterWidth ),
|
|
|
|
FT_FRAME_BYTE( ascent ),
|
|
|
|
FT_FRAME_BYTE( descent ),
|
|
|
|
FT_FRAME_END
|
|
|
|
};
|
|
|
|
|
|
|
|
|
2001-06-27 21:46:12 +02:00
|
|
|
static FT_Error
|
|
|
|
pcf_get_metric( FT_Stream stream,
|
|
|
|
FT_ULong format,
|
|
|
|
PCF_Metric metric )
|
2001-01-01 18:24:31 +01:00
|
|
|
{
|
2002-02-08 07:23:50 +01:00
|
|
|
FT_Error error = PCF_Err_Ok;
|
2001-01-01 18:24:31 +01:00
|
|
|
|
|
|
|
|
|
|
|
if ( PCF_FORMAT_MATCH( format, PCF_DEFAULT_FORMAT ) )
|
|
|
|
{
|
2002-03-31 08:56:56 +02:00
|
|
|
const FT_Frame_Field* fields;
|
|
|
|
|
|
|
|
|
2002-02-06 12:22:56 +01:00
|
|
|
/* parsing normal metrics */
|
|
|
|
fields = PCF_BYTE_ORDER( format ) == MSBFirst
|
2002-03-31 08:56:56 +02:00
|
|
|
? pcf_metric_msb_header
|
|
|
|
: pcf_metric_header;
|
2002-02-06 12:22:56 +01:00
|
|
|
|
2002-03-31 08:56:56 +02:00
|
|
|
/* the following sets 'error' but doesn't return in case of failure */
|
|
|
|
(void)FT_STREAM_READ_FIELDS( fields, metric );
|
2001-01-01 18:24:31 +01:00
|
|
|
}
|
|
|
|
else
|
2002-02-06 12:22:56 +01:00
|
|
|
{
|
|
|
|
PCF_Compressed_MetricRec compr;
|
|
|
|
|
|
|
|
|
|
|
|
/* parsing compressed metrics */
|
2002-03-20 11:49:31 +01:00
|
|
|
if ( FT_STREAM_READ_FIELDS( pcf_compressed_metric_header, &compr ) )
|
2002-02-06 12:22:56 +01:00
|
|
|
goto Exit;
|
|
|
|
|
|
|
|
metric->leftSideBearing = (FT_Short)( compr.leftSideBearing - 0x80 );
|
|
|
|
metric->rightSideBearing = (FT_Short)( compr.rightSideBearing - 0x80 );
|
|
|
|
metric->characterWidth = (FT_Short)( compr.characterWidth - 0x80 );
|
|
|
|
metric->ascent = (FT_Short)( compr.ascent - 0x80 );
|
|
|
|
metric->descent = (FT_Short)( compr.descent - 0x80 );
|
|
|
|
metric->attributes = 0;
|
|
|
|
}
|
2001-01-01 18:24:31 +01:00
|
|
|
|
2002-02-06 12:22:56 +01:00
|
|
|
Exit:
|
2001-01-01 18:24:31 +01:00
|
|
|
return error;
|
|
|
|
}
|
|
|
|
|
2001-06-27 21:46:12 +02:00
|
|
|
|
|
|
|
static FT_Error
|
2002-02-06 12:22:56 +01:00
|
|
|
pcf_seek_to_table_type( FT_Stream stream,
|
|
|
|
PCF_Table tables,
|
|
|
|
FT_Int ntables,
|
|
|
|
FT_ULong type,
|
|
|
|
FT_ULong *aformat,
|
|
|
|
FT_ULong *asize )
|
2001-01-01 18:24:31 +01:00
|
|
|
{
|
2003-04-23 21:48:24 +02:00
|
|
|
FT_Error error = PCF_Err_Invalid_File_Format;
|
2002-02-19 17:30:15 +01:00
|
|
|
FT_Int i;
|
2001-01-01 18:24:31 +01:00
|
|
|
|
|
|
|
|
|
|
|
for ( i = 0; i < ntables; i++ )
|
|
|
|
if ( tables[i].type == type )
|
|
|
|
{
|
2003-04-23 21:48:24 +02:00
|
|
|
if ( stream->pos > tables[i].offset ) {
|
|
|
|
error = PCF_Err_Invalid_Stream_Skip;
|
|
|
|
goto Fail;
|
|
|
|
}
|
2002-02-06 12:22:56 +01:00
|
|
|
|
2003-04-23 21:48:24 +02:00
|
|
|
if ( FT_STREAM_SKIP( tables[i].offset - stream->pos ) ) {
|
|
|
|
error = PCF_Err_Invalid_Stream_Skip;
|
|
|
|
goto Fail;
|
|
|
|
}
|
2002-02-06 12:22:56 +01:00
|
|
|
|
|
|
|
*asize = tables[i].size; /* unused - to be removed */
|
|
|
|
*aformat = tables[i].format;
|
2002-03-31 08:56:56 +02:00
|
|
|
|
Complete redesign of error codes. Please check ftmoderr.h for more
details.
* include/freetype/internal/cfferrs.h,
include/freetype/internal/tterrors.h,
include/freetype/internal/t1errors.h: Removed. Replaced with files
local to the module. All extra error codes have been moved to
`fterrors.h'.
* src/sfnt/ttpost.h: Move error codes to `fterrors.h'.
* src/autohint/aherrors.h, src/cache/ftcerror.h, src/cff/cfferrs.h,
src/cid/ciderrs.h, src/pcf/pcferror.h, src/psaux/psauxerr.h,
src/psnames/psnamerr.h, src/raster/rasterrs.h, src/sfnt/sferrors.h,
src/smooth/ftsmerrs.h, src/truetype/tterrors.h,
src/type1/t1errors.h, src/winfonts/fnterrs.h: New files defining the
error names for the module it belongs to.
* include/freetype/ftmoderr.h: New file, defining the module error
offsets. Its structure is similar to `fterrors.h'.
* include/freetype/fterrors.h (FT_NOERRORDEF): New macro.
(FT_ERRORDEF): Redefined to use module error offsets.
All internal error codes are now public; unused error codes have
been removed, some are new.
* include/freetype/config/ftheader.h (FT_MODULE_ERRORS_H): New
macro.
* include/freetype/config/ftoption.h
(FT_CONFIG_OPTION_USE_MODULE_ERRORS): New macro.
All other source files have been updated to use the new error codes;
some already existing (internal) error codes local to a module have
been renamed to give them the same name as in the base module.
All make files have been updated to include the local error files.
* src/cid/cidtokens.h: Replaced with...
* src/cid/cidtoken.h: This file for 8+3 consistency.
* src/raster/ftraster.c: Use macros for header file names.
2001-06-06 19:30:41 +02:00
|
|
|
return PCF_Err_Ok;
|
2001-01-01 18:24:31 +01:00
|
|
|
}
|
|
|
|
|
2003-04-23 21:48:24 +02:00
|
|
|
Fail:
|
|
|
|
return error;
|
2001-01-01 18:24:31 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2001-06-27 21:46:12 +02:00
|
|
|
static FT_Bool
|
2002-02-06 12:22:56 +01:00
|
|
|
pcf_has_table_type( PCF_Table tables,
|
|
|
|
FT_Int ntables,
|
|
|
|
FT_ULong type )
|
2001-01-01 18:24:31 +01:00
|
|
|
{
|
2002-02-06 12:22:56 +01:00
|
|
|
FT_Int i;
|
2001-06-27 21:46:12 +02:00
|
|
|
|
2001-01-01 18:24:31 +01:00
|
|
|
|
|
|
|
for ( i = 0; i < ntables; i++ )
|
|
|
|
if ( tables[i].type == type )
|
|
|
|
return TRUE;
|
|
|
|
|
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2001-06-27 21:46:12 +02:00
|
|
|
static
|
2001-01-01 18:24:31 +01:00
|
|
|
const FT_Frame_Field pcf_property_header[] =
|
|
|
|
{
|
|
|
|
#undef FT_STRUCTURE
|
|
|
|
#define FT_STRUCTURE PCF_ParsePropertyRec
|
|
|
|
|
|
|
|
FT_FRAME_START( 9 ),
|
|
|
|
FT_FRAME_LONG_LE( name ),
|
|
|
|
FT_FRAME_BYTE ( isString ),
|
|
|
|
FT_FRAME_LONG_LE( value ),
|
|
|
|
FT_FRAME_END
|
|
|
|
};
|
|
|
|
|
|
|
|
|
2001-06-27 21:46:12 +02:00
|
|
|
static
|
2001-01-01 18:24:31 +01:00
|
|
|
const FT_Frame_Field pcf_property_msb_header[] =
|
|
|
|
{
|
|
|
|
#undef FT_STRUCTURE
|
|
|
|
#define FT_STRUCTURE PCF_ParsePropertyRec
|
|
|
|
|
|
|
|
FT_FRAME_START( 9 ),
|
|
|
|
FT_FRAME_LONG( name ),
|
|
|
|
FT_FRAME_BYTE( isString ),
|
|
|
|
FT_FRAME_LONG( value ),
|
|
|
|
FT_FRAME_END
|
|
|
|
};
|
|
|
|
|
|
|
|
|
2003-01-22 23:45:28 +01:00
|
|
|
FT_LOCAL_DEF( PCF_Property )
|
2002-02-06 12:22:56 +01:00
|
|
|
pcf_find_property( PCF_Face face,
|
|
|
|
const FT_String* prop )
|
2001-01-01 18:24:31 +01:00
|
|
|
{
|
|
|
|
PCF_Property properties = face->properties;
|
|
|
|
FT_Bool found = 0;
|
|
|
|
int i;
|
|
|
|
|
|
|
|
|
|
|
|
for ( i = 0 ; i < face->nprops && !found; i++ )
|
|
|
|
{
|
* README.UNX: updated the Unix-specific quick-compilation guide to
warn about the GNU Make requirement at compile time..
* include/freetype/config/ftstdlib.h,
include/freetype/config/ftconfig.h,
include/freetype/config/ftheader.h,
include/freetype/internal/ftmemory.h,
include/freetype/internal/ftobjs.h,
src/autohint/ahoptim.c,
src/base/ftdbgmem.c, src/base/ftdebug.c,
src/base/ftmac.c, src/base/ftobjs.c,
src/base/ftsystem.c,
src/cache/ftcimage.c, src/cache/ftcsbits.c,
src/cff/cffdriver.c, src/cff/cffload.c, src/cff/cffobjs.c,
src/cid/cidload.c, src/cid/cidparse.c, src/cid/cidriver.c,
src/pcf/pcfdriver.c, src/pcf/pcfread.c,
src/psaux/t1cmap.c, src/psaux/t1decode.c,
src/pshinter/pshalgo1.c, src/pshinter/pshalgo2.c,
src/pshinter/pshrec.c,
src/psnames/psmodule.c,
src/raster/ftraster.c,
src/sfnt/sfdriver.c, src/sfnt/ttload.c, src/sfnt/ttpost.c,
src/smooth/ftgrays.c,
src/type1/t1afm.c, src/type1/t1driver.c, src/type1/t1gload.c,
src/type1/t1load.c, src/type1/t1objs.c, src/type1/t1parse.c:
added the new configuration file "ftstdlib.h" used to define
aliases for all ISO C library functions used by the engine
(e.g. strlen, qsort, setjmp, etc...)
this eases the porting of FreeType 2 to exotic environments like
XFree86 modules/extensions..
also removed many #include <string.h>, #include <stdlib.h>, etc...
from the engine's sources where they're not needed..
2002-04-12 11:31:48 +02:00
|
|
|
if ( !ft_strcmp( properties[i].name, prop ) )
|
2001-01-01 18:24:31 +01:00
|
|
|
found = 1;
|
|
|
|
}
|
2001-06-27 21:46:12 +02:00
|
|
|
|
2001-01-01 18:24:31 +01:00
|
|
|
if ( found )
|
|
|
|
return properties + i - 1;
|
|
|
|
else
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2001-06-27 21:46:12 +02:00
|
|
|
static FT_Error
|
|
|
|
pcf_get_properties( FT_Stream stream,
|
|
|
|
PCF_Face face )
|
2001-01-01 18:24:31 +01:00
|
|
|
{
|
|
|
|
PCF_ParseProperty props = 0;
|
|
|
|
PCF_Property properties = 0;
|
2002-02-06 12:22:56 +01:00
|
|
|
FT_Int nprops, i;
|
2001-01-01 18:24:31 +01:00
|
|
|
FT_ULong format, size;
|
|
|
|
FT_Error error;
|
|
|
|
FT_Memory memory = FT_FACE(face)->memory;
|
|
|
|
FT_ULong string_size;
|
|
|
|
FT_String* strings = 0;
|
2001-06-27 21:46:12 +02:00
|
|
|
|
2001-01-01 18:24:31 +01:00
|
|
|
|
2002-02-06 12:22:56 +01:00
|
|
|
error = pcf_seek_to_table_type( stream,
|
|
|
|
face->toc.tables,
|
|
|
|
face->toc.count,
|
|
|
|
PCF_PROPERTIES,
|
|
|
|
&format,
|
|
|
|
&size );
|
2001-01-01 18:24:31 +01:00
|
|
|
if ( error )
|
|
|
|
goto Bail;
|
|
|
|
|
* include/freetype/internal/ftstream.h,
src/base/ftstream.c, src/cff/cffload.c, src/pcf/pcfread.c,
src/sfnt/ttcmap.c, src/sfnt/ttcmap0.c, src/sfnt/ttload.c,
src/sfnt/ttpost.c, src/sfnt/ttsbit.c,
src/truetype/ttgload.c, src/truetype/ttpload.c,
src/winfonts/winfnt.c:
changed the definitions of stream macros. Examples:
NEXT_Byte => FT_NEXT_BYTE
NEXT_Short => FT_NEXT_SHORT
NEXT_UShortLE => FT_NEXT_USHORT_LE
READ_Short => FT_READ_SHORT
GET_Long => FT_GET_LONG
etc..
also introduced the FT_PEEK_XXXX functions..
2002-03-22 13:55:23 +01:00
|
|
|
if ( FT_READ_ULONG_LE( format ) )
|
2001-01-01 18:24:31 +01:00
|
|
|
goto Bail;
|
|
|
|
|
2004-06-22 08:24:09 +02:00
|
|
|
FT_TRACE4(( "pcf_get_properties:\n" ));
|
|
|
|
|
|
|
|
FT_TRACE4(( " format = %ld\n", format ));
|
2001-01-01 18:24:31 +01:00
|
|
|
|
|
|
|
if ( !PCF_FORMAT_MATCH( format, PCF_DEFAULT_FORMAT ) )
|
|
|
|
goto Bail;
|
|
|
|
|
|
|
|
if ( PCF_BYTE_ORDER( format ) == MSBFirst )
|
* include/freetype/internal/ftstream.h,
src/base/ftstream.c, src/cff/cffload.c, src/pcf/pcfread.c,
src/sfnt/ttcmap.c, src/sfnt/ttcmap0.c, src/sfnt/ttload.c,
src/sfnt/ttpost.c, src/sfnt/ttsbit.c,
src/truetype/ttgload.c, src/truetype/ttpload.c,
src/winfonts/winfnt.c:
changed the definitions of stream macros. Examples:
NEXT_Byte => FT_NEXT_BYTE
NEXT_Short => FT_NEXT_SHORT
NEXT_UShortLE => FT_NEXT_USHORT_LE
READ_Short => FT_READ_SHORT
GET_Long => FT_GET_LONG
etc..
also introduced the FT_PEEK_XXXX functions..
2002-03-22 13:55:23 +01:00
|
|
|
(void)FT_READ_ULONG( nprops );
|
2001-01-01 18:24:31 +01:00
|
|
|
else
|
* include/freetype/internal/ftstream.h,
src/base/ftstream.c, src/cff/cffload.c, src/pcf/pcfread.c,
src/sfnt/ttcmap.c, src/sfnt/ttcmap0.c, src/sfnt/ttload.c,
src/sfnt/ttpost.c, src/sfnt/ttsbit.c,
src/truetype/ttgload.c, src/truetype/ttpload.c,
src/winfonts/winfnt.c:
changed the definitions of stream macros. Examples:
NEXT_Byte => FT_NEXT_BYTE
NEXT_Short => FT_NEXT_SHORT
NEXT_UShortLE => FT_NEXT_USHORT_LE
READ_Short => FT_READ_SHORT
GET_Long => FT_GET_LONG
etc..
also introduced the FT_PEEK_XXXX functions..
2002-03-22 13:55:23 +01:00
|
|
|
(void)FT_READ_ULONG_LE( nprops );
|
2001-01-01 18:24:31 +01:00
|
|
|
if ( error )
|
|
|
|
goto Bail;
|
|
|
|
|
2004-06-22 08:24:09 +02:00
|
|
|
FT_TRACE4(( " nprop = %d\n", nprops ));
|
2001-06-27 21:46:12 +02:00
|
|
|
|
2002-03-22 14:52:37 +01:00
|
|
|
if ( FT_NEW_ARRAY( props, nprops ) )
|
2001-01-01 18:24:31 +01:00
|
|
|
goto Bail;
|
|
|
|
|
|
|
|
for ( i = 0; i < nprops; i++ )
|
|
|
|
{
|
|
|
|
if ( PCF_BYTE_ORDER( format ) == MSBFirst )
|
2001-03-11 14:11:43 +01:00
|
|
|
{
|
2002-03-20 11:49:31 +01:00
|
|
|
if ( FT_STREAM_READ_FIELDS( pcf_property_msb_header, props + i ) )
|
2001-03-11 14:11:43 +01:00
|
|
|
goto Bail;
|
|
|
|
}
|
2001-01-01 18:24:31 +01:00
|
|
|
else
|
2001-03-11 14:11:43 +01:00
|
|
|
{
|
2002-03-20 11:49:31 +01:00
|
|
|
if ( FT_STREAM_READ_FIELDS( pcf_property_header, props + i ) )
|
2001-03-11 14:11:43 +01:00
|
|
|
goto Bail;
|
|
|
|
}
|
2001-01-01 18:24:31 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
/* pad the property array */
|
|
|
|
/* */
|
|
|
|
/* clever here - nprops is the same as the number of odd-units read, */
|
|
|
|
/* as only isStringProp are odd length (Keith Packard) */
|
|
|
|
/* */
|
|
|
|
if ( nprops & 3 )
|
|
|
|
{
|
|
|
|
i = 4 - ( nprops & 3 );
|
2002-02-24 06:26:57 +01:00
|
|
|
FT_Stream_Skip( stream, i );
|
2001-01-01 18:24:31 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
if ( PCF_BYTE_ORDER( format ) == MSBFirst )
|
* include/freetype/internal/ftstream.h,
src/base/ftstream.c, src/cff/cffload.c, src/pcf/pcfread.c,
src/sfnt/ttcmap.c, src/sfnt/ttcmap0.c, src/sfnt/ttload.c,
src/sfnt/ttpost.c, src/sfnt/ttsbit.c,
src/truetype/ttgload.c, src/truetype/ttpload.c,
src/winfonts/winfnt.c:
changed the definitions of stream macros. Examples:
NEXT_Byte => FT_NEXT_BYTE
NEXT_Short => FT_NEXT_SHORT
NEXT_UShortLE => FT_NEXT_USHORT_LE
READ_Short => FT_READ_SHORT
GET_Long => FT_GET_LONG
etc..
also introduced the FT_PEEK_XXXX functions..
2002-03-22 13:55:23 +01:00
|
|
|
(void)FT_READ_ULONG( string_size );
|
2001-01-01 18:24:31 +01:00
|
|
|
else
|
* include/freetype/internal/ftstream.h,
src/base/ftstream.c, src/cff/cffload.c, src/pcf/pcfread.c,
src/sfnt/ttcmap.c, src/sfnt/ttcmap0.c, src/sfnt/ttload.c,
src/sfnt/ttpost.c, src/sfnt/ttsbit.c,
src/truetype/ttgload.c, src/truetype/ttpload.c,
src/winfonts/winfnt.c:
changed the definitions of stream macros. Examples:
NEXT_Byte => FT_NEXT_BYTE
NEXT_Short => FT_NEXT_SHORT
NEXT_UShortLE => FT_NEXT_USHORT_LE
READ_Short => FT_READ_SHORT
GET_Long => FT_GET_LONG
etc..
also introduced the FT_PEEK_XXXX functions..
2002-03-22 13:55:23 +01:00
|
|
|
(void)FT_READ_ULONG_LE( string_size );
|
2001-01-01 18:24:31 +01:00
|
|
|
if ( error )
|
|
|
|
goto Bail;
|
2001-06-27 21:46:12 +02:00
|
|
|
|
2004-06-22 08:24:09 +02:00
|
|
|
FT_TRACE4(( " string_size = %ld\n", string_size ));
|
2001-01-01 18:24:31 +01:00
|
|
|
|
2002-03-22 14:52:37 +01:00
|
|
|
if ( FT_NEW_ARRAY( strings, string_size ) )
|
2001-01-01 18:24:31 +01:00
|
|
|
goto Bail;
|
2001-06-27 21:46:12 +02:00
|
|
|
|
2002-02-24 06:26:57 +01:00
|
|
|
error = FT_Stream_Read( stream, (FT_Byte*)strings, string_size );
|
2001-01-01 18:24:31 +01:00
|
|
|
if ( error )
|
|
|
|
goto Bail;
|
|
|
|
|
2002-03-22 14:52:37 +01:00
|
|
|
if ( FT_NEW_ARRAY( properties, nprops ) )
|
2001-01-01 18:24:31 +01:00
|
|
|
goto Bail;
|
2001-06-27 21:46:12 +02:00
|
|
|
|
2001-01-01 18:24:31 +01:00
|
|
|
for ( i = 0; i < nprops; i++ )
|
|
|
|
{
|
2001-06-27 21:46:12 +02:00
|
|
|
/* XXX: make atom */
|
2002-03-22 14:52:37 +01:00
|
|
|
if ( FT_NEW_ARRAY( properties[i].name,
|
* README.UNX: updated the Unix-specific quick-compilation guide to
warn about the GNU Make requirement at compile time..
* include/freetype/config/ftstdlib.h,
include/freetype/config/ftconfig.h,
include/freetype/config/ftheader.h,
include/freetype/internal/ftmemory.h,
include/freetype/internal/ftobjs.h,
src/autohint/ahoptim.c,
src/base/ftdbgmem.c, src/base/ftdebug.c,
src/base/ftmac.c, src/base/ftobjs.c,
src/base/ftsystem.c,
src/cache/ftcimage.c, src/cache/ftcsbits.c,
src/cff/cffdriver.c, src/cff/cffload.c, src/cff/cffobjs.c,
src/cid/cidload.c, src/cid/cidparse.c, src/cid/cidriver.c,
src/pcf/pcfdriver.c, src/pcf/pcfread.c,
src/psaux/t1cmap.c, src/psaux/t1decode.c,
src/pshinter/pshalgo1.c, src/pshinter/pshalgo2.c,
src/pshinter/pshrec.c,
src/psnames/psmodule.c,
src/raster/ftraster.c,
src/sfnt/sfdriver.c, src/sfnt/ttload.c, src/sfnt/ttpost.c,
src/smooth/ftgrays.c,
src/type1/t1afm.c, src/type1/t1driver.c, src/type1/t1gload.c,
src/type1/t1load.c, src/type1/t1objs.c, src/type1/t1parse.c:
added the new configuration file "ftstdlib.h" used to define
aliases for all ISO C library functions used by the engine
(e.g. strlen, qsort, setjmp, etc...)
this eases the porting of FreeType 2 to exotic environments like
XFree86 modules/extensions..
also removed many #include <string.h>, #include <stdlib.h>, etc...
from the engine's sources where they're not needed..
2002-04-12 11:31:48 +02:00
|
|
|
ft_strlen( strings + props[i].name ) + 1 ) )
|
2001-01-01 18:24:31 +01:00
|
|
|
goto Bail;
|
2004-06-22 08:24:09 +02:00
|
|
|
ft_strcpy( properties[i].name, strings + props[i].name );
|
|
|
|
|
|
|
|
FT_TRACE4(( " %s:", properties[i].name ));
|
2001-06-27 21:46:12 +02:00
|
|
|
|
2001-01-01 18:24:31 +01:00
|
|
|
properties[i].isString = props[i].isString;
|
2001-06-27 21:46:12 +02:00
|
|
|
|
2001-01-01 18:24:31 +01:00
|
|
|
if ( props[i].isString )
|
|
|
|
{
|
2002-03-22 14:52:37 +01:00
|
|
|
if ( FT_NEW_ARRAY( properties[i].value.atom,
|
* README.UNX: updated the Unix-specific quick-compilation guide to
warn about the GNU Make requirement at compile time..
* include/freetype/config/ftstdlib.h,
include/freetype/config/ftconfig.h,
include/freetype/config/ftheader.h,
include/freetype/internal/ftmemory.h,
include/freetype/internal/ftobjs.h,
src/autohint/ahoptim.c,
src/base/ftdbgmem.c, src/base/ftdebug.c,
src/base/ftmac.c, src/base/ftobjs.c,
src/base/ftsystem.c,
src/cache/ftcimage.c, src/cache/ftcsbits.c,
src/cff/cffdriver.c, src/cff/cffload.c, src/cff/cffobjs.c,
src/cid/cidload.c, src/cid/cidparse.c, src/cid/cidriver.c,
src/pcf/pcfdriver.c, src/pcf/pcfread.c,
src/psaux/t1cmap.c, src/psaux/t1decode.c,
src/pshinter/pshalgo1.c, src/pshinter/pshalgo2.c,
src/pshinter/pshrec.c,
src/psnames/psmodule.c,
src/raster/ftraster.c,
src/sfnt/sfdriver.c, src/sfnt/ttload.c, src/sfnt/ttpost.c,
src/smooth/ftgrays.c,
src/type1/t1afm.c, src/type1/t1driver.c, src/type1/t1gload.c,
src/type1/t1load.c, src/type1/t1objs.c, src/type1/t1parse.c:
added the new configuration file "ftstdlib.h" used to define
aliases for all ISO C library functions used by the engine
(e.g. strlen, qsort, setjmp, etc...)
this eases the porting of FreeType 2 to exotic environments like
XFree86 modules/extensions..
also removed many #include <string.h>, #include <stdlib.h>, etc...
from the engine's sources where they're not needed..
2002-04-12 11:31:48 +02:00
|
|
|
ft_strlen( strings + props[i].value ) + 1 ) )
|
2001-01-01 18:24:31 +01:00
|
|
|
goto Bail;
|
* README.UNX: updated the Unix-specific quick-compilation guide to
warn about the GNU Make requirement at compile time..
* include/freetype/config/ftstdlib.h,
include/freetype/config/ftconfig.h,
include/freetype/config/ftheader.h,
include/freetype/internal/ftmemory.h,
include/freetype/internal/ftobjs.h,
src/autohint/ahoptim.c,
src/base/ftdbgmem.c, src/base/ftdebug.c,
src/base/ftmac.c, src/base/ftobjs.c,
src/base/ftsystem.c,
src/cache/ftcimage.c, src/cache/ftcsbits.c,
src/cff/cffdriver.c, src/cff/cffload.c, src/cff/cffobjs.c,
src/cid/cidload.c, src/cid/cidparse.c, src/cid/cidriver.c,
src/pcf/pcfdriver.c, src/pcf/pcfread.c,
src/psaux/t1cmap.c, src/psaux/t1decode.c,
src/pshinter/pshalgo1.c, src/pshinter/pshalgo2.c,
src/pshinter/pshrec.c,
src/psnames/psmodule.c,
src/raster/ftraster.c,
src/sfnt/sfdriver.c, src/sfnt/ttload.c, src/sfnt/ttpost.c,
src/smooth/ftgrays.c,
src/type1/t1afm.c, src/type1/t1driver.c, src/type1/t1gload.c,
src/type1/t1load.c, src/type1/t1objs.c, src/type1/t1parse.c:
added the new configuration file "ftstdlib.h" used to define
aliases for all ISO C library functions used by the engine
(e.g. strlen, qsort, setjmp, etc...)
this eases the porting of FreeType 2 to exotic environments like
XFree86 modules/extensions..
also removed many #include <string.h>, #include <stdlib.h>, etc...
from the engine's sources where they're not needed..
2002-04-12 11:31:48 +02:00
|
|
|
ft_strcpy( properties[i].value.atom, strings + props[i].value );
|
2004-06-22 08:24:09 +02:00
|
|
|
|
|
|
|
FT_TRACE4(( " `%s'\n", properties[i].value.atom ));
|
2001-06-27 21:46:12 +02:00
|
|
|
}
|
2001-01-01 18:24:31 +01:00
|
|
|
else
|
2004-06-22 08:24:09 +02:00
|
|
|
{
|
2001-01-01 18:24:31 +01:00
|
|
|
properties[i].value.integer = props[i].value;
|
2004-06-22 08:24:09 +02:00
|
|
|
|
|
|
|
FT_TRACE4(( " %d\n", properties[i].value.integer ));
|
|
|
|
}
|
2001-01-01 18:24:31 +01:00
|
|
|
}
|
2001-06-27 21:46:12 +02:00
|
|
|
|
2001-01-01 18:24:31 +01:00
|
|
|
face->properties = properties;
|
|
|
|
face->nprops = nprops;
|
2001-06-27 21:46:12 +02:00
|
|
|
|
2002-03-22 14:52:37 +01:00
|
|
|
FT_FREE( props );
|
|
|
|
FT_FREE( strings );
|
2001-06-27 21:46:12 +02:00
|
|
|
|
Complete redesign of error codes. Please check ftmoderr.h for more
details.
* include/freetype/internal/cfferrs.h,
include/freetype/internal/tterrors.h,
include/freetype/internal/t1errors.h: Removed. Replaced with files
local to the module. All extra error codes have been moved to
`fterrors.h'.
* src/sfnt/ttpost.h: Move error codes to `fterrors.h'.
* src/autohint/aherrors.h, src/cache/ftcerror.h, src/cff/cfferrs.h,
src/cid/ciderrs.h, src/pcf/pcferror.h, src/psaux/psauxerr.h,
src/psnames/psnamerr.h, src/raster/rasterrs.h, src/sfnt/sferrors.h,
src/smooth/ftsmerrs.h, src/truetype/tterrors.h,
src/type1/t1errors.h, src/winfonts/fnterrs.h: New files defining the
error names for the module it belongs to.
* include/freetype/ftmoderr.h: New file, defining the module error
offsets. Its structure is similar to `fterrors.h'.
* include/freetype/fterrors.h (FT_NOERRORDEF): New macro.
(FT_ERRORDEF): Redefined to use module error offsets.
All internal error codes are now public; unused error codes have
been removed, some are new.
* include/freetype/config/ftheader.h (FT_MODULE_ERRORS_H): New
macro.
* include/freetype/config/ftoption.h
(FT_CONFIG_OPTION_USE_MODULE_ERRORS): New macro.
All other source files have been updated to use the new error codes;
some already existing (internal) error codes local to a module have
been renamed to give them the same name as in the base module.
All make files have been updated to include the local error files.
* src/cid/cidtokens.h: Replaced with...
* src/cid/cidtoken.h: This file for 8+3 consistency.
* src/raster/ftraster.c: Use macros for header file names.
2001-06-06 19:30:41 +02:00
|
|
|
return PCF_Err_Ok;
|
2001-06-27 21:46:12 +02:00
|
|
|
|
2001-01-01 18:24:31 +01:00
|
|
|
Bail:
|
2002-03-22 14:52:37 +01:00
|
|
|
FT_FREE( props );
|
|
|
|
FT_FREE( strings );
|
2001-01-01 18:24:31 +01:00
|
|
|
|
|
|
|
return error;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2001-06-27 21:46:12 +02:00
|
|
|
static FT_Error
|
|
|
|
pcf_get_metrics( FT_Stream stream,
|
|
|
|
PCF_Face face )
|
|
|
|
{
|
Complete redesign of error codes. Please check ftmoderr.h for more
details.
* include/freetype/internal/cfferrs.h,
include/freetype/internal/tterrors.h,
include/freetype/internal/t1errors.h: Removed. Replaced with files
local to the module. All extra error codes have been moved to
`fterrors.h'.
* src/sfnt/ttpost.h: Move error codes to `fterrors.h'.
* src/autohint/aherrors.h, src/cache/ftcerror.h, src/cff/cfferrs.h,
src/cid/ciderrs.h, src/pcf/pcferror.h, src/psaux/psauxerr.h,
src/psnames/psnamerr.h, src/raster/rasterrs.h, src/sfnt/sferrors.h,
src/smooth/ftsmerrs.h, src/truetype/tterrors.h,
src/type1/t1errors.h, src/winfonts/fnterrs.h: New files defining the
error names for the module it belongs to.
* include/freetype/ftmoderr.h: New file, defining the module error
offsets. Its structure is similar to `fterrors.h'.
* include/freetype/fterrors.h (FT_NOERRORDEF): New macro.
(FT_ERRORDEF): Redefined to use module error offsets.
All internal error codes are now public; unused error codes have
been removed, some are new.
* include/freetype/config/ftheader.h (FT_MODULE_ERRORS_H): New
macro.
* include/freetype/config/ftoption.h
(FT_CONFIG_OPTION_USE_MODULE_ERRORS): New macro.
All other source files have been updated to use the new error codes;
some already existing (internal) error codes local to a module have
been renamed to give them the same name as in the base module.
All make files have been updated to include the local error files.
* src/cid/cidtokens.h: Replaced with...
* src/cid/cidtoken.h: This file for 8+3 consistency.
* src/raster/ftraster.c: Use macros for header file names.
2001-06-06 19:30:41 +02:00
|
|
|
FT_Error error = PCF_Err_Ok;
|
2001-01-01 18:24:31 +01:00
|
|
|
FT_Memory memory = FT_FACE(face)->memory;
|
|
|
|
FT_ULong format = 0;
|
|
|
|
FT_ULong size = 0;
|
|
|
|
PCF_Metric metrics = 0;
|
|
|
|
int i;
|
|
|
|
int nmetrics = -1;
|
|
|
|
|
|
|
|
|
2002-02-06 12:22:56 +01:00
|
|
|
error = pcf_seek_to_table_type( stream,
|
2002-02-08 07:23:50 +01:00
|
|
|
face->toc.tables,
|
|
|
|
face->toc.count,
|
|
|
|
PCF_METRICS,
|
|
|
|
&format,
|
|
|
|
&size );
|
2001-06-27 21:46:12 +02:00
|
|
|
if ( error )
|
2001-01-01 18:24:31 +01:00
|
|
|
return error;
|
|
|
|
|
* include/freetype/internal/ftstream.h,
src/base/ftstream.c, src/cff/cffload.c, src/pcf/pcfread.c,
src/sfnt/ttcmap.c, src/sfnt/ttcmap0.c, src/sfnt/ttload.c,
src/sfnt/ttpost.c, src/sfnt/ttsbit.c,
src/truetype/ttgload.c, src/truetype/ttpload.c,
src/winfonts/winfnt.c:
changed the definitions of stream macros. Examples:
NEXT_Byte => FT_NEXT_BYTE
NEXT_Short => FT_NEXT_SHORT
NEXT_UShortLE => FT_NEXT_USHORT_LE
READ_Short => FT_READ_SHORT
GET_Long => FT_GET_LONG
etc..
also introduced the FT_PEEK_XXXX functions..
2002-03-22 13:55:23 +01:00
|
|
|
error = FT_READ_ULONG_LE( format );
|
2001-01-01 18:24:31 +01:00
|
|
|
|
2002-03-31 08:56:56 +02:00
|
|
|
if ( !PCF_FORMAT_MATCH( format, PCF_DEFAULT_FORMAT ) &&
|
2001-01-01 18:24:31 +01:00
|
|
|
!PCF_FORMAT_MATCH( format, PCF_COMPRESSED_METRICS ) )
|
Complete redesign of error codes. Please check ftmoderr.h for more
details.
* include/freetype/internal/cfferrs.h,
include/freetype/internal/tterrors.h,
include/freetype/internal/t1errors.h: Removed. Replaced with files
local to the module. All extra error codes have been moved to
`fterrors.h'.
* src/sfnt/ttpost.h: Move error codes to `fterrors.h'.
* src/autohint/aherrors.h, src/cache/ftcerror.h, src/cff/cfferrs.h,
src/cid/ciderrs.h, src/pcf/pcferror.h, src/psaux/psauxerr.h,
src/psnames/psnamerr.h, src/raster/rasterrs.h, src/sfnt/sferrors.h,
src/smooth/ftsmerrs.h, src/truetype/tterrors.h,
src/type1/t1errors.h, src/winfonts/fnterrs.h: New files defining the
error names for the module it belongs to.
* include/freetype/ftmoderr.h: New file, defining the module error
offsets. Its structure is similar to `fterrors.h'.
* include/freetype/fterrors.h (FT_NOERRORDEF): New macro.
(FT_ERRORDEF): Redefined to use module error offsets.
All internal error codes are now public; unused error codes have
been removed, some are new.
* include/freetype/config/ftheader.h (FT_MODULE_ERRORS_H): New
macro.
* include/freetype/config/ftoption.h
(FT_CONFIG_OPTION_USE_MODULE_ERRORS): New macro.
All other source files have been updated to use the new error codes;
some already existing (internal) error codes local to a module have
been renamed to give them the same name as in the base module.
All make files have been updated to include the local error files.
* src/cid/cidtokens.h: Replaced with...
* src/cid/cidtoken.h: This file for 8+3 consistency.
* src/raster/ftraster.c: Use macros for header file names.
2001-06-06 19:30:41 +02:00
|
|
|
return PCF_Err_Invalid_File_Format;
|
2001-01-01 18:24:31 +01:00
|
|
|
|
|
|
|
if ( PCF_FORMAT_MATCH( format, PCF_DEFAULT_FORMAT ) )
|
|
|
|
{
|
|
|
|
if ( PCF_BYTE_ORDER( format ) == MSBFirst )
|
* include/freetype/internal/ftstream.h,
src/base/ftstream.c, src/cff/cffload.c, src/pcf/pcfread.c,
src/sfnt/ttcmap.c, src/sfnt/ttcmap0.c, src/sfnt/ttload.c,
src/sfnt/ttpost.c, src/sfnt/ttsbit.c,
src/truetype/ttgload.c, src/truetype/ttpload.c,
src/winfonts/winfnt.c:
changed the definitions of stream macros. Examples:
NEXT_Byte => FT_NEXT_BYTE
NEXT_Short => FT_NEXT_SHORT
NEXT_UShortLE => FT_NEXT_USHORT_LE
READ_Short => FT_READ_SHORT
GET_Long => FT_GET_LONG
etc..
also introduced the FT_PEEK_XXXX functions..
2002-03-22 13:55:23 +01:00
|
|
|
(void)FT_READ_ULONG( nmetrics );
|
2001-01-01 18:24:31 +01:00
|
|
|
else
|
* include/freetype/internal/ftstream.h,
src/base/ftstream.c, src/cff/cffload.c, src/pcf/pcfread.c,
src/sfnt/ttcmap.c, src/sfnt/ttcmap0.c, src/sfnt/ttload.c,
src/sfnt/ttpost.c, src/sfnt/ttsbit.c,
src/truetype/ttgload.c, src/truetype/ttpload.c,
src/winfonts/winfnt.c:
changed the definitions of stream macros. Examples:
NEXT_Byte => FT_NEXT_BYTE
NEXT_Short => FT_NEXT_SHORT
NEXT_UShortLE => FT_NEXT_USHORT_LE
READ_Short => FT_READ_SHORT
GET_Long => FT_GET_LONG
etc..
also introduced the FT_PEEK_XXXX functions..
2002-03-22 13:55:23 +01:00
|
|
|
(void)FT_READ_ULONG_LE( nmetrics );
|
2001-01-01 18:24:31 +01:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
if ( PCF_BYTE_ORDER( format ) == MSBFirst )
|
* include/freetype/internal/ftstream.h,
src/base/ftstream.c, src/cff/cffload.c, src/pcf/pcfread.c,
src/sfnt/ttcmap.c, src/sfnt/ttcmap0.c, src/sfnt/ttload.c,
src/sfnt/ttpost.c, src/sfnt/ttsbit.c,
src/truetype/ttgload.c, src/truetype/ttpload.c,
src/winfonts/winfnt.c:
changed the definitions of stream macros. Examples:
NEXT_Byte => FT_NEXT_BYTE
NEXT_Short => FT_NEXT_SHORT
NEXT_UShortLE => FT_NEXT_USHORT_LE
READ_Short => FT_READ_SHORT
GET_Long => FT_GET_LONG
etc..
also introduced the FT_PEEK_XXXX functions..
2002-03-22 13:55:23 +01:00
|
|
|
(void)FT_READ_USHORT( nmetrics );
|
2001-01-01 18:24:31 +01:00
|
|
|
else
|
* include/freetype/internal/ftstream.h,
src/base/ftstream.c, src/cff/cffload.c, src/pcf/pcfread.c,
src/sfnt/ttcmap.c, src/sfnt/ttcmap0.c, src/sfnt/ttload.c,
src/sfnt/ttpost.c, src/sfnt/ttsbit.c,
src/truetype/ttgload.c, src/truetype/ttpload.c,
src/winfonts/winfnt.c:
changed the definitions of stream macros. Examples:
NEXT_Byte => FT_NEXT_BYTE
NEXT_Short => FT_NEXT_SHORT
NEXT_UShortLE => FT_NEXT_USHORT_LE
READ_Short => FT_READ_SHORT
GET_Long => FT_GET_LONG
etc..
also introduced the FT_PEEK_XXXX functions..
2002-03-22 13:55:23 +01:00
|
|
|
(void)FT_READ_USHORT_LE( nmetrics );
|
2001-01-01 18:24:31 +01:00
|
|
|
}
|
|
|
|
if ( error || nmetrics == -1 )
|
Complete redesign of error codes. Please check ftmoderr.h for more
details.
* include/freetype/internal/cfferrs.h,
include/freetype/internal/tterrors.h,
include/freetype/internal/t1errors.h: Removed. Replaced with files
local to the module. All extra error codes have been moved to
`fterrors.h'.
* src/sfnt/ttpost.h: Move error codes to `fterrors.h'.
* src/autohint/aherrors.h, src/cache/ftcerror.h, src/cff/cfferrs.h,
src/cid/ciderrs.h, src/pcf/pcferror.h, src/psaux/psauxerr.h,
src/psnames/psnamerr.h, src/raster/rasterrs.h, src/sfnt/sferrors.h,
src/smooth/ftsmerrs.h, src/truetype/tterrors.h,
src/type1/t1errors.h, src/winfonts/fnterrs.h: New files defining the
error names for the module it belongs to.
* include/freetype/ftmoderr.h: New file, defining the module error
offsets. Its structure is similar to `fterrors.h'.
* include/freetype/fterrors.h (FT_NOERRORDEF): New macro.
(FT_ERRORDEF): Redefined to use module error offsets.
All internal error codes are now public; unused error codes have
been removed, some are new.
* include/freetype/config/ftheader.h (FT_MODULE_ERRORS_H): New
macro.
* include/freetype/config/ftoption.h
(FT_CONFIG_OPTION_USE_MODULE_ERRORS): New macro.
All other source files have been updated to use the new error codes;
some already existing (internal) error codes local to a module have
been renamed to give them the same name as in the base module.
All make files have been updated to include the local error files.
* src/cid/cidtokens.h: Replaced with...
* src/cid/cidtoken.h: This file for 8+3 consistency.
* src/raster/ftraster.c: Use macros for header file names.
2001-06-06 19:30:41 +02:00
|
|
|
return PCF_Err_Invalid_File_Format;
|
2001-06-27 21:46:12 +02:00
|
|
|
|
2001-01-01 18:24:31 +01:00
|
|
|
face->nmetrics = nmetrics;
|
|
|
|
|
2002-03-22 14:52:37 +01:00
|
|
|
if ( FT_NEW_ARRAY( face->metrics, nmetrics ) )
|
Complete redesign of error codes. Please check ftmoderr.h for more
details.
* include/freetype/internal/cfferrs.h,
include/freetype/internal/tterrors.h,
include/freetype/internal/t1errors.h: Removed. Replaced with files
local to the module. All extra error codes have been moved to
`fterrors.h'.
* src/sfnt/ttpost.h: Move error codes to `fterrors.h'.
* src/autohint/aherrors.h, src/cache/ftcerror.h, src/cff/cfferrs.h,
src/cid/ciderrs.h, src/pcf/pcferror.h, src/psaux/psauxerr.h,
src/psnames/psnamerr.h, src/raster/rasterrs.h, src/sfnt/sferrors.h,
src/smooth/ftsmerrs.h, src/truetype/tterrors.h,
src/type1/t1errors.h, src/winfonts/fnterrs.h: New files defining the
error names for the module it belongs to.
* include/freetype/ftmoderr.h: New file, defining the module error
offsets. Its structure is similar to `fterrors.h'.
* include/freetype/fterrors.h (FT_NOERRORDEF): New macro.
(FT_ERRORDEF): Redefined to use module error offsets.
All internal error codes are now public; unused error codes have
been removed, some are new.
* include/freetype/config/ftheader.h (FT_MODULE_ERRORS_H): New
macro.
* include/freetype/config/ftoption.h
(FT_CONFIG_OPTION_USE_MODULE_ERRORS): New macro.
All other source files have been updated to use the new error codes;
some already existing (internal) error codes local to a module have
been renamed to give them the same name as in the base module.
All make files have been updated to include the local error files.
* src/cid/cidtokens.h: Replaced with...
* src/cid/cidtoken.h: This file for 8+3 consistency.
* src/raster/ftraster.c: Use macros for header file names.
2001-06-06 19:30:41 +02:00
|
|
|
return PCF_Err_Out_Of_Memory;
|
2001-01-01 18:24:31 +01:00
|
|
|
|
2004-06-22 08:24:09 +02:00
|
|
|
FT_TRACE4(( "pcf_get_metrics:\n" ));
|
|
|
|
|
2001-01-01 18:24:31 +01:00
|
|
|
metrics = face->metrics;
|
|
|
|
for ( i = 0; i < nmetrics; i++ )
|
|
|
|
{
|
|
|
|
pcf_get_metric( stream, format, metrics + i );
|
2001-06-27 21:46:12 +02:00
|
|
|
|
2001-01-01 18:24:31 +01:00
|
|
|
metrics[i].bits = 0;
|
|
|
|
|
2004-06-22 08:24:09 +02:00
|
|
|
FT_TRACE4(( " idx %d: width=%d, "
|
2001-01-01 18:24:31 +01:00
|
|
|
"lsb=%d, rsb=%d, ascent=%d, descent=%d, swidth=%d\n",
|
|
|
|
i,
|
|
|
|
( metrics + i )->characterWidth,
|
|
|
|
( metrics + i )->leftSideBearing,
|
|
|
|
( metrics + i )->rightSideBearing,
|
|
|
|
( metrics + i )->ascent,
|
|
|
|
( metrics + i )->descent,
|
|
|
|
( metrics + i )->attributes ));
|
2001-06-27 21:46:12 +02:00
|
|
|
|
2001-01-01 18:24:31 +01:00
|
|
|
if ( error )
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
if ( error )
|
2002-03-22 14:52:37 +01:00
|
|
|
FT_FREE( face->metrics );
|
2001-01-01 18:24:31 +01:00
|
|
|
return error;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2001-06-27 21:46:12 +02:00
|
|
|
static FT_Error
|
|
|
|
pcf_get_bitmaps( FT_Stream stream,
|
|
|
|
PCF_Face face )
|
2001-01-01 18:24:31 +01:00
|
|
|
{
|
Complete redesign of error codes. Please check ftmoderr.h for more
details.
* include/freetype/internal/cfferrs.h,
include/freetype/internal/tterrors.h,
include/freetype/internal/t1errors.h: Removed. Replaced with files
local to the module. All extra error codes have been moved to
`fterrors.h'.
* src/sfnt/ttpost.h: Move error codes to `fterrors.h'.
* src/autohint/aherrors.h, src/cache/ftcerror.h, src/cff/cfferrs.h,
src/cid/ciderrs.h, src/pcf/pcferror.h, src/psaux/psauxerr.h,
src/psnames/psnamerr.h, src/raster/rasterrs.h, src/sfnt/sferrors.h,
src/smooth/ftsmerrs.h, src/truetype/tterrors.h,
src/type1/t1errors.h, src/winfonts/fnterrs.h: New files defining the
error names for the module it belongs to.
* include/freetype/ftmoderr.h: New file, defining the module error
offsets. Its structure is similar to `fterrors.h'.
* include/freetype/fterrors.h (FT_NOERRORDEF): New macro.
(FT_ERRORDEF): Redefined to use module error offsets.
All internal error codes are now public; unused error codes have
been removed, some are new.
* include/freetype/config/ftheader.h (FT_MODULE_ERRORS_H): New
macro.
* include/freetype/config/ftoption.h
(FT_CONFIG_OPTION_USE_MODULE_ERRORS): New macro.
All other source files have been updated to use the new error codes;
some already existing (internal) error codes local to a module have
been renamed to give them the same name as in the base module.
All make files have been updated to include the local error files.
* src/cid/cidtokens.h: Replaced with...
* src/cid/cidtoken.h: This file for 8+3 consistency.
* src/raster/ftraster.c: Use macros for header file names.
2001-06-06 19:30:41 +02:00
|
|
|
FT_Error error = PCF_Err_Ok;
|
2001-01-01 18:24:31 +01:00
|
|
|
FT_Memory memory = FT_FACE(face)->memory;
|
|
|
|
FT_Long* offsets;
|
|
|
|
FT_Long bitmapSizes[GLYPHPADOPTIONS];
|
|
|
|
FT_ULong format, size;
|
2001-06-19 17:45:48 +02:00
|
|
|
int nbitmaps, i, sizebitmaps = 0;
|
2001-01-01 18:24:31 +01:00
|
|
|
char* bitmaps;
|
|
|
|
|
|
|
|
|
2002-02-06 12:22:56 +01:00
|
|
|
error = pcf_seek_to_table_type( stream,
|
|
|
|
face->toc.tables,
|
|
|
|
face->toc.count,
|
|
|
|
PCF_BITMAPS,
|
|
|
|
&format,
|
|
|
|
&size );
|
2001-01-01 18:24:31 +01:00
|
|
|
if ( error )
|
|
|
|
return error;
|
|
|
|
|
2002-03-20 11:49:31 +01:00
|
|
|
error = FT_Stream_EnterFrame( stream, 8 );
|
2001-01-01 18:24:31 +01:00
|
|
|
if ( error )
|
|
|
|
return error;
|
2001-06-27 21:46:12 +02:00
|
|
|
|
* include/freetype/internal/ftstream.h,
src/base/ftstream.c, src/cff/cffload.c, src/pcf/pcfread.c,
src/sfnt/ttcmap.c, src/sfnt/ttcmap0.c, src/sfnt/ttload.c,
src/sfnt/ttpost.c, src/sfnt/ttsbit.c,
src/truetype/ttgload.c, src/truetype/ttpload.c,
src/winfonts/winfnt.c:
changed the definitions of stream macros. Examples:
NEXT_Byte => FT_NEXT_BYTE
NEXT_Short => FT_NEXT_SHORT
NEXT_UShortLE => FT_NEXT_USHORT_LE
READ_Short => FT_READ_SHORT
GET_Long => FT_GET_LONG
etc..
also introduced the FT_PEEK_XXXX functions..
2002-03-22 13:55:23 +01:00
|
|
|
format = FT_GET_ULONG_LE();
|
2001-01-01 18:24:31 +01:00
|
|
|
if ( PCF_BYTE_ORDER( format ) == MSBFirst )
|
* include/freetype/internal/ftstream.h,
src/base/ftstream.c, src/cff/cffload.c, src/pcf/pcfread.c,
src/sfnt/ttcmap.c, src/sfnt/ttcmap0.c, src/sfnt/ttload.c,
src/sfnt/ttpost.c, src/sfnt/ttsbit.c,
src/truetype/ttgload.c, src/truetype/ttpload.c,
src/winfonts/winfnt.c:
changed the definitions of stream macros. Examples:
NEXT_Byte => FT_NEXT_BYTE
NEXT_Short => FT_NEXT_SHORT
NEXT_UShortLE => FT_NEXT_USHORT_LE
READ_Short => FT_READ_SHORT
GET_Long => FT_GET_LONG
etc..
also introduced the FT_PEEK_XXXX functions..
2002-03-22 13:55:23 +01:00
|
|
|
nbitmaps = FT_GET_ULONG();
|
2001-01-01 18:24:31 +01:00
|
|
|
else
|
* include/freetype/internal/ftstream.h,
src/base/ftstream.c, src/cff/cffload.c, src/pcf/pcfread.c,
src/sfnt/ttcmap.c, src/sfnt/ttcmap0.c, src/sfnt/ttload.c,
src/sfnt/ttpost.c, src/sfnt/ttsbit.c,
src/truetype/ttgload.c, src/truetype/ttpload.c,
src/winfonts/winfnt.c:
changed the definitions of stream macros. Examples:
NEXT_Byte => FT_NEXT_BYTE
NEXT_Short => FT_NEXT_SHORT
NEXT_UShortLE => FT_NEXT_USHORT_LE
READ_Short => FT_READ_SHORT
GET_Long => FT_GET_LONG
etc..
also introduced the FT_PEEK_XXXX functions..
2002-03-22 13:55:23 +01:00
|
|
|
nbitmaps = FT_GET_ULONG_LE();
|
2002-02-06 12:22:56 +01:00
|
|
|
|
2002-03-20 11:49:31 +01:00
|
|
|
FT_Stream_ExitFrame( stream );
|
2002-02-06 12:22:56 +01:00
|
|
|
|
|
|
|
if ( !PCF_FORMAT_MATCH( format, PCF_DEFAULT_FORMAT ) )
|
|
|
|
return PCF_Err_Invalid_File_Format;
|
|
|
|
|
2001-01-01 18:24:31 +01:00
|
|
|
if ( nbitmaps != face->nmetrics )
|
Complete redesign of error codes. Please check ftmoderr.h for more
details.
* include/freetype/internal/cfferrs.h,
include/freetype/internal/tterrors.h,
include/freetype/internal/t1errors.h: Removed. Replaced with files
local to the module. All extra error codes have been moved to
`fterrors.h'.
* src/sfnt/ttpost.h: Move error codes to `fterrors.h'.
* src/autohint/aherrors.h, src/cache/ftcerror.h, src/cff/cfferrs.h,
src/cid/ciderrs.h, src/pcf/pcferror.h, src/psaux/psauxerr.h,
src/psnames/psnamerr.h, src/raster/rasterrs.h, src/sfnt/sferrors.h,
src/smooth/ftsmerrs.h, src/truetype/tterrors.h,
src/type1/t1errors.h, src/winfonts/fnterrs.h: New files defining the
error names for the module it belongs to.
* include/freetype/ftmoderr.h: New file, defining the module error
offsets. Its structure is similar to `fterrors.h'.
* include/freetype/fterrors.h (FT_NOERRORDEF): New macro.
(FT_ERRORDEF): Redefined to use module error offsets.
All internal error codes are now public; unused error codes have
been removed, some are new.
* include/freetype/config/ftheader.h (FT_MODULE_ERRORS_H): New
macro.
* include/freetype/config/ftoption.h
(FT_CONFIG_OPTION_USE_MODULE_ERRORS): New macro.
All other source files have been updated to use the new error codes;
some already existing (internal) error codes local to a module have
been renamed to give them the same name as in the base module.
All make files have been updated to include the local error files.
* src/cid/cidtokens.h: Replaced with...
* src/cid/cidtoken.h: This file for 8+3 consistency.
* src/raster/ftraster.c: Use macros for header file names.
2001-06-06 19:30:41 +02:00
|
|
|
return PCF_Err_Invalid_File_Format;
|
2001-01-01 18:24:31 +01:00
|
|
|
|
2002-03-22 14:52:37 +01:00
|
|
|
if ( FT_NEW_ARRAY( offsets, nbitmaps ) )
|
2001-01-01 18:24:31 +01:00
|
|
|
return error;
|
|
|
|
|
2004-06-22 08:24:09 +02:00
|
|
|
FT_TRACE4(( "pcf_get_bitmaps:\n" ));
|
|
|
|
|
2001-01-01 18:24:31 +01:00
|
|
|
for ( i = 0; i < nbitmaps; i++ )
|
2001-06-27 21:46:12 +02:00
|
|
|
{
|
2001-01-01 18:24:31 +01:00
|
|
|
if ( PCF_BYTE_ORDER( format ) == MSBFirst )
|
* include/freetype/internal/ftstream.h,
src/base/ftstream.c, src/cff/cffload.c, src/pcf/pcfread.c,
src/sfnt/ttcmap.c, src/sfnt/ttcmap0.c, src/sfnt/ttload.c,
src/sfnt/ttpost.c, src/sfnt/ttsbit.c,
src/truetype/ttgload.c, src/truetype/ttpload.c,
src/winfonts/winfnt.c:
changed the definitions of stream macros. Examples:
NEXT_Byte => FT_NEXT_BYTE
NEXT_Short => FT_NEXT_SHORT
NEXT_UShortLE => FT_NEXT_USHORT_LE
READ_Short => FT_READ_SHORT
GET_Long => FT_GET_LONG
etc..
also introduced the FT_PEEK_XXXX functions..
2002-03-22 13:55:23 +01:00
|
|
|
(void)FT_READ_LONG( offsets[i] );
|
2001-01-01 18:24:31 +01:00
|
|
|
else
|
* include/freetype/internal/ftstream.h,
src/base/ftstream.c, src/cff/cffload.c, src/pcf/pcfread.c,
src/sfnt/ttcmap.c, src/sfnt/ttcmap0.c, src/sfnt/ttload.c,
src/sfnt/ttpost.c, src/sfnt/ttsbit.c,
src/truetype/ttgload.c, src/truetype/ttpload.c,
src/winfonts/winfnt.c:
changed the definitions of stream macros. Examples:
NEXT_Byte => FT_NEXT_BYTE
NEXT_Short => FT_NEXT_SHORT
NEXT_UShortLE => FT_NEXT_USHORT_LE
READ_Short => FT_READ_SHORT
GET_Long => FT_GET_LONG
etc..
also introduced the FT_PEEK_XXXX functions..
2002-03-22 13:55:23 +01:00
|
|
|
(void)FT_READ_LONG_LE( offsets[i] );
|
2001-01-01 18:24:31 +01:00
|
|
|
|
2004-06-22 08:24:09 +02:00
|
|
|
FT_TRACE4(( " bitmap %d: offset %ld (0x%lX)\n",
|
|
|
|
i, offsets[i], offsets[i] ));
|
2001-01-01 18:24:31 +01:00
|
|
|
}
|
|
|
|
if ( error )
|
|
|
|
goto Bail;
|
|
|
|
|
|
|
|
for ( i = 0; i < GLYPHPADOPTIONS; i++ )
|
2001-06-27 21:46:12 +02:00
|
|
|
{
|
2001-01-01 18:24:31 +01:00
|
|
|
if ( PCF_BYTE_ORDER( format ) == MSBFirst )
|
* include/freetype/internal/ftstream.h,
src/base/ftstream.c, src/cff/cffload.c, src/pcf/pcfread.c,
src/sfnt/ttcmap.c, src/sfnt/ttcmap0.c, src/sfnt/ttload.c,
src/sfnt/ttpost.c, src/sfnt/ttsbit.c,
src/truetype/ttgload.c, src/truetype/ttpload.c,
src/winfonts/winfnt.c:
changed the definitions of stream macros. Examples:
NEXT_Byte => FT_NEXT_BYTE
NEXT_Short => FT_NEXT_SHORT
NEXT_UShortLE => FT_NEXT_USHORT_LE
READ_Short => FT_READ_SHORT
GET_Long => FT_GET_LONG
etc..
also introduced the FT_PEEK_XXXX functions..
2002-03-22 13:55:23 +01:00
|
|
|
(void)FT_READ_LONG( bitmapSizes[i] );
|
2001-01-01 18:24:31 +01:00
|
|
|
else
|
* include/freetype/internal/ftstream.h,
src/base/ftstream.c, src/cff/cffload.c, src/pcf/pcfread.c,
src/sfnt/ttcmap.c, src/sfnt/ttcmap0.c, src/sfnt/ttload.c,
src/sfnt/ttpost.c, src/sfnt/ttsbit.c,
src/truetype/ttgload.c, src/truetype/ttpload.c,
src/winfonts/winfnt.c:
changed the definitions of stream macros. Examples:
NEXT_Byte => FT_NEXT_BYTE
NEXT_Short => FT_NEXT_SHORT
NEXT_UShortLE => FT_NEXT_USHORT_LE
READ_Short => FT_READ_SHORT
GET_Long => FT_GET_LONG
etc..
also introduced the FT_PEEK_XXXX functions..
2002-03-22 13:55:23 +01:00
|
|
|
(void)FT_READ_LONG_LE( bitmapSizes[i] );
|
2001-01-01 18:24:31 +01:00
|
|
|
if ( error )
|
|
|
|
goto Bail;
|
|
|
|
|
|
|
|
sizebitmaps = bitmapSizes[PCF_GLYPH_PAD_INDEX( format )];
|
|
|
|
|
2004-06-22 08:24:09 +02:00
|
|
|
FT_TRACE4(( " padding %d implies a size of %ld\n", i, bitmapSizes[i] ));
|
2001-01-01 18:24:31 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
FT_TRACE4(( " %d bitmaps, padding index %ld\n",
|
|
|
|
nbitmaps,
|
|
|
|
PCF_GLYPH_PAD_INDEX( format ) ));
|
2004-06-22 08:24:09 +02:00
|
|
|
FT_TRACE4(( " bitmap size = %d\n", sizebitmaps ));
|
2001-01-01 18:24:31 +01:00
|
|
|
|
2002-02-19 17:30:15 +01:00
|
|
|
FT_UNUSED( sizebitmaps ); /* only used for debugging */
|
|
|
|
|
2001-01-01 18:24:31 +01:00
|
|
|
for ( i = 0; i < nbitmaps; i++ )
|
2001-06-27 21:46:12 +02:00
|
|
|
face->metrics[i].bits = stream->pos + offsets[i];
|
|
|
|
|
2001-01-01 18:24:31 +01:00
|
|
|
face->bitmapsFormat = format;
|
2001-06-27 21:46:12 +02:00
|
|
|
|
2002-03-22 14:52:37 +01:00
|
|
|
FT_FREE ( offsets );
|
2001-01-01 18:24:31 +01:00
|
|
|
return error;
|
|
|
|
|
|
|
|
Bail:
|
2002-03-22 14:52:37 +01:00
|
|
|
FT_FREE ( offsets );
|
|
|
|
FT_FREE ( bitmaps );
|
2001-01-01 18:24:31 +01:00
|
|
|
return error;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2001-06-27 21:46:12 +02:00
|
|
|
static FT_Error
|
|
|
|
pcf_get_encodings( FT_Stream stream,
|
|
|
|
PCF_Face face )
|
2001-01-01 18:24:31 +01:00
|
|
|
{
|
2004-06-22 08:24:09 +02:00
|
|
|
FT_Error error = PCF_Err_Ok;
|
|
|
|
FT_Memory memory = FT_FACE(face)->memory;
|
2001-01-01 18:24:31 +01:00
|
|
|
FT_ULong format, size;
|
|
|
|
int firstCol, lastCol;
|
|
|
|
int firstRow, lastRow;
|
|
|
|
int nencoding, encodingOffset;
|
|
|
|
int i, j;
|
|
|
|
PCF_Encoding tmpEncoding, encoding = 0;
|
|
|
|
|
|
|
|
|
2002-02-06 12:22:56 +01:00
|
|
|
error = pcf_seek_to_table_type( stream,
|
2002-03-31 08:56:56 +02:00
|
|
|
face->toc.tables,
|
|
|
|
face->toc.count,
|
|
|
|
PCF_BDF_ENCODINGS,
|
|
|
|
&format,
|
|
|
|
&size );
|
2001-01-01 18:24:31 +01:00
|
|
|
if ( error )
|
|
|
|
return error;
|
|
|
|
|
2002-03-20 11:49:31 +01:00
|
|
|
error = FT_Stream_EnterFrame( stream, 14 );
|
2001-01-01 18:24:31 +01:00
|
|
|
if ( error )
|
|
|
|
return error;
|
2002-02-06 12:22:56 +01:00
|
|
|
|
* include/freetype/internal/ftstream.h,
src/base/ftstream.c, src/cff/cffload.c, src/pcf/pcfread.c,
src/sfnt/ttcmap.c, src/sfnt/ttcmap0.c, src/sfnt/ttload.c,
src/sfnt/ttpost.c, src/sfnt/ttsbit.c,
src/truetype/ttgload.c, src/truetype/ttpload.c,
src/winfonts/winfnt.c:
changed the definitions of stream macros. Examples:
NEXT_Byte => FT_NEXT_BYTE
NEXT_Short => FT_NEXT_SHORT
NEXT_UShortLE => FT_NEXT_USHORT_LE
READ_Short => FT_READ_SHORT
GET_Long => FT_GET_LONG
etc..
also introduced the FT_PEEK_XXXX functions..
2002-03-22 13:55:23 +01:00
|
|
|
format = FT_GET_ULONG_LE();
|
2001-06-27 21:46:12 +02:00
|
|
|
|
2001-01-01 18:24:31 +01:00
|
|
|
if ( PCF_BYTE_ORDER( format ) == MSBFirst )
|
|
|
|
{
|
* include/freetype/internal/ftstream.h,
src/base/ftstream.c, src/cff/cffload.c, src/pcf/pcfread.c,
src/sfnt/ttcmap.c, src/sfnt/ttcmap0.c, src/sfnt/ttload.c,
src/sfnt/ttpost.c, src/sfnt/ttsbit.c,
src/truetype/ttgload.c, src/truetype/ttpload.c,
src/winfonts/winfnt.c:
changed the definitions of stream macros. Examples:
NEXT_Byte => FT_NEXT_BYTE
NEXT_Short => FT_NEXT_SHORT
NEXT_UShortLE => FT_NEXT_USHORT_LE
READ_Short => FT_READ_SHORT
GET_Long => FT_GET_LONG
etc..
also introduced the FT_PEEK_XXXX functions..
2002-03-22 13:55:23 +01:00
|
|
|
firstCol = FT_GET_SHORT();
|
|
|
|
lastCol = FT_GET_SHORT();
|
|
|
|
firstRow = FT_GET_SHORT();
|
|
|
|
lastRow = FT_GET_SHORT();
|
|
|
|
face->defaultChar = FT_GET_SHORT();
|
2001-01-01 18:24:31 +01:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
* include/freetype/internal/ftstream.h,
src/base/ftstream.c, src/cff/cffload.c, src/pcf/pcfread.c,
src/sfnt/ttcmap.c, src/sfnt/ttcmap0.c, src/sfnt/ttload.c,
src/sfnt/ttpost.c, src/sfnt/ttsbit.c,
src/truetype/ttgload.c, src/truetype/ttpload.c,
src/winfonts/winfnt.c:
changed the definitions of stream macros. Examples:
NEXT_Byte => FT_NEXT_BYTE
NEXT_Short => FT_NEXT_SHORT
NEXT_UShortLE => FT_NEXT_USHORT_LE
READ_Short => FT_READ_SHORT
GET_Long => FT_GET_LONG
etc..
also introduced the FT_PEEK_XXXX functions..
2002-03-22 13:55:23 +01:00
|
|
|
firstCol = FT_GET_SHORT_LE();
|
|
|
|
lastCol = FT_GET_SHORT_LE();
|
|
|
|
firstRow = FT_GET_SHORT_LE();
|
|
|
|
lastRow = FT_GET_SHORT_LE();
|
|
|
|
face->defaultChar = FT_GET_SHORT_LE();
|
2001-01-01 18:24:31 +01:00
|
|
|
}
|
|
|
|
|
2002-03-20 11:49:31 +01:00
|
|
|
FT_Stream_ExitFrame( stream );
|
2001-01-01 18:24:31 +01:00
|
|
|
|
2002-02-06 12:22:56 +01:00
|
|
|
if ( !PCF_FORMAT_MATCH( format, PCF_DEFAULT_FORMAT ) )
|
|
|
|
return PCF_Err_Invalid_File_Format;
|
|
|
|
|
2004-06-22 08:24:09 +02:00
|
|
|
FT_TRACE4(( "pdf_get_encodings:\n" ));
|
|
|
|
|
|
|
|
FT_TRACE4(( " firstCol %d, lastCol %d, firstRow %d, lastRow %d\n",
|
2001-01-01 18:24:31 +01:00
|
|
|
firstCol, lastCol, firstRow, lastRow ));
|
|
|
|
|
|
|
|
nencoding = ( lastCol - firstCol + 1 ) * ( lastRow - firstRow + 1 );
|
|
|
|
|
2002-03-22 14:52:37 +01:00
|
|
|
if ( FT_NEW_ARRAY( tmpEncoding, nencoding ) )
|
Complete redesign of error codes. Please check ftmoderr.h for more
details.
* include/freetype/internal/cfferrs.h,
include/freetype/internal/tterrors.h,
include/freetype/internal/t1errors.h: Removed. Replaced with files
local to the module. All extra error codes have been moved to
`fterrors.h'.
* src/sfnt/ttpost.h: Move error codes to `fterrors.h'.
* src/autohint/aherrors.h, src/cache/ftcerror.h, src/cff/cfferrs.h,
src/cid/ciderrs.h, src/pcf/pcferror.h, src/psaux/psauxerr.h,
src/psnames/psnamerr.h, src/raster/rasterrs.h, src/sfnt/sferrors.h,
src/smooth/ftsmerrs.h, src/truetype/tterrors.h,
src/type1/t1errors.h, src/winfonts/fnterrs.h: New files defining the
error names for the module it belongs to.
* include/freetype/ftmoderr.h: New file, defining the module error
offsets. Its structure is similar to `fterrors.h'.
* include/freetype/fterrors.h (FT_NOERRORDEF): New macro.
(FT_ERRORDEF): Redefined to use module error offsets.
All internal error codes are now public; unused error codes have
been removed, some are new.
* include/freetype/config/ftheader.h (FT_MODULE_ERRORS_H): New
macro.
* include/freetype/config/ftoption.h
(FT_CONFIG_OPTION_USE_MODULE_ERRORS): New macro.
All other source files have been updated to use the new error codes;
some already existing (internal) error codes local to a module have
been renamed to give them the same name as in the base module.
All make files have been updated to include the local error files.
* src/cid/cidtokens.h: Replaced with...
* src/cid/cidtoken.h: This file for 8+3 consistency.
* src/raster/ftraster.c: Use macros for header file names.
2001-06-06 19:30:41 +02:00
|
|
|
return PCF_Err_Out_Of_Memory;
|
2001-06-27 21:46:12 +02:00
|
|
|
|
2002-03-20 11:49:31 +01:00
|
|
|
error = FT_Stream_EnterFrame( stream, 2 * nencoding );
|
2001-01-01 18:24:31 +01:00
|
|
|
if ( error )
|
|
|
|
goto Bail;
|
2001-06-27 21:46:12 +02:00
|
|
|
|
2001-01-01 18:24:31 +01:00
|
|
|
for ( i = 0, j = 0 ; i < nencoding; i++ )
|
|
|
|
{
|
|
|
|
if ( PCF_BYTE_ORDER( format ) == MSBFirst )
|
* include/freetype/internal/ftstream.h,
src/base/ftstream.c, src/cff/cffload.c, src/pcf/pcfread.c,
src/sfnt/ttcmap.c, src/sfnt/ttcmap0.c, src/sfnt/ttload.c,
src/sfnt/ttpost.c, src/sfnt/ttsbit.c,
src/truetype/ttgload.c, src/truetype/ttpload.c,
src/winfonts/winfnt.c:
changed the definitions of stream macros. Examples:
NEXT_Byte => FT_NEXT_BYTE
NEXT_Short => FT_NEXT_SHORT
NEXT_UShortLE => FT_NEXT_USHORT_LE
READ_Short => FT_READ_SHORT
GET_Long => FT_GET_LONG
etc..
also introduced the FT_PEEK_XXXX functions..
2002-03-22 13:55:23 +01:00
|
|
|
encodingOffset = FT_GET_SHORT();
|
2001-01-01 18:24:31 +01:00
|
|
|
else
|
* include/freetype/internal/ftstream.h,
src/base/ftstream.c, src/cff/cffload.c, src/pcf/pcfread.c,
src/sfnt/ttcmap.c, src/sfnt/ttcmap0.c, src/sfnt/ttload.c,
src/sfnt/ttpost.c, src/sfnt/ttsbit.c,
src/truetype/ttgload.c, src/truetype/ttpload.c,
src/winfonts/winfnt.c:
changed the definitions of stream macros. Examples:
NEXT_Byte => FT_NEXT_BYTE
NEXT_Short => FT_NEXT_SHORT
NEXT_UShortLE => FT_NEXT_USHORT_LE
READ_Short => FT_READ_SHORT
GET_Long => FT_GET_LONG
etc..
also introduced the FT_PEEK_XXXX functions..
2002-03-22 13:55:23 +01:00
|
|
|
encodingOffset = FT_GET_SHORT_LE();
|
2001-06-27 21:46:12 +02:00
|
|
|
|
2001-07-07 18:12:14 +02:00
|
|
|
if ( encodingOffset != -1 )
|
2001-01-01 18:24:31 +01:00
|
|
|
{
|
|
|
|
tmpEncoding[j].enc = ( ( ( i / ( lastCol - firstCol + 1 ) ) +
|
|
|
|
firstRow ) * 256 ) +
|
|
|
|
( ( i % ( lastCol - firstCol + 1 ) ) +
|
|
|
|
firstCol );
|
|
|
|
|
2001-06-19 10:28:24 +02:00
|
|
|
tmpEncoding[j].glyph = (FT_Short)encodingOffset;
|
2004-06-22 08:24:09 +02:00
|
|
|
|
|
|
|
FT_TRACE4(( " code %d (0x%04X): idx %d\n",
|
|
|
|
tmpEncoding[j].enc, tmpEncoding[j].enc,
|
|
|
|
tmpEncoding[j].glyph ));
|
|
|
|
|
2001-01-01 18:24:31 +01:00
|
|
|
j++;
|
|
|
|
}
|
|
|
|
}
|
2002-03-20 11:49:31 +01:00
|
|
|
FT_Stream_ExitFrame( stream );
|
2001-01-01 18:24:31 +01:00
|
|
|
|
2002-03-22 14:52:37 +01:00
|
|
|
if ( FT_NEW_ARRAY( encoding, j ) )
|
2001-01-01 18:24:31 +01:00
|
|
|
goto Bail;
|
|
|
|
|
|
|
|
for ( i = 0; i < j; i++ )
|
|
|
|
{
|
|
|
|
encoding[i].enc = tmpEncoding[i].enc;
|
|
|
|
encoding[i].glyph = tmpEncoding[i].glyph;
|
|
|
|
}
|
|
|
|
|
|
|
|
face->nencodings = j;
|
|
|
|
face->encodings = encoding;
|
2002-03-22 14:52:37 +01:00
|
|
|
FT_FREE( tmpEncoding );
|
2001-01-01 18:24:31 +01:00
|
|
|
|
|
|
|
return error;
|
|
|
|
|
|
|
|
Bail:
|
2002-03-22 14:52:37 +01:00
|
|
|
FT_FREE( encoding );
|
|
|
|
FT_FREE( tmpEncoding );
|
2001-01-01 18:24:31 +01:00
|
|
|
return error;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2001-06-27 21:46:12 +02:00
|
|
|
static
|
2001-01-01 18:24:31 +01:00
|
|
|
const FT_Frame_Field pcf_accel_header[] =
|
|
|
|
{
|
|
|
|
#undef FT_STRUCTURE
|
|
|
|
#define FT_STRUCTURE PCF_AccelRec
|
|
|
|
|
|
|
|
FT_FRAME_START( 20 ),
|
|
|
|
FT_FRAME_BYTE ( noOverlap ),
|
|
|
|
FT_FRAME_BYTE ( constantMetrics ),
|
|
|
|
FT_FRAME_BYTE ( terminalFont ),
|
|
|
|
FT_FRAME_BYTE ( constantWidth ),
|
|
|
|
FT_FRAME_BYTE ( inkInside ),
|
|
|
|
FT_FRAME_BYTE ( inkMetrics ),
|
|
|
|
FT_FRAME_BYTE ( drawDirection ),
|
|
|
|
FT_FRAME_SKIP_BYTES( 1 ),
|
|
|
|
FT_FRAME_LONG_LE ( fontAscent ),
|
|
|
|
FT_FRAME_LONG_LE ( fontDescent ),
|
|
|
|
FT_FRAME_LONG_LE ( maxOverlap ),
|
|
|
|
FT_FRAME_END
|
|
|
|
};
|
|
|
|
|
|
|
|
|
2001-06-27 21:46:12 +02:00
|
|
|
static
|
2001-01-01 18:24:31 +01:00
|
|
|
const FT_Frame_Field pcf_accel_msb_header[] =
|
|
|
|
{
|
|
|
|
#undef FT_STRUCTURE
|
|
|
|
#define FT_STRUCTURE PCF_AccelRec
|
|
|
|
|
|
|
|
FT_FRAME_START( 20 ),
|
|
|
|
FT_FRAME_BYTE ( noOverlap ),
|
|
|
|
FT_FRAME_BYTE ( constantMetrics ),
|
|
|
|
FT_FRAME_BYTE ( terminalFont ),
|
|
|
|
FT_FRAME_BYTE ( constantWidth ),
|
|
|
|
FT_FRAME_BYTE ( inkInside ),
|
|
|
|
FT_FRAME_BYTE ( inkMetrics ),
|
|
|
|
FT_FRAME_BYTE ( drawDirection ),
|
|
|
|
FT_FRAME_SKIP_BYTES( 1 ),
|
|
|
|
FT_FRAME_LONG ( fontAscent ),
|
|
|
|
FT_FRAME_LONG ( fontDescent ),
|
|
|
|
FT_FRAME_LONG ( maxOverlap ),
|
|
|
|
FT_FRAME_END
|
|
|
|
};
|
|
|
|
|
|
|
|
|
2001-06-27 21:46:12 +02:00
|
|
|
static FT_Error
|
|
|
|
pcf_get_accel( FT_Stream stream,
|
|
|
|
PCF_Face face,
|
|
|
|
FT_ULong type )
|
2001-01-01 18:24:31 +01:00
|
|
|
{
|
|
|
|
FT_ULong format, size;
|
Complete redesign of error codes. Please check ftmoderr.h for more
details.
* include/freetype/internal/cfferrs.h,
include/freetype/internal/tterrors.h,
include/freetype/internal/t1errors.h: Removed. Replaced with files
local to the module. All extra error codes have been moved to
`fterrors.h'.
* src/sfnt/ttpost.h: Move error codes to `fterrors.h'.
* src/autohint/aherrors.h, src/cache/ftcerror.h, src/cff/cfferrs.h,
src/cid/ciderrs.h, src/pcf/pcferror.h, src/psaux/psauxerr.h,
src/psnames/psnamerr.h, src/raster/rasterrs.h, src/sfnt/sferrors.h,
src/smooth/ftsmerrs.h, src/truetype/tterrors.h,
src/type1/t1errors.h, src/winfonts/fnterrs.h: New files defining the
error names for the module it belongs to.
* include/freetype/ftmoderr.h: New file, defining the module error
offsets. Its structure is similar to `fterrors.h'.
* include/freetype/fterrors.h (FT_NOERRORDEF): New macro.
(FT_ERRORDEF): Redefined to use module error offsets.
All internal error codes are now public; unused error codes have
been removed, some are new.
* include/freetype/config/ftheader.h (FT_MODULE_ERRORS_H): New
macro.
* include/freetype/config/ftoption.h
(FT_CONFIG_OPTION_USE_MODULE_ERRORS): New macro.
All other source files have been updated to use the new error codes;
some already existing (internal) error codes local to a module have
been renamed to give them the same name as in the base module.
All make files have been updated to include the local error files.
* src/cid/cidtokens.h: Replaced with...
* src/cid/cidtoken.h: This file for 8+3 consistency.
* src/raster/ftraster.c: Use macros for header file names.
2001-06-06 19:30:41 +02:00
|
|
|
FT_Error error = PCF_Err_Ok;
|
2001-01-01 18:24:31 +01:00
|
|
|
PCF_Accel accel = &face->accel;
|
|
|
|
|
|
|
|
|
2002-02-06 12:22:56 +01:00
|
|
|
error = pcf_seek_to_table_type( stream,
|
|
|
|
face->toc.tables,
|
|
|
|
face->toc.count,
|
|
|
|
type,
|
|
|
|
&format,
|
|
|
|
&size );
|
2001-06-27 21:46:12 +02:00
|
|
|
if ( error )
|
2001-01-01 18:24:31 +01:00
|
|
|
goto Bail;
|
|
|
|
|
* include/freetype/internal/ftstream.h,
src/base/ftstream.c, src/cff/cffload.c, src/pcf/pcfread.c,
src/sfnt/ttcmap.c, src/sfnt/ttcmap0.c, src/sfnt/ttload.c,
src/sfnt/ttpost.c, src/sfnt/ttsbit.c,
src/truetype/ttgload.c, src/truetype/ttpload.c,
src/winfonts/winfnt.c:
changed the definitions of stream macros. Examples:
NEXT_Byte => FT_NEXT_BYTE
NEXT_Short => FT_NEXT_SHORT
NEXT_UShortLE => FT_NEXT_USHORT_LE
READ_Short => FT_READ_SHORT
GET_Long => FT_GET_LONG
etc..
also introduced the FT_PEEK_XXXX functions..
2002-03-22 13:55:23 +01:00
|
|
|
error = FT_READ_ULONG_LE( format );
|
2002-02-06 12:22:56 +01:00
|
|
|
|
2002-03-31 08:56:56 +02:00
|
|
|
if ( !PCF_FORMAT_MATCH( format, PCF_DEFAULT_FORMAT ) &&
|
2001-01-01 18:24:31 +01:00
|
|
|
!PCF_FORMAT_MATCH( format, PCF_ACCEL_W_INKBOUNDS ) )
|
|
|
|
goto Bail;
|
2001-06-27 21:46:12 +02:00
|
|
|
|
2001-03-11 14:11:43 +01:00
|
|
|
if ( PCF_BYTE_ORDER( format ) == MSBFirst )
|
|
|
|
{
|
2002-03-20 11:49:31 +01:00
|
|
|
if ( FT_STREAM_READ_FIELDS( pcf_accel_msb_header, accel ) )
|
2001-03-11 14:11:43 +01:00
|
|
|
goto Bail;
|
|
|
|
}
|
2001-01-01 18:24:31 +01:00
|
|
|
else
|
2001-03-11 14:11:43 +01:00
|
|
|
{
|
2002-03-20 11:49:31 +01:00
|
|
|
if ( FT_STREAM_READ_FIELDS( pcf_accel_header, accel ) )
|
2001-03-11 14:11:43 +01:00
|
|
|
goto Bail;
|
|
|
|
}
|
2001-01-01 18:24:31 +01:00
|
|
|
|
2002-04-16 15:39:17 +02:00
|
|
|
error = pcf_get_metric( stream,
|
|
|
|
format & ( ~PCF_FORMAT_MASK ),
|
|
|
|
&(accel->minbounds) );
|
2001-06-27 21:46:12 +02:00
|
|
|
if ( error )
|
2001-01-01 18:24:31 +01:00
|
|
|
goto Bail;
|
2002-02-06 12:22:56 +01:00
|
|
|
|
2002-04-16 15:39:17 +02:00
|
|
|
error = pcf_get_metric( stream,
|
|
|
|
format & ( ~PCF_FORMAT_MASK ),
|
|
|
|
&(accel->maxbounds) );
|
2001-01-01 18:24:31 +01:00
|
|
|
if ( error )
|
|
|
|
goto Bail;
|
2001-06-27 21:46:12 +02:00
|
|
|
|
2001-01-01 18:24:31 +01:00
|
|
|
if ( PCF_FORMAT_MATCH( format, PCF_ACCEL_W_INKBOUNDS ) )
|
|
|
|
{
|
2002-04-16 15:39:17 +02:00
|
|
|
error = pcf_get_metric( stream,
|
|
|
|
format & ( ~PCF_FORMAT_MASK ),
|
|
|
|
&(accel->ink_minbounds) );
|
2001-01-01 18:24:31 +01:00
|
|
|
if ( error )
|
|
|
|
goto Bail;
|
2002-02-06 12:22:56 +01:00
|
|
|
|
2002-04-16 15:39:17 +02:00
|
|
|
error = pcf_get_metric( stream,
|
|
|
|
format & ( ~PCF_FORMAT_MASK ),
|
|
|
|
&(accel->ink_maxbounds) );
|
2001-01-01 18:24:31 +01:00
|
|
|
if ( error )
|
|
|
|
goto Bail;
|
2001-06-27 21:46:12 +02:00
|
|
|
}
|
2001-01-01 18:24:31 +01:00
|
|
|
else
|
|
|
|
{
|
|
|
|
accel->ink_minbounds = accel->minbounds; /* I'm not sure about this */
|
|
|
|
accel->ink_maxbounds = accel->maxbounds;
|
|
|
|
}
|
|
|
|
return error;
|
2001-06-27 21:46:12 +02:00
|
|
|
|
2001-01-01 18:24:31 +01:00
|
|
|
Bail:
|
|
|
|
return error;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2003-11-13 11:19:27 +01:00
|
|
|
static FT_Error
|
|
|
|
pcf_interpret_style( PCF_Face pcf )
|
|
|
|
{
|
|
|
|
FT_Error error = PCF_Err_Ok;
|
|
|
|
FT_Face face = FT_FACE( pcf );
|
|
|
|
FT_Memory memory = face->memory;
|
|
|
|
|
|
|
|
PCF_Property prop;
|
|
|
|
|
|
|
|
char *istr = NULL, *bstr = NULL;
|
|
|
|
char *sstr = NULL, *astr = NULL;
|
|
|
|
|
2003-12-19 21:25:14 +01:00
|
|
|
int parts = 0, len = 0;
|
2003-11-13 11:19:27 +01:00
|
|
|
|
|
|
|
|
|
|
|
face->style_flags = 0;
|
|
|
|
|
|
|
|
prop = pcf_find_property( pcf, "SLANT" );
|
|
|
|
if ( prop && prop->isString &&
|
|
|
|
( *(prop->value.atom) == 'O' || *(prop->value.atom) == 'o' ||
|
|
|
|
*(prop->value.atom) == 'I' || *(prop->value.atom) == 'i' ) )
|
|
|
|
{
|
|
|
|
face->style_flags |= FT_STYLE_FLAG_ITALIC;
|
|
|
|
istr = ( *(prop->value.atom) == 'O' || *(prop->value.atom) == 'o' )
|
|
|
|
? (char *)"Oblique"
|
|
|
|
: (char *)"Italic";
|
|
|
|
len += ft_strlen( istr );
|
|
|
|
parts++;
|
|
|
|
}
|
|
|
|
|
|
|
|
prop = pcf_find_property( pcf, "WEIGHT_NAME" );
|
|
|
|
if ( prop && prop->isString &&
|
|
|
|
( *(prop->value.atom) == 'B' || *(prop->value.atom) == 'b' ) )
|
|
|
|
{
|
|
|
|
face->style_flags |= FT_STYLE_FLAG_BOLD;
|
|
|
|
bstr = (char *)"Bold";
|
|
|
|
len += ft_strlen( bstr );
|
|
|
|
parts++;
|
|
|
|
}
|
|
|
|
|
|
|
|
prop = pcf_find_property( pcf, "SETWIDTH_NAME" );
|
|
|
|
if ( prop && prop->isString &&
|
|
|
|
*(prop->value.atom) &&
|
|
|
|
!( *(prop->value.atom) == 'N' || *(prop->value.atom) == 'n' ) )
|
|
|
|
{
|
|
|
|
sstr = (char *)(prop->value.atom);
|
|
|
|
len += ft_strlen( sstr );
|
|
|
|
parts++;
|
|
|
|
}
|
|
|
|
|
|
|
|
prop = pcf_find_property( pcf, "ADD_STYLE_NAME" );
|
|
|
|
if ( prop && prop->isString &&
|
|
|
|
*(prop->value.atom) &&
|
|
|
|
!( *(prop->value.atom) == 'N' || *(prop->value.atom) == 'n' ) )
|
|
|
|
{
|
|
|
|
astr = (char *)(prop->value.atom);
|
|
|
|
len += ft_strlen( astr );
|
|
|
|
parts++;
|
|
|
|
}
|
|
|
|
|
|
|
|
if ( !parts || !len )
|
2004-07-28 02:09:02 +02:00
|
|
|
{
|
|
|
|
if ( FT_ALLOC( face->style_name, 8 ) )
|
|
|
|
return error;
|
|
|
|
ft_strcpy( face->style_name, "Regular" );
|
|
|
|
face->style_name[7] = '\0';
|
|
|
|
}
|
2003-11-13 11:19:27 +01:00
|
|
|
else
|
|
|
|
{
|
2003-12-19 21:25:14 +01:00
|
|
|
char *style, *s;
|
2003-11-15 18:44:13 +01:00
|
|
|
unsigned int i;
|
2003-11-13 11:19:27 +01:00
|
|
|
|
|
|
|
|
|
|
|
if ( FT_ALLOC( style, len + parts ) )
|
|
|
|
return error;
|
|
|
|
|
|
|
|
s = style;
|
|
|
|
|
|
|
|
if ( astr )
|
|
|
|
{
|
|
|
|
ft_strcpy( s, astr );
|
2003-11-15 18:44:13 +01:00
|
|
|
for ( i = 0; i < ft_strlen( astr ); i++, s++ )
|
|
|
|
if ( *s == ' ' )
|
|
|
|
*s = '-'; /* replace spaces with dashes */
|
2003-11-13 11:19:27 +01:00
|
|
|
*(s++) = ' ';
|
|
|
|
}
|
|
|
|
if ( bstr )
|
|
|
|
{
|
|
|
|
ft_strcpy( s, bstr );
|
|
|
|
s += ft_strlen( bstr );
|
|
|
|
*(s++) = ' ';
|
|
|
|
}
|
|
|
|
if ( istr )
|
|
|
|
{
|
|
|
|
ft_strcpy( s, istr );
|
|
|
|
s += ft_strlen( istr );
|
|
|
|
*(s++) = ' ';
|
|
|
|
}
|
|
|
|
if ( sstr )
|
|
|
|
{
|
|
|
|
ft_strcpy( s, sstr );
|
2003-11-15 18:44:13 +01:00
|
|
|
for ( i = 0; i < ft_strlen( sstr ); i++, s++ )
|
|
|
|
if ( *s == ' ' )
|
|
|
|
*s = '-'; /* replace spaces with dashes */
|
2003-11-13 11:19:27 +01:00
|
|
|
*(s++) = ' ';
|
|
|
|
}
|
|
|
|
*(--s) = '\0'; /* overwrite last ' ', terminate the string */
|
|
|
|
|
|
|
|
face->style_name = style; /* allocated string */
|
|
|
|
}
|
|
|
|
|
|
|
|
return error;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2002-03-01 03:26:22 +01:00
|
|
|
FT_LOCAL_DEF( FT_Error )
|
2001-06-27 21:46:12 +02:00
|
|
|
pcf_load_font( FT_Stream stream,
|
|
|
|
PCF_Face face )
|
2001-01-01 18:24:31 +01:00
|
|
|
{
|
Complete redesign of error codes. Please check ftmoderr.h for more
details.
* include/freetype/internal/cfferrs.h,
include/freetype/internal/tterrors.h,
include/freetype/internal/t1errors.h: Removed. Replaced with files
local to the module. All extra error codes have been moved to
`fterrors.h'.
* src/sfnt/ttpost.h: Move error codes to `fterrors.h'.
* src/autohint/aherrors.h, src/cache/ftcerror.h, src/cff/cfferrs.h,
src/cid/ciderrs.h, src/pcf/pcferror.h, src/psaux/psauxerr.h,
src/psnames/psnamerr.h, src/raster/rasterrs.h, src/sfnt/sferrors.h,
src/smooth/ftsmerrs.h, src/truetype/tterrors.h,
src/type1/t1errors.h, src/winfonts/fnterrs.h: New files defining the
error names for the module it belongs to.
* include/freetype/ftmoderr.h: New file, defining the module error
offsets. Its structure is similar to `fterrors.h'.
* include/freetype/fterrors.h (FT_NOERRORDEF): New macro.
(FT_ERRORDEF): Redefined to use module error offsets.
All internal error codes are now public; unused error codes have
been removed, some are new.
* include/freetype/config/ftheader.h (FT_MODULE_ERRORS_H): New
macro.
* include/freetype/config/ftoption.h
(FT_CONFIG_OPTION_USE_MODULE_ERRORS): New macro.
All other source files have been updated to use the new error codes;
some already existing (internal) error codes local to a module have
been renamed to give them the same name as in the base module.
All make files have been updated to include the local error files.
* src/cid/cidtokens.h: Replaced with...
* src/cid/cidtoken.h: This file for 8+3 consistency.
* src/raster/ftraster.c: Use macros for header file names.
2001-06-06 19:30:41 +02:00
|
|
|
FT_Error error = PCF_Err_Ok;
|
2001-01-01 18:24:31 +01:00
|
|
|
FT_Memory memory = FT_FACE(face)->memory;
|
|
|
|
FT_Bool hasBDFAccelerators;
|
|
|
|
|
|
|
|
|
|
|
|
error = pcf_read_TOC( stream, face );
|
|
|
|
if ( error )
|
2002-03-21 16:02:54 +01:00
|
|
|
goto Exit;
|
2001-01-01 18:24:31 +01:00
|
|
|
|
|
|
|
error = pcf_get_properties( stream, face );
|
|
|
|
if ( error )
|
2002-03-21 16:02:54 +01:00
|
|
|
goto Exit;
|
2001-06-27 21:46:12 +02:00
|
|
|
|
2001-01-01 18:24:31 +01:00
|
|
|
/* Use the old accelerators if no BDF accelerators are in the file. */
|
2002-02-06 12:22:56 +01:00
|
|
|
hasBDFAccelerators = pcf_has_table_type( face->toc.tables,
|
2002-02-08 07:23:50 +01:00
|
|
|
face->toc.count,
|
|
|
|
PCF_BDF_ACCELERATORS );
|
2001-01-01 18:24:31 +01:00
|
|
|
if ( !hasBDFAccelerators )
|
|
|
|
{
|
|
|
|
error = pcf_get_accel( stream, face, PCF_ACCELERATORS );
|
2001-06-27 21:46:12 +02:00
|
|
|
if ( error )
|
2002-03-21 16:02:54 +01:00
|
|
|
goto Exit;
|
2001-01-01 18:24:31 +01:00
|
|
|
}
|
2001-06-27 21:46:12 +02:00
|
|
|
|
2001-01-01 18:24:31 +01:00
|
|
|
/* metrics */
|
|
|
|
error = pcf_get_metrics( stream, face );
|
|
|
|
if ( error )
|
2002-03-21 16:02:54 +01:00
|
|
|
goto Exit;
|
2001-01-01 18:24:31 +01:00
|
|
|
|
|
|
|
/* bitmaps */
|
|
|
|
error = pcf_get_bitmaps( stream, face );
|
|
|
|
if ( error )
|
2002-03-21 16:02:54 +01:00
|
|
|
goto Exit;
|
2001-01-01 18:24:31 +01:00
|
|
|
|
|
|
|
/* encodings */
|
|
|
|
error = pcf_get_encodings( stream, face );
|
|
|
|
if ( error )
|
2002-03-21 16:02:54 +01:00
|
|
|
goto Exit;
|
2001-06-27 21:46:12 +02:00
|
|
|
|
2001-01-01 18:24:31 +01:00
|
|
|
/* BDF style accelerators (i.e. bounds based on encoded glyphs) */
|
|
|
|
if ( hasBDFAccelerators )
|
|
|
|
{
|
|
|
|
error = pcf_get_accel( stream, face, PCF_BDF_ACCELERATORS );
|
|
|
|
if ( error )
|
2002-03-21 16:02:54 +01:00
|
|
|
goto Exit;
|
2001-01-01 18:24:31 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
/* XXX: TO DO: inkmetrics and glyph_names are missing */
|
|
|
|
|
|
|
|
/* now construct the face object */
|
|
|
|
{
|
|
|
|
FT_Face root = FT_FACE( face );
|
|
|
|
PCF_Property prop;
|
|
|
|
|
|
|
|
|
2003-07-01 09:28:55 +02:00
|
|
|
root->num_faces = 1;
|
2001-01-01 18:24:31 +01:00
|
|
|
root->face_index = 0;
|
|
|
|
root->face_flags = FT_FACE_FLAG_FIXED_SIZES |
|
|
|
|
FT_FACE_FLAG_HORIZONTAL |
|
|
|
|
FT_FACE_FLAG_FAST_GLYPHS;
|
2001-06-27 21:46:12 +02:00
|
|
|
|
2001-01-01 18:24:31 +01:00
|
|
|
if ( face->accel.constantWidth )
|
|
|
|
root->face_flags |= FT_FACE_FLAG_FIXED_WIDTH;
|
|
|
|
|
2003-12-19 21:25:14 +01:00
|
|
|
if ( ( error = pcf_interpret_style( face ) ) != 0 )
|
2003-11-13 11:19:27 +01:00
|
|
|
goto Exit;
|
2001-06-27 21:46:12 +02:00
|
|
|
|
2002-02-06 12:22:56 +01:00
|
|
|
prop = pcf_find_property( face, "FAMILY_NAME" );
|
2003-11-13 11:19:27 +01:00
|
|
|
if ( prop && prop->isString )
|
2001-01-01 18:24:31 +01:00
|
|
|
{
|
2003-11-13 11:19:27 +01:00
|
|
|
int l = ft_strlen( prop->value.atom ) + 1;
|
2001-01-01 18:24:31 +01:00
|
|
|
|
|
|
|
|
2003-11-13 11:19:27 +01:00
|
|
|
if ( FT_NEW_ARRAY( root->family_name, l ) )
|
|
|
|
goto Exit;
|
|
|
|
ft_strcpy( root->family_name, prop->value.atom );
|
2001-01-01 18:24:31 +01:00
|
|
|
}
|
|
|
|
else
|
2003-11-13 11:19:27 +01:00
|
|
|
root->family_name = NULL;
|
2001-01-01 18:24:31 +01:00
|
|
|
|
2003-04-25 07:35:04 +02:00
|
|
|
/* Note: We shift all glyph indices by +1 since we must
|
|
|
|
* respect the convention that glyph 0 always corresponds
|
|
|
|
* to the "missing glyph".
|
|
|
|
*
|
|
|
|
* This implies bumping the number of "available" glyphs by 1.
|
|
|
|
*/
|
2003-04-24 23:12:18 +02:00
|
|
|
root->num_glyphs = face->nmetrics + 1;
|
2001-06-27 21:46:12 +02:00
|
|
|
|
2001-01-01 18:24:31 +01:00
|
|
|
root->num_fixed_sizes = 1;
|
2002-03-22 14:52:37 +01:00
|
|
|
if ( FT_NEW_ARRAY( root->available_sizes, 1 ) )
|
2002-03-21 16:02:54 +01:00
|
|
|
goto Exit;
|
2001-06-27 21:46:12 +02:00
|
|
|
|
2001-12-23 02:38:53 +01:00
|
|
|
{
|
2003-07-01 09:28:55 +02:00
|
|
|
FT_Bitmap_Size* bsize = root->available_sizes;
|
2004-02-08 17:30:37 +01:00
|
|
|
FT_Short resolution_x = 0, resolution_y = 0;
|
2003-07-01 09:28:55 +02:00
|
|
|
|
|
|
|
|
|
|
|
FT_MEM_ZERO( bsize, sizeof ( FT_Bitmap_Size ) );
|
|
|
|
|
2004-08-01 01:04:23 +02:00
|
|
|
bsize->height = (FT_Short)( face->accel.fontAscent +
|
|
|
|
face->accel.fontDescent );
|
2003-07-01 09:28:55 +02:00
|
|
|
|
|
|
|
prop = pcf_find_property( face, "AVERAGE_WIDTH" );
|
2003-11-13 11:19:27 +01:00
|
|
|
if ( prop )
|
2003-07-01 09:28:55 +02:00
|
|
|
bsize->width = (FT_Short)( ( prop->value.integer + 5 ) / 10 );
|
2004-02-08 17:30:37 +01:00
|
|
|
else
|
|
|
|
bsize->width = bsize->height * 2/3;
|
2003-07-01 09:28:55 +02:00
|
|
|
|
2002-02-06 12:22:56 +01:00
|
|
|
prop = pcf_find_property( face, "POINT_SIZE" );
|
2003-11-13 11:19:27 +01:00
|
|
|
if ( prop )
|
2004-02-08 17:30:37 +01:00
|
|
|
/* convert from 722.7 decipoints to 72 points per inch */
|
2003-07-01 09:28:55 +02:00
|
|
|
bsize->size =
|
|
|
|
(FT_Pos)( ( prop->value.integer * 64 * 7200 + 36135L ) / 72270L );
|
2002-02-06 12:22:56 +01:00
|
|
|
|
2004-02-08 17:30:37 +01:00
|
|
|
prop = pcf_find_property( face, "PIXEL_SIZE" );
|
|
|
|
if ( prop )
|
|
|
|
bsize->y_ppem = (FT_Short)prop->value.integer << 6;
|
|
|
|
|
2003-07-01 09:28:55 +02:00
|
|
|
prop = pcf_find_property( face, "RESOLUTION_X" );
|
2003-11-13 11:19:27 +01:00
|
|
|
if ( prop )
|
2004-02-08 17:30:37 +01:00
|
|
|
resolution_x = (FT_Short)prop->value.integer;
|
2001-01-01 18:24:31 +01:00
|
|
|
|
2003-07-01 09:28:55 +02:00
|
|
|
prop = pcf_find_property( face, "RESOLUTION_Y" );
|
2003-11-13 11:19:27 +01:00
|
|
|
if ( prop )
|
2004-02-08 17:30:37 +01:00
|
|
|
resolution_y = (FT_Short)prop->value.integer;
|
2003-07-01 09:28:55 +02:00
|
|
|
|
2004-02-08 17:30:37 +01:00
|
|
|
if ( bsize->y_ppem == 0 )
|
|
|
|
{
|
|
|
|
bsize->y_ppem = bsize->size;
|
|
|
|
if ( resolution_y )
|
|
|
|
bsize->y_ppem = bsize->y_ppem * resolution_y / 72;
|
|
|
|
}
|
|
|
|
if ( resolution_x && resolution_y )
|
|
|
|
bsize->x_ppem = bsize->y_ppem * resolution_x / resolution_y;
|
|
|
|
else
|
|
|
|
bsize->x_ppem = bsize->y_ppem;
|
2003-07-01 09:28:55 +02:00
|
|
|
}
|
2001-01-01 18:24:31 +01:00
|
|
|
|
* src/winfonts/winfnt.c (FNT_Load_Glyph): Use first_char in
computation of glyph_index.
(FNT_Size_Set_Pixels): To find a strike, first check pixel_height
only, then try to find a better hit by comparing pixel_width also.
Without this fix it isn't possible to access all strikes.
Also compute metrics.max_advance to be in sync with other bitmap
drivers.
* src/base/ftobjs.c (FT_Set_Char_Size): Remove redundant code.
(FT_Set_Pixel_Size): Assign value to `metrics' after validation of
arguments.
Synchronize computation of height and width for bitmap strikes. The
`width' field in the FT_Bitmap_Size structure is now only useful to
enumerate different strikes. The `max_advance' field of the
FT_Size_Metrics structure should be used to get the (maximum) width
of a strike.
* src/bdf/bdfdrivr.c (BDF_Face_Init): Don't use AVERAGE_WIDTH for
computing `available_sizes->width' but make it always equal to
`available_sizes->height'.
* src/pcf/pcfread.c (pcf_load_font): Don't use RESOLUTION_X for
computing `available_sizes->width' but make it always equal to
`available_sizes->height'.
* src/truetype/ttdriver.c (Set_Pixel_Sizes): Pass only single
argument to function.
* src/psnames/psmodule.c (ps_unicode_value): Handle `.' after
`uniXXXX' and `uXXXX[X[X]]'.
* src/bdf/bdfdrivr.c: s/FT_Err_/BDF_Err/.
* src/cache/ftccache.c, src/cache/ftcsbits.c, src/cache/ftlru.c:
s/FT_Err_/FTC_Err_/.
* src/cff/cffcmap.c: s/FT_Err_/CFF_Err_/.
* src/pcf/pcfdrivr.c: s/FT_Err_/PCF_Err_/.
* src/psaux/t1cmap.c: Include psauxerr.h.
s/FT_Err_/PSaux_Err_/.
* src/pshinter/pshnterr.h: New file.
* src/pshinter/rules.mk: Updated.
* src/pshinter/pshalgo.c, src/pshinter/pshrec.c: Include pshnterr.h.
s/FT_Err_/PSH_Err_/.
* src/pfr/pfrdrivr.c, src/pfr/pfrobjs.c, src/pfr/pfrsbit.c:
s/FT_Err_/PFR_Err_/.
* src/sfnt/sfdriver.c, src/sfnt/sfobjs.c, src/sfnt/ttcmap0.c,
src/sfnt/ttload.c: s/FT_Err_/SFNT_Err_/.
* src/truetype/ttgload.c: s/FT_Err_/TT_Err_/.
* src/gzip/ftgzip.c: Load FT_MODULE_ERRORS_H and define
FT_ERR_PREFIX and FT_ERR_BASE.
s/FT_Err_/Gzip_Err_/.
2003-06-22 17:33:53 +02:00
|
|
|
/* set up charset */
|
2001-01-01 18:24:31 +01:00
|
|
|
{
|
|
|
|
PCF_Property charset_registry = 0, charset_encoding = 0;
|
2002-03-31 08:56:56 +02:00
|
|
|
|
|
|
|
|
2002-02-06 12:22:56 +01:00
|
|
|
charset_registry = pcf_find_property( face, "CHARSET_REGISTRY" );
|
|
|
|
charset_encoding = pcf_find_property( face, "CHARSET_ENCODING" );
|
2002-03-31 08:56:56 +02:00
|
|
|
|
2003-11-13 11:19:27 +01:00
|
|
|
if ( charset_registry && charset_registry->isString &&
|
|
|
|
charset_encoding && charset_encoding->isString )
|
2001-01-01 18:24:31 +01:00
|
|
|
{
|
2003-11-13 11:19:27 +01:00
|
|
|
if ( FT_NEW_ARRAY( face->charset_encoding,
|
|
|
|
ft_strlen( charset_encoding->value.atom ) + 1 ) )
|
|
|
|
goto Exit;
|
|
|
|
|
|
|
|
if ( FT_NEW_ARRAY( face->charset_registry,
|
|
|
|
ft_strlen( charset_registry->value.atom ) + 1 ) )
|
|
|
|
goto Exit;
|
|
|
|
|
|
|
|
ft_strcpy( face->charset_registry, charset_registry->value.atom );
|
|
|
|
ft_strcpy( face->charset_encoding, charset_encoding->value.atom );
|
2001-01-01 18:24:31 +01:00
|
|
|
}
|
|
|
|
}
|
2001-06-27 21:46:12 +02:00
|
|
|
}
|
2002-03-31 08:56:56 +02:00
|
|
|
|
2002-03-21 16:02:54 +01:00
|
|
|
Exit:
|
2002-03-31 08:56:56 +02:00
|
|
|
if ( error )
|
2002-03-21 16:02:54 +01:00
|
|
|
{
|
|
|
|
/* this is done to respect the behaviour of the original */
|
2002-03-31 08:56:56 +02:00
|
|
|
/* PCF font driver. */
|
2002-03-21 16:02:54 +01:00
|
|
|
error = PCF_Err_Invalid_File_Format;
|
|
|
|
}
|
2002-03-31 08:56:56 +02:00
|
|
|
|
2002-03-21 16:02:54 +01:00
|
|
|
return error;
|
2001-01-01 18:24:31 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/* END */
|