| Index: src/effects/SkMergeImageFilter.cpp
|
| diff --git a/src/effects/SkMergeImageFilter.cpp b/src/effects/SkMergeImageFilter.cpp
|
| index 020533046df7500e4fd2923cb51ed7230bce1a55..7d12ebe06efecf2ef8d390a86fbf793053d34b1a 100755
|
| --- a/src/effects/SkMergeImageFilter.cpp
|
| +++ b/src/effects/SkMergeImageFilter.cpp
|
| @@ -40,7 +40,7 @@ void SkMergeImageFilter::initModes(const SkXfermode::Mode modes[]) {
|
|
|
| SkMergeImageFilter::SkMergeImageFilter(SkImageFilter* first, SkImageFilter* second,
|
| SkXfermode::Mode mode,
|
| - const SkIRect* cropRect) : INHERITED(first, second, cropRect) {
|
| + const CropRect* cropRect) : INHERITED(first, second, cropRect) {
|
| if (SkXfermode::kSrcOver_Mode != mode) {
|
| SkXfermode::Mode modes[] = { mode, mode };
|
| this->initModes(modes);
|
| @@ -51,7 +51,7 @@ SkMergeImageFilter::SkMergeImageFilter(SkImageFilter* first, SkImageFilter* seco
|
|
|
| SkMergeImageFilter::SkMergeImageFilter(SkImageFilter* filters[], int count,
|
| const SkXfermode::Mode modes[],
|
| - const SkIRect* cropRect) : INHERITED(count, filters, cropRect) {
|
| + const CropRect* cropRect) : INHERITED(count, filters, cropRect) {
|
| this->initModes(modes);
|
| }
|
|
|
|
|