diff --git a/include/core/SkTemplates.h b/include/core/SkTemplates.h
index 3060f9ef27..a06c856a32 100644
--- a/include/core/SkTemplates.h
+++ b/include/core/SkTemplates.h
@@ -66,7 +66,9 @@ template <typename D, typename S> static D* SkTAddOffset(S* ptr, size_t byteOffs
 
 /** Returns true if the source value 's' will fit in the destination type 'D'. */
 template <typename D, typename S> inline bool SkTFitsIn(S s) {
-    return static_cast<D>(s) == s;
+    // the cast to <S> is just to restore the signedness of S, to avoid
+    // sign-unsigned comparison warnings.
+    return static_cast<S>(static_cast<D>(s)) == s;
 }
 
 /** \class SkAutoTCallVProc