Commit df485774fbbc7fd7dc9d3b278846f454654ad5df
2014-11-19T21:21:23
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.
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 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169
diff --git a/ChangeLog b/ChangeLog
index 1f5973c..a3b6db2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
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'.
* src/base/ftbitmap.c (FT_Bitmap_Embolden) <FT_PIXEL_MODE_GRAY[24]>:
diff --git a/src/base/ftbitmap.c b/src/base/ftbitmap.c
index 1099860..59ca14e 100644
--- a/src/base/ftbitmap.c
+++ b/src/base/ftbitmap.c
@@ -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;