Chromium Code Reviews| Index: src/core/SkRegion.cpp |
| diff --git a/src/core/SkRegion.cpp b/src/core/SkRegion.cpp |
| index baedf2aea82c2f06a49db288bdaeaa22f243339b..98670b6b520e003f46f46618391a90c8feb01c6e 100644 |
| --- a/src/core/SkRegion.cpp |
| +++ b/src/core/SkRegion.cpp |
| @@ -796,7 +796,7 @@ public: |
| fTop = (SkRegion::RunType)(bottom); // just update our bottom |
| } else { |
| start[-2] = (SkRegion::RunType)(bottom); |
| - start[-1] = len >> 1; |
| + start[-1] = SkToS32(len >> 1); |
|
mtklein
2014/04/23 13:36:18
What's going on here? SkRegion::RunType is an int
reed1
2014/04/23 14:04:22
It is an int32_t
|
| fPrevDst = start; |
| fPrevLen = len; |
| } |
| @@ -1212,7 +1212,7 @@ static void compute_bounds(const SkRegion::RunType runs[], |
| const SkRegion::RunType* prev = runs; |
| runs = skip_intervals_slow(runs); |
| - int intervals = (runs - prev) >> 1; |
| + int intervals = SkToInt((runs - prev) >> 1); |
| SkASSERT(prev[-1] == intervals); |
| intervalCount += intervals; |