Commit 1e0207681544327f9e96c6d50231b6fbc1f6ed70
2019-07-18T01:50:16
[woff2] Avoid too many calls to `FT_REALLOC'. We do this by using `totalSfntSize' as an initial reference, and extending the buffer when required. This reduces rendering time considerably. * include/freetype/internal/wofftypes.h (WOFF2_HeaderRec): Add `totalSfntSize', rename `total_sfnt_size' to `actual_sfnt_size'. * src/sfnt/sfwoff2.c (write_buf): Add parameter `dst_size' to keep track of and update total size of stream. (WRITE_SFNT_BUF, WRITE_SFNT_BUF_AT): Modify macros accordingly. (pad4, store_loca, reconstruct_glyf, reconstruct_hmtx, reconstruct_font): Update parameters to accept `sfnt_size'. (woff2_open_font): Add variable `sfnt_size'. Use WOFF2 header field `totalSfntSize' as initial reference (if value makes sense) and allocate `totalSfntSize' bytes for the sfnt stream. `write_buf' handles reallocation if and when required. Also resize the stream to `actual_sfnt_size' after reconstruction.
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 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313
diff --git a/ChangeLog b/ChangeLog
index cb07a84..5bd878b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,30 @@
2019-08-27 Nikhil Ramakrishnan <ramakrishnan.nikhil@gmail.com>
+ [woff2] Avoid too many calls to `FT_REALLOC'.
+
+ We do this by using `totalSfntSize' as an initial reference, and
+ extending the buffer when required. This reduces rendering time
+ considerably.
+
+ * include/freetype/internal/wofftypes.h (WOFF2_HeaderRec): Add
+ `totalSfntSize', rename `total_sfnt_size' to `actual_sfnt_size'.
+
+ * src/sfnt/sfwoff2.c (write_buf): Add parameter `dst_size' to keep
+ track of and update total size of stream.
+
+ (WRITE_SFNT_BUF, WRITE_SFNT_BUF_AT): Modify macros accordingly.
+
+ (pad4, store_loca, reconstruct_glyf, reconstruct_hmtx,
+ reconstruct_font): Update parameters to accept `sfnt_size'.
+
+ (woff2_open_font): Add variable `sfnt_size'. Use WOFF2 header field
+ `totalSfntSize' as initial reference (if value makes sense) and
+ allocate `totalSfntSize' bytes for the sfnt stream. `write_buf'
+ handles reallocation if and when required. Also resize the stream
+ to `actual_sfnt_size' after reconstruction.
+
+2019-08-27 Nikhil Ramakrishnan <ramakrishnan.nikhil@gmail.com>
+
[woff2] Reconstruct `loca', `hmtx', and swap out stream.
Add necessary functions to reconstruct loca and hmtx tables (the two
diff --git a/include/freetype/internal/wofftypes.h b/include/freetype/internal/wofftypes.h
index efadb77..9c827e3 100644
--- a/include/freetype/internal/wofftypes.h
+++ b/include/freetype/internal/wofftypes.h
@@ -165,6 +165,7 @@ FT_BEGIN_HEADER
FT_ULong flavor;
FT_ULong length;
FT_UShort num_tables;
+ FT_ULong totalSfntSize;
FT_ULong totalCompressedSize;
FT_ULong metaOffset;
FT_ULong metaLength;
@@ -176,7 +177,7 @@ FT_BEGIN_HEADER
FT_ULong compressed_offset;
FT_ULong header_version;
FT_UShort num_fonts;
- FT_ULong total_sfnt_size;
+ FT_ULong actual_sfnt_size;
WOFF2_TtcFont ttc_fonts;
diff --git a/src/sfnt/sfwoff2.c b/src/sfnt/sfwoff2.c
index 0b6999d..3f79654 100644
--- a/src/sfnt/sfwoff2.c
+++ b/src/sfnt/sfwoff2.c
@@ -73,10 +73,10 @@
} while ( 0 )
#define WRITE_SFNT_BUF( buf, s ) \
- write_buf( &sfnt, &dest_offset, buf, s, memory, TRUE )
+ write_buf( &sfnt, sfnt_size, &dest_offset, buf, s, memory )
#define WRITE_SFNT_BUF_AT( offset, buf, s ) \
- write_buf( &sfnt, &offset, buf, s, memory, FALSE )
+ write_buf( &sfnt, sfnt_size, &offset, buf, s, memory )
#define N_CONTOUR_STREAM 0
#define N_POINTS_STREAM 1
@@ -205,11 +205,11 @@
static FT_Error
write_buf( FT_Byte** dst_bytes,
+ FT_ULong* dst_size,
FT_ULong* offset,
FT_Byte* src,
FT_ULong size,
- FT_Memory memory,
- FT_Bool extend_buf )
+ FT_Memory memory )
{
FT_Error error = FT_Err_Ok;
/* We are reallocating memory for `dst', so its pointer may change. */
@@ -219,15 +219,18 @@
if( ( *offset + size ) > WOFF2_DEFAULT_MAX_SIZE )
return FT_THROW( Array_Too_Large );
- /* DEBUG - Remove later */
- /* FT_TRACE2(( "Reallocating %lu to %lu.\n", *offset, (*offset + size) )); */
/* Reallocate `dst'. */
- if( extend_buf )
+ if( ( *offset + size ) > *dst_size )
{
+ /* DEBUG - Remove later */
+ FT_TRACE2(( "Reallocating %lu to %lu.\n",
+ *dst_size, (*offset + size) ));
if ( FT_REALLOC( dst,
- (FT_ULong)( *offset ),
+ (FT_ULong)( *dst_size ),
(FT_ULong)( *offset + size ) ) )
goto Exit;
+
+ *dst_size = *offset + size;
}
/* Copy data. */
@@ -244,6 +247,7 @@
static FT_Error
pad4( FT_Byte** sfnt_bytes,
+ FT_ULong* sfnt_size,
FT_ULong* out_offset,
FT_Memory memory )
{
@@ -722,6 +726,7 @@
FT_UShort index_format,
FT_ULong* checksum,
FT_Byte** sfnt_bytes,
+ FT_ULong* sfnt_size,
FT_ULong* out_offset,
FT_Memory memory )
{
@@ -783,6 +788,7 @@
WOFF2_Table loca_table,
FT_ULong* loca_checksum,
FT_Byte** sfnt_bytes,
+ FT_ULong* sfnt_size,
FT_ULong* out_offset,
WOFF2_Info info,
FT_Memory memory )
@@ -1108,7 +1114,7 @@
if( WRITE_SFNT_BUF( glyph_buf, glyph_size ) )
goto Fail;
- if( pad4( &sfnt, &dest_offset, memory ) )
+ if( pad4( &sfnt, sfnt_size, &dest_offset, memory ) )
goto Fail;
*glyf_checksum += compute_ULong_sum( glyph_buf, glyph_size );
@@ -1124,7 +1130,8 @@
loca_values[num_glyphs] = glyf_table->dst_length;
if( store_loca( loca_values, num_glyphs + 1, index_format,
- loca_checksum, &sfnt, &dest_offset, memory ) )
+ loca_checksum, &sfnt, sfnt_size,
+ &dest_offset, memory ) )
goto Fail;
loca_table->dst_length = dest_offset - loca_table->dst_offset;
@@ -1172,6 +1179,7 @@
FT_Short* x_mins,
FT_ULong* checksum,
FT_Byte** sfnt_bytes,
+ FT_ULong* sfnt_size,
FT_ULong* out_offset,
FT_Memory memory )
{
@@ -1306,6 +1314,7 @@
WOFF2_Header woff2,
WOFF2_Info info,
FT_Byte** sfnt_bytes,
+ FT_ULong* sfnt_size,
FT_Memory memory )
{
FT_Error error = FT_Err_Ok;
@@ -1427,8 +1436,8 @@
if( reconstruct_glyf( stream, &table, &checksum,
loca_table, &loca_checksum,
- &sfnt, &dest_offset, info,
- memory ) )
+ &sfnt, sfnt_size, &dest_offset,
+ info, memory ) )
return FT_THROW( Invalid_Table );
FT_TRACE2(("glyf checksum is %08x\n", checksum));
}
@@ -1441,7 +1450,7 @@
table.dst_offset = dest_offset;
if( reconstruct_hmtx( stream, table.src_length, info->num_glyphs,
info->num_hmetrics, info->x_mins, &checksum,
- &sfnt, &dest_offset, memory ) )
+ &sfnt, sfnt_size, &dest_offset, memory ) )
return FT_THROW( Invalid_Table );
}
else
@@ -1464,7 +1473,7 @@
/* Update checksum. */
font_checksum += compute_ULong_sum( table_entry, 16 );
- if( pad4( &sfnt, &dest_offset, memory ) )
+ if( pad4( &sfnt, sfnt_size, &dest_offset, memory ) )
goto Fail;
/* Sanity check. */
@@ -1488,7 +1497,7 @@
FT_TRACE2(( "Final checksum = %u\n", font_checksum ));
- woff2->total_sfnt_size = dest_offset;
+ woff2->actual_sfnt_size = dest_offset;
/* Set pointer of sfnt stream to its correct value. */
*sfnt_bytes = sfnt;
@@ -1539,6 +1548,7 @@
FT_Byte* sfnt = NULL;
FT_Stream sfnt_stream = NULL;
FT_Byte* sfnt_header;
+ FT_ULong sfnt_size;
FT_Byte* uncompressed_buf = NULL;
@@ -1548,18 +1558,19 @@
#define FT_STRUCTURE WOFF2_HeaderRec
FT_FRAME_START( 48 ),
- FT_FRAME_ULONG ( signature ),
- FT_FRAME_ULONG ( flavor ),
- FT_FRAME_ULONG ( length ),
- FT_FRAME_USHORT( num_tables ),
- FT_FRAME_SKIP_BYTES( 2 + 4 ),
- FT_FRAME_ULONG ( totalCompressedSize ),
+ FT_FRAME_ULONG ( signature ),
+ FT_FRAME_ULONG ( flavor ),
+ FT_FRAME_ULONG ( length ),
+ FT_FRAME_USHORT ( num_tables ),
+ FT_FRAME_SKIP_BYTES( 2 ),
+ FT_FRAME_ULONG ( totalSfntSize ),
+ FT_FRAME_ULONG ( totalCompressedSize ),
FT_FRAME_SKIP_BYTES( 2 * 2 ),
- FT_FRAME_ULONG ( metaOffset ),
- FT_FRAME_ULONG ( metaLength ),
- FT_FRAME_ULONG ( metaOrigLength ),
- FT_FRAME_ULONG ( privOffset ),
- FT_FRAME_ULONG ( privLength ),
+ FT_FRAME_ULONG ( metaOffset ),
+ FT_FRAME_ULONG ( metaLength ),
+ FT_FRAME_ULONG ( metaOrigLength ),
+ FT_FRAME_ULONG ( privOffset ),
+ FT_FRAME_ULONG ( privLength ),
FT_FRAME_END
};
@@ -1582,6 +1593,7 @@
FT_TRACE2(( "flavor -> 0x%X\n", woff2.flavor ));
FT_TRACE2(( "length -> %lu\n", woff2.length ));
FT_TRACE2(( "num_tables -> %hu\n", woff2.num_tables ));
+ FT_TRACE2(( "totalSfntSize -> %lu\n", woff2.totalSfntSize ));
FT_TRACE2(( "metaOffset -> %hu\n", woff2.metaOffset ));
FT_TRACE2(( "metaLength -> %hu\n", woff2.metaLength ));
FT_TRACE2(( "privOffset -> %hu\n", woff2.privOffset ));
@@ -1816,12 +1828,7 @@
/* DEBUG - Remove later */
FT_TRACE2(( "Storing tables for TTC face index %d.\n", face_index ));
for ( nn = 0; nn < ttc_font->num_tables; nn++ )
- {
- /* DEBUG - Remove later */
- FT_TRACE2(( "i=%d, table_index=%d\n",
- nn, ttc_font->table_indices[nn] ));
temp_indices[nn] = indices[ttc_font->table_indices[nn]];
- }
/* Resize array to required size. */
if( FT_RENEW_ARRAY( indices, woff2.num_tables,
@@ -1837,9 +1844,16 @@
woff2.num_tables = ttc_font->num_tables;
}
+ /* We need to allocate this much at the minimum. */
+ sfnt_size = 12 + woff2.num_tables * 16UL;
+ /* This is what we normally expect. */
+ /* Initially trust `totalSfntSize' and change later as required. */
+ if ( woff2.totalSfntSize > sfnt_size )
+ sfnt_size = woff2.totalSfntSize;
+
/* Write sfnt header. */
- if ( FT_ALLOC( sfnt, 12 + woff2.num_tables * 16UL ) ||
- FT_NEW( sfnt_stream ) )
+ if ( FT_ALLOC( sfnt, sfnt_size ) ||
+ FT_NEW( sfnt_stream ) )
goto Exit;
sfnt_header = sfnt;
@@ -1910,11 +1924,24 @@
FT_FRAME_EXIT();
reconstruct_font( uncompressed_buf, woff2.uncompressed_size,
- indices, &woff2, &info, &sfnt, memory );
+ indices, &woff2, &info, &sfnt, &sfnt_size,
+ memory );
+
+ /* Resize `sfnt' to actual size of sfnt stream. */
+ if ( woff2.actual_sfnt_size < sfnt_size )
+ {
+ /* DEBUG - Remove later */
+ FT_TRACE2(( "Trimming sfnt stream from %lu to %lu.\n",
+ sfnt_size, woff2.actual_sfnt_size ));
+ if ( FT_REALLOC( sfnt,
+ (FT_ULong)( sfnt_size ),
+ (FT_ULong)( woff2.actual_sfnt_size ) ) )
+ goto Exit;
+ }
/* reconstruct_font has done all the work. */
/* Swap out stream and return. */
- FT_Stream_OpenMemory( sfnt_stream, sfnt, woff2.total_sfnt_size );
+ FT_Stream_OpenMemory( sfnt_stream, sfnt, woff2.actual_sfnt_size );
sfnt_stream->memory = stream->memory;
sfnt_stream->close = stream_close;