Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1009)

Unified Diff: src/ports/SkFontHost_FreeType_common.cpp

Issue 977273003: Merged https://codereview.chromium.org/922273002/ to M41 (Closed) Base URL: https://skia.googlesource.com/skia.git@m41
Patch Set: Created 5 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « src/gpu/effects/GrYUVtoRGBEffect.cpp ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/ports/SkFontHost_FreeType_common.cpp
diff --git a/src/ports/SkFontHost_FreeType_common.cpp b/src/ports/SkFontHost_FreeType_common.cpp
index bd3cddf596420ae61a898636945b344d7297fd02..e03599f581fad5172858c736f318a9d71a9f092d 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));
sugoi1 2015/03/10 14:58:20 I had to also add this small fix (that's already i
const uint8_t* src = reinterpret_cast<const uint8_t*>(srcFTBitmap.buffer);
const FT_Pixel_Mode srcFormat = static_cast<FT_Pixel_Mode>(srcFTBitmap.pixel_mode);
« no previous file with comments | « src/gpu/effects/GrYUVtoRGBEffect.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698