minhngoc25a
/
freetype2
mirror of git://git.savannah.gnu.org/freetype/freetype2.git
2
1
Fork 2
Code Issues 4 Releases Wiki Activity

Make `FT_Bitmap_Convert' correctly handle negative `pitch' values. 

* src/base/ftbitmap.c (FT_Bitmap_Convert): Always use positive value
for the pitch while copying data.
Correctly set pitch sign in target bitmap.
This commit is contained in:
Werner Lemberg 2014-11-19 21:21:23 +01:00
parent d6061212c3
commit df485774fb
2 changed files with 43 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -1,3 +1,11 @@
2014-11-19 Werner Lemberg <wl@gnu.org>
Make `FT_Bitmap_Convert' correctly handle negative `pitch' values.
* src/base/ftbitmap.c (FT_Bitmap_Convert): Always use positive value
for the pitch while copying data.
Correctly set pitch sign in target bitmap.
2014-11-19 Werner Lemberg <wl@gnu.org>
Minor code improvement in `FT_Bitmap_Embolden'.

63
src/base/ftbitmap.c
View File

@ -433,6 +433,8 @@
FT_Error error = FT_Err_Ok;
FT_Memory memory;
FT_Int source_pitch, target_pitch;
if ( !library )
return FT_THROW( Invalid_Library_Handle );
@ -449,13 +451,15 @@
case FT_PIXEL_MODE_LCD_V:
case FT_PIXEL_MODE_BGRA:
{
FT_Int pad;
FT_Int pad, old_target_pitch;
FT_Long old_size;
old_size = target->rows * target->pitch;
if ( old_size < 0 )
old_size = -old_size;
old_target_pitch = target->pitch;
if ( old_target_pitch < 0 )
old_target_pitch = -old_target_pitch;
old_size = target->rows * old_target_pitch;
target->pixel_mode = FT_PIXEL_MODE_GRAY;
target->rows = source->rows;
@ -469,16 +473,18 @@
pad = alignment - pad;
}
target->pitch = source->width + pad;
target_pitch = source->width + pad;
if ( target->pitch > 0 &&
(FT_ULong)target->rows > FT_ULONG_MAX / target->pitch )
if ( target_pitch > 0 &&
(FT_ULong)target->rows > FT_ULONG_MAX / target_pitch )
return FT_THROW( Invalid_Argument );
if ( target->rows * target->pitch > old_size &&
if ( target->rows * target_pitch > old_size &&
FT_QREALLOC( target->buffer,
old_size, target->rows * target->pitch ) )
old_size, target->rows * target_pitch ) )
return error;
target->pitch = target->pitch < 0 ? -target_pitch : target_pitch;
}
break;
@ -486,6 +492,10 @@
error = FT_THROW( Invalid_Argument );
}
source_pitch = source->pitch;
if ( source_pitch < 0 )
source_pitch = -source_pitch;
switch ( source->pixel_mode )
{
case FT_PIXEL_MODE_MONO:
@ -538,8 +548,8 @@
}
}
s += source->pitch;
t += target->pitch;
s += source_pitch;
t += target_pitch;
}
}
break;
@ -549,11 +559,9 @@
case FT_PIXEL_MODE_LCD:
case FT_PIXEL_MODE_LCD_V:
{
FT_Int width = source->width;
FT_Byte* s = source->buffer;
FT_Byte* t = target->buffer;
FT_Int s_pitch = source->pitch;
FT_Int t_pitch = target->pitch;
FT_Int width = source->width;
FT_Byte* s = source->buffer;
FT_Byte* t = target->buffer;
FT_Int i;
@ -563,8 +571,8 @@
{
FT_ARRAY_COPY( t, s, width );
s += s_pitch;
t += t_pitch;
s += source_pitch;
t += target_pitch;
}
}
break;
@ -615,8 +623,8 @@
}
}
s += source->pitch;
t += target->pitch;
s += source_pitch;
t += target_pitch;
}
}
break;
@ -654,18 +662,17 @@
if ( source->width & 1 )
tt[0] = (FT_Byte)( ( ss[0] & 0xF0 ) >> 4 );
s += source->pitch;
t += target->pitch;
s += source_pitch;
t += target_pitch;
}
}
break;
case FT_PIXEL_MODE_BGRA:
{
FT_Byte* s = source->buffer;
FT_Byte* t = target->buffer;
FT_Int s_pitch = source->pitch;
FT_Int t_pitch = target->pitch;
FT_Byte* s = source->buffer;
FT_Byte* t = target->buffer;
FT_Int i;
@ -686,8 +693,8 @@
tt += 1;
}
s += s_pitch;
t += t_pitch;
s += source_pitch;
t += target_pitch;
}
}
break;