| Index: tests/ImageFilterTest.cpp.rej
|
| diff --git a/tests/ImageFilterTest.cpp.rej b/tests/ImageFilterTest.cpp.rej
|
| deleted file mode 100644
|
| index 39d115210de87d4d175cf8d4ab7d2c3b68cd5e24..0000000000000000000000000000000000000000
|
| --- a/tests/ImageFilterTest.cpp.rej
|
| +++ /dev/null
|
| @@ -1,20 +0,0 @@
|
| -*************** public:
|
| -*** 231,237 ****
|
| - cropRect).release());
|
| - }
|
| - this->addFilter("xfermode", SkXfermodeImageFilter::Make(
|
| -- SkXfermode::Make(SkXfermode::kSrc_Mode), input, input, cropRect).release());
|
| - }
|
| - int count() const { return fFilters.count(); }
|
| - SkImageFilter* getFilter(int index) const { return fFilters[index].fFilter.get(); }
|
| ---- 231,240 ----
|
| - cropRect).release());
|
| - }
|
| - this->addFilter("xfermode", SkXfermodeImageFilter::Make(
|
| -+ SkXfermode::Make(SkXfermode::kSrc_Mode),
|
| -+ sk_ref_sp<SkImageFilter>(input),
|
| -+ sk_ref_sp<SkImageFilter>(input),
|
| -+ cropRect).release());
|
| - }
|
| - int count() const { return fFilters.count(); }
|
| - SkImageFilter* getFilter(int index) const { return fFilters[index].fFilter.get(); }
|
|
|