commit 5ecd4fac89e854b85850bee1920d96c6ba1af259
author bungeman@google.com <bungeman@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Thu Aug 01 22:48:21 2013 +0000
committer bungeman@google.com <bungeman@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Thu Aug 01 22:48:21 2013 +0000
tree dfc62c29163ab2d304ad9c5d0f8f0fb5b1b708d5
parent ddc218e508c4cdd16ff3461498cbbc2b5189b2be

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

diff --git a/src/ports/SkFontHost_FreeType.cpp b/src/ports/SkFontHost_FreeType.cpp
index f94ac82..3a32ea4 100644
--- a/src/ports/SkFontHost_FreeType.cpp
+++ b/src/ports/SkFontHost_FreeType.cpp
@@ -1447,7 +1447,7 @@
     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<FT_Byte*>(data), &size);
         if (error) {