i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

app_server: fix build with Freetype 2.5.5.

Browse Source
This commit is contained in:
Jérôme Duval
2015-01-10 19:35:40 +01:00
parent 85d8fa4988
commit 683d99b0a6
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/servers/app/font/FontEngine.cpp
+7 -7
View File
@@ -301,10 +301,10 @@ decompose_ft_bitmap_mono(const FT_Bitmap& bitmap, int x, int y,
y += bitmap.rows; y += bitmap.rows;
pitch = -pitch; pitch = -pitch;
} }
for (int i = 0; i < bitmap.rows; i++) { for (unsigned int i = 0; i < bitmap.rows; i++) {
sl.reset_spans(); sl.reset_spans();
agg::bitset_iterator bits(buf, 0); agg::bitset_iterator bits(buf, 0);
for (int j = 0; j < bitmap.width; j++) { for (unsigned int j = 0; j < bitmap.width; j++) {
if (bits.bit()) if (bits.bit())
sl.add_cell(x + j, agg::cover_full); sl.add_cell(x + j, agg::cover_full);
++bits; ++bits;
@@ -332,20 +332,20 @@ decompose_ft_bitmap_gray8(const FT_Bitmap& bitmap, int x, int y,
y += bitmap.rows; y += bitmap.rows;
pitch = -pitch; pitch = -pitch;
} }
for (int i = 0; i < bitmap.rows; i++) { for (unsigned int i = 0; i < bitmap.rows; i++) {
sl.reset_spans(); sl.reset_spans();
if (bitmap.pixel_mode == FT_PIXEL_MODE_MONO) { if (bitmap.pixel_mode == FT_PIXEL_MODE_MONO) {
// font has built-in mono bitmap // font has built-in mono bitmap
agg::bitset_iterator bits(buf, 0); agg::bitset_iterator bits(buf, 0);
for (int j = 0; j < bitmap.width; j++) { for (unsigned int j = 0; j < bitmap.width; j++) {
if (bits.bit()) if (bits.bit())
sl.add_cell(x + j, agg::cover_full); sl.add_cell(x + j, agg::cover_full);
++bits; ++bits;
} }
} else { } else {
const uint8* p = buf; const uint8* p = buf;
for (int j = 0; j < bitmap.width; j++) { for (unsigned int j = 0; j < bitmap.width; j++) {
if (*p) if (*p)
sl.add_cell(x + j, *p); sl.add_cell(x + j, *p);
++p; ++p;
@@ -378,13 +378,13 @@ decompose_ft_bitmap_subpix(const FT_Bitmap& bitmap, int x, int y,
pitch = -pitch; pitch = -pitch;
} }
for (int i = 0; i < bitmap.rows; i++) { for (unsigned int i = 0; i < bitmap.rows; i++) {
sl.reset_spans(); sl.reset_spans();
if (bitmap.pixel_mode == FT_PIXEL_MODE_MONO) { if (bitmap.pixel_mode == FT_PIXEL_MODE_MONO) {
// font has built-in mono bitmap // font has built-in mono bitmap
agg::bitset_iterator bits(buf, 0); agg::bitset_iterator bits(buf, 0);
for (int j = 0; j < bitmap.width; j++) { for (unsigned int j = 0; j < bitmap.width; j++) {
if (bits.bit()) { if (bits.bit()) {
sl.add_cell(x + j, sl.add_cell(x + j,
agg::cover_full, agg::cover_full, agg::cover_full); agg::cover_full, agg::cover_full, agg::cover_full);