rgraves
/
freetype2
forked from minhngoc25a/freetype2
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Formatting.

This commit is contained in:
Werner Lemberg 2007-05-14 18:53:58 +00:00
parent 8d463a53d1
commit 56ceaa4853
4 changed files with 35 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ChangeLog
View File

@ -5,11 +5,14 @@
2007-05-11 David Turner <david@freetype.org>
* src/cache/ftbasic.c, include/freetype/ftcache.h: introduce
two new functions FTC_ImageCache_LookupScaler and
FTC_SBitCache_LookupScaler that allows us to lookup glyphs using a
FTC_Scaler object to specify the size. This allows fractional pixel
sizes
* src/cache/ftbasic.c, include/freetype/ftcache.h
(FTC_ImageCache_LookupScaler, FTC_SBit_Cache_LookupScaler): Two new
functions that allow us to look up glyphs using an FTC_Scaler object
to specify the size, making it possible to use fractional pixel
sizes.
* src/truetype/ttobjs.c (tt_size_ready_bytecode): Set
`size->cvt_ready'. Reported by Boris Letocha.
2007-05-09 Graham Asher <graham.asher@btinternet.com>

42
include/freetype/ftcache.h
View File

@ -4,7 +4,7 @@
/* */
/* FreeType Cache subsystem (specification). */
/* */
/* Copyright 1996-2001, 2002, 2003, 2004, 2005, 2006 by */
/* Copyright 1996-2001, 2002, 2003, 2004, 2005, 2006, 2007 by */
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
/* */
/* This file is part of the FreeType project, and may only be used, */
@ -782,25 +782,25 @@ FT_BEGIN_HEADER
/* FTC_ImageCache_LookupScaler */
/* */
/* <Description> */
/* A variant of @FTC_ImageCache_Lookup that uses a @FTC_ScalerRec */
/* to specify the face id and its size */
/* A variant of @FTC_ImageCache_Lookup that uses an @FTC_ScalerRec */
/* to specify the face ID and its size. */
/* */
/* <Input> */
/* cache :: A handle to the source glyph image cache. */
/* */
/* scaler :: A pointer to a scaler descriptor. */
/* */
/* load_flags :: corresponding load flags */
/* load_flags :: The corresponding load flags. */
/* */
/* gindex :: The glyph index to retrieve. */
/* gindex :: The glyph index to retrieve. */
/* */
/* <Output> */
/* aglyph :: The corresponding @FT_Glyph object. 0 in case of */
/* failure. */
/* aglyph :: The corresponding @FT_Glyph object. 0 in case of */
/* failure. */
/* */
/* anode :: Used to return the address of of the corresponding cache */
/* node after incrementing its reference count (see note */
/* below). */
/* anode :: Used to return the address of of the corresponding */
/* cache node after incrementing its reference count */
/* (see note below). */
/* */
/* <Return> */
/* FreeType error code. 0 means success. */
@ -829,6 +829,7 @@ FT_BEGIN_HEADER
FT_Glyph *aglyph,
FTC_Node *anode );
/*************************************************************************/
/* */
/* <Type> */
@ -982,30 +983,31 @@ FT_BEGIN_HEADER
FTC_SBit *sbit,
FTC_Node *anode );
/*************************************************************************/
/* */
/* <Function> */
/* FTC_SBitCache_LookupScaler */
/* */
/* <Description> */
/* A variant of @FTC_SBitCache_Lookup that uses a @FTC_ScalerRec */
/* to specify the face id and its size. */
/* A variant of @FTC_SBitCache_Lookup that uses an @FTC_ScalerRec */
/* to specify the face ID and its size. */
/* */
/* <Input> */
/* cache :: A handle to the source sbit cache. */
/* cache :: A handle to the source sbit cache. */
/* */
/* scaler :: A pointer to the scaler descriptor. */
/* scaler :: A pointer to the scaler descriptor. */
/* */
/* load_flags :: corresponding load flags */
/* load_flags :: The corresponding load flags. */
/* */
/* gindex :: The glyph index. */
/* gindex :: The glyph index. */
/* */
/* <Output> */
/* sbit :: A handle to a small bitmap descriptor. */
/* sbit :: A handle to a small bitmap descriptor. */
/* */
/* anode :: Used to return the address of of the corresponding cache */
/* node after incrementing its reference count (see note */
/* below). */
/* anode :: Used to return the address of of the corresponding */
/* cache node after incrementing its reference count */
/* (see note below). */
/* */
/* <Return> */
/* FreeType error code. 0 means success. */

7
src/cache/ftcbasic.c vendored
View File

@ -4,7 +4,7 @@
/* */
/* The FreeType basic cache interface (body). */
/* */
/* Copyright 2003, 2004, 2005, 2006 by */
/* Copyright 2003, 2004, 2005, 2006, 2007 by */
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
/* */
/* This file is part of the FreeType project, and may only be used, */
@ -383,7 +383,6 @@
}
/* documentation is in ftcache.h */
FT_EXPORT_DEF( FT_Error )
@ -709,6 +708,8 @@
}
/* documentation is in ftcache.h */
FT_EXPORT_DEF( FT_Error )
FTC_SBitCache_LookupScaler( FTC_SBitCache cache,
FTC_Scaler scaler,
@ -737,7 +738,7 @@
/* beware, the hash must be the same for all glyph ranges! */
hash = FTC_BASIC_ATTR_HASH( &query.attrs ) +
gindex / FTC_SBIT_ITEMS_PER_NODE;
gindex / FTC_SBIT_ITEMS_PER_NODE;
FTC_GCACHE_LOOKUP_CMP( cache,
ftc_basic_family_compare,

2
src/truetype/ttobjs.c
View File

@ -693,7 +693,7 @@
size->GS = tt_default_graphics_state;
error = tt_size_run_prep( size );
if (!error)
if ( !error )
size->cvt_ready = 1;
}
Exit: