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

Unified Diff: src/core/SkRegionPriv.h

Issue 247753003: fix size_t/int warnings (Closed) Base URL: https://skia.googlecode.com/svn/trunk
Patch Set: revert name-change in swap32 Created 6 years, 8 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/core/SkRegion.cpp ('k') | src/core/SkScalerContext.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/core/SkRegionPriv.h
diff --git a/src/core/SkRegionPriv.h b/src/core/SkRegionPriv.h
index f299f3a9d695ba559546d7ab6122959fde4c8c9d..c8f000df35e6eeb0c7b98b04adf9f29d2294532e 100644
--- a/src/core/SkRegionPriv.h
+++ b/src/core/SkRegionPriv.h
@@ -29,7 +29,7 @@ static int compute_intervalcount(const SkRegion::RunType runs[]) {
SkASSERT(curr[1] < SkRegion::kRunTypeSentinel);
curr += 2;
}
- return (curr - runs) >> 1;
+ return SkToInt((curr - runs) >> 1);
}
#endif
@@ -213,7 +213,7 @@ public:
#ifdef SK_DEBUG
// +1 to skip the last Y-sentinel
- int runCount = runs - this->writable_runs() + 1;
+ int runCount = SkToInt(runs - this->writable_runs() + 1);
SkASSERT(runCount == fRunCount);
#endif
« no previous file with comments | « src/core/SkRegion.cpp ('k') | src/core/SkScalerContext.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698