Commit 56ceaa4853c408abae3e94b8a7bd670ef287e06c
2007-05-14T18:53:58
Formatting.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174
diff --git a/ChangeLog b/ChangeLog
index ed3f311..677fe81 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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>
diff --git a/include/freetype/ftcache.h b/include/freetype/ftcache.h
index 8b74cf5..e713b25 100644
--- a/include/freetype/ftcache.h
+++ b/include/freetype/ftcache.h
@@ -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. */
diff --git a/src/cache/ftcbasic.c b/src/cache/ftcbasic.c
index 91465bf..a568b97 100644
--- a/src/cache/ftcbasic.c
+++ b/src/cache/ftcbasic.c
@@ -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,
diff --git a/src/truetype/ttobjs.c b/src/truetype/ttobjs.c
index 57c197e..7155cca 100644
--- a/src/truetype/ttobjs.c
+++ b/src/truetype/ttobjs.c
@@ -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: