[freetype2] master 3b88576 2/2: [base] Fix bitmap emboldening.

[Werner LEMBERG]

branch: master
commit 3b88576ba0807f5203310c22d5dbfff803c4abd9
Author: Alexei Podtelezhnikov <address@hidden>
Commit: Werner Lemberg <address@hidden>

    [base] Fix bitmap emboldening.
    
    Bug introduced after release 2.8.
    
    * src/base/ftbitmap.c (ft_bitmap_assure_buffer): We use
    `FT_QALLOC_MULT', which doesn't zero out the buffer.  Adjust the
    bitmap copying code to take care of this fact.
---
 ChangeLog           | 10 ++++++++++
 src/base/ftbitmap.c | 10 ++++++----
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 4dc8c55..24acb8f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2018-04-22  Alexei Podtelezhnikov  <address@hidden>
+
+       [base] Fix bitmap emboldening.
+
+       Bug introduced after release 2.8.
+
+       * src/base/ftbitmap.c (ft_bitmap_assure_buffer): We use
+       `FT_QALLOC_MULT', which doesn't zero out the buffer.  Adjust the
+       bitmap copying code to take care of this fact.
+
 2018-04-22  Werner Lemberg  <address@hidden>
 
        Another fix for handling invalid format 2 cmaps.
diff --git a/src/base/ftbitmap.c b/src/base/ftbitmap.c
index 93efb09..a974666 100644
--- a/src/base/ftbitmap.c
+++ b/src/base/ftbitmap.c
@@ -237,7 +237,7 @@
       unsigned char*  out = buffer;
 
       unsigned char*  limit = bitmap->buffer + pitch * bitmap->rows;
-      unsigned int    delta = new_pitch - pitch;
+      unsigned int    delta = new_pitch - len;
 
 
       FT_MEM_ZERO( out, new_pitch * ypixels );
@@ -247,8 +247,10 @@
       {
         FT_MEM_COPY( out, in, len );
         in  += pitch;
-        out += pitch;
+        out += len;
 
+        /* we use FT_QALLOC_MULT, which doesn't zero out the buffer;      */
+        /* consequently, we have to manually zero out the remaining bytes */
         FT_MEM_ZERO( out, delta );
         out += delta;
       }
@@ -261,14 +263,14 @@
       unsigned char*  out = buffer;
 
       unsigned char*  limit = bitmap->buffer + pitch * bitmap->rows;
-      unsigned int    delta = new_pitch - pitch;
+      unsigned int    delta = new_pitch - len;
 
 
       while ( in < limit )
       {
         FT_MEM_COPY( out, in, len );
         in  += pitch;
-        out += pitch;
+        out += len;
 
         FT_MEM_ZERO( out, delta );
         out += delta;