Commit cd3f871e8d740dfb79de18bb1047db84bc6bd108
2013-01-16T19:56:08
[sfnt] Fix optimized sbit loader. It was not taking bit_depth into consideration when blitting! * src/sfnt/ttsbit0.c (tt_sbit_decoder_load_byte_aligned, * tt_sbit_decoder_load_bit_aligned): Handle bit depth.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119
diff --git a/ChangeLog b/ChangeLog
index 913d6bf..3b5fd9f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2013-01-16 Behdad Esfahbod <behdad@behdad.org>
+
+ [sfnt] Fix optimized sbit loader.
+
+ It was not taking bit_depth into consideration when blitting!
+
+ * src/sfnt/ttsbit0.c (tt_sbit_decoder_load_byte_aligned,
+ * tt_sbit_decoder_load_bit_aligned): Handle bit
+ depth.
+
2013-01-16 David 'Digit' Turner <digit@google.com>
[truetype] Improve sub-pixel code.
diff --git a/src/sfnt/ttsbit0.c b/src/sfnt/ttsbit0.c
index 38bcf21..99c1426 100644
--- a/src/sfnt/ttsbit0.c
+++ b/src/sfnt/ttsbit0.c
@@ -375,7 +375,7 @@
{
FT_Error error = SFNT_Err_Ok;
FT_Byte* line;
- FT_Int bit_height, bit_width, pitch, width, height, h;
+ FT_Int bit_height, bit_width, pitch, width, height, line_bits, h;
FT_Bitmap* bitmap;
@@ -396,6 +396,8 @@
width = decoder->metrics->width;
height = decoder->metrics->height;
+ line_bits = width * decoder->bit_depth;
+
if ( x_pos < 0 || x_pos + width > bit_width ||
y_pos < 0 || y_pos + height > bit_height )
{
@@ -403,7 +405,7 @@
goto Exit;
}
- if ( p + ( ( width + 7 ) >> 3 ) * height > limit )
+ if ( p + ( ( line_bits + 7 ) >> 3 ) * height > limit )
{
error = SFNT_Err_Invalid_File_Format;
goto Exit;
@@ -421,7 +423,7 @@
FT_Int w;
- for ( w = width; w >= 8; w -= 8 )
+ for ( w = line_bits; w >= 8; w -= 8 )
{
write[0] = (FT_Byte)( write[0] | *p++ );
write += 1;
@@ -440,7 +442,7 @@
FT_UInt wval = 0;
- for ( w = width; w >= 8; w -= 8 )
+ for ( w = line_bits; w >= 8; w -= 8 )
{
wval = (FT_UInt)( wval | *p++ );
write[0] = (FT_Byte)( write[0] | ( wval >> x_pos ) );
@@ -513,7 +515,7 @@
{
FT_Error error = SFNT_Err_Ok;
FT_Byte* line;
- FT_Int bit_height, bit_width, pitch, width, height, h, nbits;
+ FT_Int bit_height, bit_width, pitch, width, height, line_bits, h, nbits;
FT_Bitmap* bitmap;
FT_UShort rval;
@@ -535,6 +537,8 @@
width = decoder->metrics->width;
height = decoder->metrics->height;
+ line_bits = width * decoder->bit_depth;
+
if ( x_pos < 0 || x_pos + width > bit_width ||
y_pos < 0 || y_pos + height > bit_height )
{
@@ -542,7 +546,7 @@
goto Exit;
}
- if ( p + ( ( width * height + 7 ) >> 3 ) > limit )
+ if ( p + ( ( line_bits * height + 7 ) >> 3 ) > limit )
{
error = SFNT_Err_Invalid_File_Format;
goto Exit;
@@ -561,13 +565,13 @@
for ( h = height; h > 0; h--, line += pitch )
{
FT_Byte* write = line;
- FT_Int w = width;
+ FT_Int w = line_bits;
/* handle initial byte (in target bitmap) specially if necessary */
if ( x_pos )
{
- w = ( width < 8 - x_pos ) ? width : 8 - x_pos;
+ w = ( line_bits < 8 - x_pos ) ? line_bits : 8 - x_pos;
if ( h == height )
{
@@ -590,7 +594,7 @@
( ~( 0xFF << w ) << ( 8 - w - x_pos ) );
rval <<= 8;
- w = width - w;
+ w = line_bits - w;
}
/* handle medial bytes */