shithub: freetype+ttf2subf

Info  •  Files  •  Log  •  Branches

Swap `ALLOC_MULT' arguments (#51833).

* src/base/ftbitmap.c (ft_bitmap_assure_buffer): Updated.
* src/winfonts/winfnt.c (FNT_Load_Glyph): Updated.
* src/raster/ftrend1.c (ft_raster1_render): Updated.

git/fs: mount .git/fs: mount/attach disallowed

--- a/ChangeLog

+++ b/ChangeLog

@@ -1,3 +1,11 @@

+2017-08-25  Alexei Podtelezhnikov  <[email protected]>

+

+	Swap `ALLOC_MULT' arguments (#51833).

+

+	* src/base/ftbitmap.c (ft_bitmap_assure_buffer): Updated.

+	* src/winfonts/winfnt.c (FNT_Load_Glyph): Updated.

+	* src/raster/ftrend1.c (ft_raster1_render): Updated.

+

 2017-08-23  Werner Lemberg  <[email protected]>

 	[sfnt] Fix clang compilation (#51788).

--- a/src/base/ftbitmap.c

+++ b/src/base/ftbitmap.c

@@ -226,7 +226,7 @@

     }

     /* otherwise allocate new buffer */

-    if ( FT_QALLOC_MULT( buffer, new_pitch, bitmap->rows + ypixels ) )

+    if ( FT_QALLOC_MULT( buffer, bitmap->rows + ypixels, new_pitch ) )

       return error;

     /* new rows get added at the top of the bitmap, */

--- a/src/raster/ftrend1.c

+++ b/src/raster/ftrend1.c

@@ -189,7 +189,7 @@

     bitmap->rows  = height;

     bitmap->pitch = (int)pitch;

-    if ( FT_ALLOC_MULT( bitmap->buffer, pitch, height ) )

+    if ( FT_ALLOC_MULT( bitmap->buffer, height, pitch ) )

       goto Exit;

     slot->internal->flags |= FT_GLYPH_OWN_BITMAP;

--- a/src/winfonts/winfnt.c

+++ b/src/winfonts/winfnt.c

@@ -1091,7 +1091,7 @@

       /* note: since glyphs are stored in columns and not in rows we */

       /*       can't use ft_glyphslot_set_bitmap                     */

-      if ( FT_ALLOC_MULT( bitmap->buffer, pitch, bitmap->rows ) )

+      if ( FT_ALLOC_MULT( bitmap->buffer, bitmap->rows, pitch ) )

         goto Exit;

       column = (FT_Byte*)bitmap->buffer;