diff options
| author | Bo Liu <boliu@google.com> | 2014-05-01 10:38:38 -0700 |
|---|---|---|
| committer | Bo Liu <boliu@google.com> | 2014-05-01 10:38:38 -0700 |
| commit | 27ab20dffff01006f5d20fdb2b3f4ea503d69114 (patch) | |
| tree | f8a42f1186f835772ed0c20a7f9095392e124b04 /core/SkRegionPriv.h | |
| parent | 51512eaae8128a677f92e2689d8df720dca13d32 (diff) | |
| parent | 2e8705638185600b128f867809b6cd034225451c (diff) | |
| download | src-idea133-weekly-release.tar.gz | |
Merge from Chromium at DEPS revision 267519idea133-weekly-release
This commit was generated by merge_to_master.py.
Change-Id: Ic063600f0ecbd8d3c74d2d514eaf91c1a33c9f07
Diffstat (limited to 'core/SkRegionPriv.h')
| -rw-r--r-- | core/SkRegionPriv.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/SkRegionPriv.h b/core/SkRegionPriv.h index f299f3a9..c8f000df 100644 --- a/core/SkRegionPriv.h +++ b/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 |