From 5ecd4fac89e854b85850bee1920d96c6ba1af259 Mon Sep 17 00:00:00 2001 From: "bungeman@google.com" Date: Thu, 1 Aug 2013 22:48:21 +0000 Subject: Fix SkTMin call introduced in 10500 which fails on some platforms. git-svn-id: http://skia.googlecode.com/svn/trunk@10501 2bbb7eff-a529-9590-31e7-b0007b416f81 --- src/ports/SkFontHost_FreeType.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/ports/SkFontHost_FreeType.cpp b/src/ports/SkFontHost_FreeType.cpp index f94ac82ca7..3a32ea40c4 100644 --- a/src/ports/SkFontHost_FreeType.cpp +++ b/src/ports/SkFontHost_FreeType.cpp @@ -1447,7 +1447,7 @@ size_t SkTypeface_FreeType::onGetTableData(SkFontTableTag tag, size_t offset, if (offset > tableLength) { return 0; } - FT_ULong size = SkTMin(length, tableLength - offset); + FT_ULong size = SkTMin((FT_ULong)length, tableLength - (FT_ULong)offset); if (NULL != data) { error = FT_Load_Sfnt_Table(face, tag, offset, reinterpret_cast(data), &size); if (error) { -- cgit v1.2.3