From 947e47528345ab821b4d0fc7d3f0472fa236045e Mon Sep 17 00:00:00 2001 From: Werner Lemberg Date: Thu, 4 Feb 2021 10:19:26 +0100 Subject: [PATCH] [base] Fix Netpbm tracing message. * src/base/ftobjs.c (FT_Render_Glyph_Internal): Don't emit Netpbm warning if there is nothing to output. --- ChangeLog | 7 +++++++ src/base/ftobjs.c | 6 +++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0251ce0e8..8f81b09ad 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2021-02-04 Werner Lemberg + + [base] Fix Netpbm tracing message. + + * src/base/ftobjs.c (FT_Render_Glyph_Internal): Don't emit Netpbm + warning if there is nothing to output. + 2021-02-04 Werner Lemberg * src/*: Don't use more than one '\n' in `FT_TRACE` and `FT_ERROR`. diff --git a/src/base/ftobjs.c b/src/base/ftobjs.c index eca61fc3a..dd478e03a 100644 --- a/src/base/ftobjs.c +++ b/src/base/ftobjs.c @@ -4733,11 +4733,11 @@ /* we use FT_TRACE7 in this block */ if ( !error && - ft_trace_levels[trace_checksum] >= 7 ) + ft_trace_levels[trace_checksum] >= 7 && + slot->bitmap.buffer ) { if ( slot->bitmap.rows < 128U && - slot->bitmap.width < 128U && - slot->bitmap.buffer ) + slot->bitmap.width < 128U ) { int rows = (int)slot->bitmap.rows; int width = (int)slot->bitmap.width;