diff options
| author |  Mike Reed <reed@google.com> | 2016-12-17 07:27:05 -0500 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2016-12-19 13:46:52 +0000 |
| commit | 5cbc7b913b16adf5d153ccb5febfd53369c653f3 (patch) | |
| tree | 999fb215d084770039a08da3736c0e340e26caf9 /src/core/SkPictureImageGenerator.cpp | |
| parent | a8b1e6d0688c7bc8754b0f49578144c77f5a180e (diff) | |
simplify generatescaledpixels
BUG=skia:
Change-Id: Ia1f975d8ca088a552258fd70d3333683a88bbb5f
Reviewed-on: https://skia-review.googlesource.com/6234
Reviewed-by: Florin Malita <fmalita@chromium.org>
Commit-Queue: Mike Reed <reed@google.com>
Diffstat (limited to 'src/core/SkPictureImageGenerator.cpp')
| -rw-r--r-- | src/core/SkPictureImageGenerator.cpp | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/src/core/SkPictureImageGenerator.cpp b/src/core/SkPictureImageGenerator.cpp index 8e42d275ed..4de49f03cd 100644 --- a/src/core/SkPictureImageGenerator.cpp +++ b/src/core/SkPictureImageGenerator.cpp @@ -23,7 +23,7 @@ protected: bool onGetPixels(const SkImageInfo& info, void* pixels, size_t rowBytes, SkPMColor ctable[], int* ctableCount) override; bool onComputeScaledDimensions(SkScalar scale, SupportedSizes*) override; - bool onGenerateScaledPixels(const SkISize&, const SkIPoint&, const SkPixmap&) override; + bool onGenerateScaledPixels(const SkPixmap&) override; #if SK_SUPPORT_GPU GrTexture* onGenerateTexture(GrContext*, const SkImageInfo&, const SkIPoint&) override; @@ -110,16 +110,13 @@ bool SkPictureImageGenerator::onComputeScaledDimensions(SkScalar scale, return false; } -bool SkPictureImageGenerator::onGenerateScaledPixels(const SkISize& scaledSize, - const SkIPoint& scaledOrigin, - const SkPixmap& scaledPixels) { - int w = scaledSize.width(); - int h = scaledSize.height(); +bool SkPictureImageGenerator::onGenerateScaledPixels(const SkPixmap& scaledPixels) { + int w = scaledPixels.width(); + int h = scaledPixels.height(); const SkScalar scaleX = SkIntToScalar(w) / this->getInfo().width(); const SkScalar scaleY = SkIntToScalar(h) / this->getInfo().height(); SkMatrix matrix = SkMatrix::MakeScale(scaleX, scaleY); - matrix.postTranslate(-SkIntToScalar(scaledOrigin.x()), -SkIntToScalar(scaledOrigin.y())); SkBitmap bitmap; if (!bitmap.installPixels(scaledPixels)) { |