aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/ports
diff options
context:
space:
mode:
authorGravatar joshualitt <joshualitt@chromium.org>2015-02-24 13:43:00 -0800
committerGravatar Commit bot <commit-bot@chromium.org>2015-02-24 13:43:00 -0800
commit4b583ac54b92ad6e7685bdfa2b68e7dd11ba0d28 (patch)
treef900200b0ed2f94911d26321e96b062af909a83d /src/ports
parent6065b88d1cb17ec2bfefbb34378acf6337f233a1 (diff)
FreeType uses unsigned int, Skia uses int.
Fix warning about assert which compared signed and unsigned. Review URL: https://codereview.chromium.org/956623004
Diffstat (limited to 'src/ports')
-rw-r--r--src/ports/SkFontHost_FreeType_common.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/ports/SkFontHost_FreeType_common.cpp b/src/ports/SkFontHost_FreeType_common.cpp
index bd3cddf596..e03599f581 100644
--- a/src/ports/SkFontHost_FreeType_common.cpp
+++ b/src/ports/SkFontHost_FreeType_common.cpp
@@ -177,8 +177,8 @@ static void copyFT2LCD16(const FT_Bitmap& bitmap, const SkMask& mask, int lcdIsB
* TODO: All of these N need to be Y or otherwise ruled out.
*/
static void copyFTBitmap(const FT_Bitmap& srcFTBitmap, SkMask& dstMask) {
- SkASSERT(dstMask.fBounds.width() == srcFTBitmap.width);
- SkASSERT(dstMask.fBounds.height() == srcFTBitmap.rows);
+ SkASSERT(dstMask.fBounds.width() == static_cast<int>(srcFTBitmap.width));
+ SkASSERT(dstMask.fBounds.height() == static_cast<int>(srcFTBitmap.rows));
const uint8_t* src = reinterpret_cast<const uint8_t*>(srcFTBitmap.buffer);
const FT_Pixel_Mode srcFormat = static_cast<FT_Pixel_Mode>(srcFTBitmap.pixel_mode);