| Index: include/effects/SkMergeImageFilter.h
|
| diff --git a/include/effects/SkMergeImageFilter.h b/include/effects/SkMergeImageFilter.h
|
| index 74cf561fd73536e2c8ccecdabbebce972185a8ae..36eaaf3df1776c7b61b47205ab8811efad3275b4 100755
|
| --- a/include/effects/SkMergeImageFilter.h
|
| +++ b/include/effects/SkMergeImageFilter.h
|
| @@ -29,7 +29,7 @@ protected:
|
| virtual void flatten(SkWriteBuffer&) const SK_OVERRIDE;
|
|
|
| virtual bool onFilterImage(Proxy*, const SkBitmap& src, const SkMatrix&,
|
| - SkBitmap* result, SkIPoint* loc) SK_OVERRIDE;
|
| + SkBitmap* result, SkIPoint* loc) const SK_OVERRIDE;
|
| private:
|
| uint8_t* fModes; // SkXfermode::Mode
|
|
|
|
|