[base] Compute MD5 checksums only if explicitly requested.

This improves profiling accuracy.

* src/base/ftobjs.c (FT_Render_Glyph_Internal): Implement it.
This commit is contained in:
Werner Lemberg 2015-10-15 16:58:13 +02:00
parent 6de2a355ff
commit e03214e166
2 changed files with 46 additions and 27 deletions

View File

@ -1,3 +1,11 @@
2015-10-15 Werner Lemberg <wl@gnu.org>
[base] Compute MD5 checksums only if explicitly requested.
This improves profiling accuracy.
* src/base/ftobjs.c (FT_Render_Glyph_Internal): Implement it.
2015-10-14 Werner Lemberg <wl@gnu.org> 2015-10-14 Werner Lemberg <wl@gnu.org>
[base] Use `FT_' namespace for MD5 functions (#42366). [base] Use `FT_' namespace for MD5 functions (#42366).

View File

@ -4167,39 +4167,50 @@
#undef FT_COMPONENT #undef FT_COMPONENT
#define FT_COMPONENT trace_bitmap #define FT_COMPONENT trace_bitmap
/* we convert to a single bitmap format for computing the checksum */ /*
if ( !error ) * Computing the MD5 checksum is expensive, unnecessarily distorting a
* possible profiling of FreeType if compiled with tracing support. For
* this reason, we execute the following code only if explicitly
* requested.
*/
/* we use FT_TRACE3 in this block */
if ( ft_trace_levels[trace_bitmap] >= 3 )
{ {
FT_Bitmap bitmap; /* we convert to a single bitmap format for computing the checksum */
FT_Error err; if ( !error )
FT_Bitmap_Init( &bitmap );
/* this also converts the bitmap flow to `down' (i.e., pitch > 0) */
err = FT_Bitmap_Convert( library, &slot->bitmap, &bitmap, 1 );
if ( !err )
{ {
MD5_CTX ctx; FT_Bitmap bitmap;
unsigned char md5[16]; FT_Error err;
int i;
unsigned int rows = bitmap.rows;
unsigned int pitch = (unsigned int)bitmap.pitch;
MD5_Init( &ctx ); FT_Bitmap_Init( &bitmap );
MD5_Update( &ctx, bitmap.buffer, rows * pitch );
MD5_Final( md5, &ctx );
FT_TRACE3(( "MD5 checksum for %dx%d bitmap:\n" /* this also converts the bitmap flow to `down' (i.e., pitch > 0) */
" ", err = FT_Bitmap_Convert( library, &slot->bitmap, &bitmap, 1 );
rows, pitch )); if ( !err )
for ( i = 0; i < 16; i++ ) {
FT_TRACE3(( "%02X", md5[i] )); MD5_CTX ctx;
FT_TRACE3(( "\n" )); unsigned char md5[16];
int i;
unsigned int rows = bitmap.rows;
unsigned int pitch = (unsigned int)bitmap.pitch;
MD5_Init( &ctx );
MD5_Update( &ctx, bitmap.buffer, rows * pitch );
MD5_Final( md5, &ctx );
FT_TRACE3(( "MD5 checksum for %dx%d bitmap:\n"
" ",
rows, pitch ));
for ( i = 0; i < 16; i++ )
FT_TRACE3(( "%02X", md5[i] ));
FT_TRACE3(( "\n" ));
}
FT_Bitmap_Done( library, &bitmap );
} }
FT_Bitmap_Done( library, &bitmap );
} }
#undef FT_COMPONENT #undef FT_COMPONENT