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

Unified Diff: src/gpu/SkGrFontScaler.cpp

Issue 27192003: Start cleaning up 64bit Win warnings (Closed) Base URL: http://skia.googlecode.com/svn/trunk/
Patch Set: revertedGrBytesPerPixel to returning a size_t Created 7 years, 2 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/GrResourceCache.cpp ('k') | src/gpu/gl/GrGpuGL.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/gpu/SkGrFontScaler.cpp
===================================================================
--- src/gpu/SkGrFontScaler.cpp (revision 11758)
+++ src/gpu/SkGrFontScaler.cpp (working copy)
@@ -52,7 +52,7 @@
const SkDescriptor* srcDesc = ((const SkGrDescKey*)&rh)->fDesc;
size_t lenLH = fDesc->getLength();
size_t lenRH = srcDesc->getLength();
- int cmp = memcmp(fDesc, srcDesc, SkMin32(lenLH, lenRH));
+ int cmp = memcmp(fDesc, srcDesc, SkTMin<size_t>(lenLH, lenRH));
if (0 == cmp) {
return lenLH < lenRH;
} else {
« no previous file with comments | « src/gpu/GrResourceCache.cpp ('k') | src/gpu/gl/GrGpuGL.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698