diff options
author | 2014-04-07 15:11:08 +0000 | |
---|---|---|
committer | 2014-04-07 15:11:08 +0000 | |
commit | b55444054317d7f836da048241266fdaca442d1d (patch) | |
tree | 64937d38f892f9cabdc0fc3c0333aa7566972b1e /src | |
parent | 622eda7373796084c554bcb7bbfa38ffb6cbd199 (diff) |
Remove SkResizeImageFilter.
Its functionality has been subsumed by SkMatrixImageFilter, and it's no longer
used in Blink.
BUG=skia:
R=bsalomon@google.com
Author: senorblanco@chromium.org
Review URL: https://codereview.chromium.org/222923005
git-svn-id: http://skia.googlecode.com/svn/trunk@14073 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src')
-rw-r--r-- | src/effects/SkResizeImageFilter.cpp | 113 | ||||
-rw-r--r-- | src/ports/SkGlobalInitialization_chromium.cpp | 2 | ||||
-rw-r--r-- | src/ports/SkGlobalInitialization_default.cpp | 2 |
3 files changed, 0 insertions, 117 deletions
diff --git a/src/effects/SkResizeImageFilter.cpp b/src/effects/SkResizeImageFilter.cpp deleted file mode 100644 index 7a52c223b4..0000000000 --- a/src/effects/SkResizeImageFilter.cpp +++ /dev/null @@ -1,113 +0,0 @@ -/* - * Copyright 2013 The Android Open Source Project - * - * Use of this source code is governed by a BSD-style license that can be - * found in the LICENSE file. - */ - -#include "SkResizeImageFilter.h" -#include "SkBitmap.h" -#include "SkCanvas.h" -#include "SkDevice.h" -#include "SkColorPriv.h" -#include "SkReadBuffer.h" -#include "SkWriteBuffer.h" -#include "SkMatrix.h" -#include "SkRect.h" - -SkResizeImageFilter::SkResizeImageFilter(SkScalar sx, SkScalar sy, SkPaint::FilterLevel filterLevel, - SkImageFilter* input) - : INHERITED(input), - fSx(sx), - fSy(sy), - fFilterLevel(filterLevel) { -} - -SkResizeImageFilter::SkResizeImageFilter(SkReadBuffer& buffer) - : INHERITED(1, buffer) { - fSx = buffer.readScalar(); - fSy = buffer.readScalar(); - fFilterLevel = static_cast<SkPaint::FilterLevel>(buffer.readInt()); -} - -void SkResizeImageFilter::flatten(SkWriteBuffer& buffer) const { - this->INHERITED::flatten(buffer); - buffer.writeScalar(fSx); - buffer.writeScalar(fSy); - buffer.writeInt(fFilterLevel); -} - -SkResizeImageFilter::~SkResizeImageFilter() { -} - -bool SkResizeImageFilter::onFilterImage(Proxy* proxy, - const SkBitmap& source, - const Context& ctx, - SkBitmap* result, - SkIPoint* offset) const { - SkBitmap src = source; - SkIPoint srcOffset = SkIPoint::Make(0, 0); - if (getInput(0) && !getInput(0)->filterImage(proxy, source, ctx, &src, &srcOffset)) { - return false; - } - - SkRect dstRect; - SkIRect srcBounds, dstBounds; - src.getBounds(&srcBounds); - srcBounds.offset(srcOffset); - SkRect srcRect = SkRect::Make(srcBounds); - SkMatrix matrix; - if (!ctx.ctm().invert(&matrix)) { - return false; - } - matrix.postScale(fSx, fSy); - matrix.postConcat(ctx.ctm()); - matrix.mapRect(&dstRect, srcRect); - dstRect.roundOut(&dstBounds); - - SkAutoTUnref<SkBaseDevice> device(proxy->createDevice(dstBounds.width(), dstBounds.height())); - if (NULL == device.get()) { - return false; - } - - SkCanvas canvas(device.get()); - canvas.scale(fSx, fSy); - SkPaint paint; - - paint.setXfermodeMode(SkXfermode::kSrc_Mode); - paint.setFilterLevel(fFilterLevel); - canvas.drawBitmap(src, 0, 0, &paint); - - *result = device.get()->accessBitmap(false); - offset->fX = dstBounds.fLeft; - offset->fY = dstBounds.fTop; - return true; -} - -void SkResizeImageFilter::computeFastBounds(const SkRect& src, SkRect* dst) const { - SkRect bounds = src; - if (getInput(0)) { - getInput(0)->computeFastBounds(src, &bounds); - } - dst->setXYWH(bounds.x(), bounds.y(), bounds.width() * fSx, bounds.height() * fSy); -} - -bool SkResizeImageFilter::onFilterBounds(const SkIRect& src, const SkMatrix& ctm, - SkIRect* dst) const { - SkMatrix matrix; - if (!ctm.invert(&matrix)) { - return false; - } - matrix.postScale(SkScalarInvert(fSx), SkScalarInvert(fSy)); - matrix.postConcat(ctm); - SkRect floatBounds; - matrix.mapRect(&floatBounds, SkRect::Make(src)); - SkIRect bounds; - floatBounds.roundOut(&bounds); - if (getInput(0) && !getInput(0)->filterBounds(bounds, ctm, &bounds)) { - return false; - } - - *dst = bounds; - return true; -} diff --git a/src/ports/SkGlobalInitialization_chromium.cpp b/src/ports/SkGlobalInitialization_chromium.cpp index cb257e5d27..d0900a8f09 100644 --- a/src/ports/SkGlobalInitialization_chromium.cpp +++ b/src/ports/SkGlobalInitialization_chromium.cpp @@ -53,7 +53,6 @@ #include "SkPictureImageFilter.h" #include "SkPixelXorXfermode.h" #include "SkRectShaderImageFilter.h" -#include "SkResizeImageFilter.h" #include "SkStippleMaskFilter.h" #include "SkTableColorFilter.h" #include "SkTestImageFilters.h" @@ -93,7 +92,6 @@ static void InitializeFlattenables(int*) { SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkPictureImageFilter) SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkPixelXorXfermode) SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkRectShaderImageFilter) - SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkResizeImageFilter) SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkStippleMaskFilter) SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkSumPathEffect) SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkTileImageFilter) diff --git a/src/ports/SkGlobalInitialization_default.cpp b/src/ports/SkGlobalInitialization_default.cpp index cb257e5d27..d0900a8f09 100644 --- a/src/ports/SkGlobalInitialization_default.cpp +++ b/src/ports/SkGlobalInitialization_default.cpp @@ -53,7 +53,6 @@ #include "SkPictureImageFilter.h" #include "SkPixelXorXfermode.h" #include "SkRectShaderImageFilter.h" -#include "SkResizeImageFilter.h" #include "SkStippleMaskFilter.h" #include "SkTableColorFilter.h" #include "SkTestImageFilters.h" @@ -93,7 +92,6 @@ static void InitializeFlattenables(int*) { SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkPictureImageFilter) SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkPixelXorXfermode) SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkRectShaderImageFilter) - SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkResizeImageFilter) SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkStippleMaskFilter) SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkSumPathEffect) SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkTileImageFilter) |