[haiku-commits] haiku: hrev48655 - src/servers/app/font
- From: jerome.duval@xxxxxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Sat, 10 Jan 2015 19:45:05 +0100 (CET)
hrev48655 adds 1 changeset to branch 'master'
old head: 85d8fa4988f78a58df1cd6ad64a59f48336c1eb4
new head: 683d99b0a6da7eb1aafe464e52e8d1d1d609b266
overview: http://cgit.haiku-os.org/haiku/log/?qt=range&q=683d99b+%5E85d8fa4
----------------------------------------------------------------------------
683d99b: app_server: fix build with Freetype 2.5.5.
[ Jérôme Duval <jerome.duval@xxxxxxxxx> ]
----------------------------------------------------------------------------
Revision: hrev48655
Commit: 683d99b0a6da7eb1aafe464e52e8d1d1d609b266
URL: http://cgit.haiku-os.org/haiku/commit/?id=683d99b
Author: Jérôme Duval <jerome.duval@xxxxxxxxx>
Date: Sat Jan 10 18:35:40 2015 UTC
----------------------------------------------------------------------------
1 file changed, 7 insertions(+), 7 deletions(-)
src/servers/app/font/FontEngine.cpp | 14 +++++++-------
----------------------------------------------------------------------------
diff --git a/src/servers/app/font/FontEngine.cpp
b/src/servers/app/font/FontEngine.cpp
index 1c56987..de04a5c 100644
--- a/src/servers/app/font/FontEngine.cpp
+++ b/src/servers/app/font/FontEngine.cpp
@@ -301,10 +301,10 @@ decompose_ft_bitmap_mono(const FT_Bitmap& bitmap, int x,
int y,
y += bitmap.rows;
pitch = -pitch;
}
- for (int i = 0; i < bitmap.rows; i++) {
+ for (unsigned int i = 0; i < bitmap.rows; i++) {
sl.reset_spans();
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())
sl.add_cell(x + j, agg::cover_full);
++bits;
@@ -332,20 +332,20 @@ decompose_ft_bitmap_gray8(const FT_Bitmap& bitmap, int x,
int y,
y += bitmap.rows;
pitch = -pitch;
}
- for (int i = 0; i < bitmap.rows; i++) {
+ for (unsigned int i = 0; i < bitmap.rows; i++) {
sl.reset_spans();
if (bitmap.pixel_mode == FT_PIXEL_MODE_MONO) {
// font has built-in mono bitmap
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())
sl.add_cell(x + j, agg::cover_full);
++bits;
}
} else {
const uint8* p = buf;
- for (int j = 0; j < bitmap.width; j++) {
+ for (unsigned int j = 0; j < bitmap.width; j++) {
if (*p)
sl.add_cell(x + j, *p);
++p;
@@ -378,13 +378,13 @@ decompose_ft_bitmap_subpix(const FT_Bitmap& bitmap, int
x, int y,
pitch = -pitch;
}
- for (int i = 0; i < bitmap.rows; i++) {
+ for (unsigned int i = 0; i < bitmap.rows; i++) {
sl.reset_spans();
if (bitmap.pixel_mode == FT_PIXEL_MODE_MONO) {
// font has built-in mono bitmap
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()) {
sl.add_cell(x + j,
agg::cover_full,
agg::cover_full, agg::cover_full);
Other related posts:
- » [haiku-commits] haiku: hrev48655 - src/servers/app/font - jerome . duval
