Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(627)

Side by Side Diff: src/effects/SkOffsetImageFilter.cpp

Issue 304743003: Fix filter bounds computation for SkOffsetImageFilter. (Closed) Base URL: https://skia.googlecode.com/svn/trunk
Patch Set: Cleanup Created 6 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | tests/ImageFilterTest.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright 2012 The Android Open Source Project 2 * Copyright 2012 The Android Open Source Project
3 * 3 *
4 * Use of this source code is governed by a BSD-style license that can be 4 * Use of this source code is governed by a BSD-style license that can be
5 * found in the LICENSE file. 5 * found in the LICENSE file.
6 */ 6 */
7 7
8 #include "SkOffsetImageFilter.h" 8 #include "SkOffsetImageFilter.h"
9 #include "SkBitmap.h" 9 #include "SkBitmap.h"
10 #include "SkCanvas.h" 10 #include "SkCanvas.h"
(...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after
77 } 77 }
78 78
79 bool SkOffsetImageFilter::onFilterBounds(const SkIRect& src, const SkMatrix& ctm , 79 bool SkOffsetImageFilter::onFilterBounds(const SkIRect& src, const SkMatrix& ctm ,
80 SkIRect* dst) const { 80 SkIRect* dst) const {
81 SkVector vec; 81 SkVector vec;
82 ctm.mapVectors(&vec, &fOffset, 1); 82 ctm.mapVectors(&vec, &fOffset, 1);
83 83
84 SkIRect bounds = src; 84 SkIRect bounds = src;
85 bounds.offset(-SkScalarCeilToInt(vec.fX), -SkScalarCeilToInt(vec.fY)); 85 bounds.offset(-SkScalarCeilToInt(vec.fX), -SkScalarCeilToInt(vec.fY));
86 bounds.join(src); 86 bounds.join(src);
87 if (getInput(0)) {
88 return getInput(0)->filterBounds(bounds, ctm, dst);
89 }
87 *dst = bounds; 90 *dst = bounds;
88 return true; 91 return true;
89 } 92 }
90 93
91 void SkOffsetImageFilter::flatten(SkWriteBuffer& buffer) const { 94 void SkOffsetImageFilter::flatten(SkWriteBuffer& buffer) const {
92 this->INHERITED::flatten(buffer); 95 this->INHERITED::flatten(buffer);
93 buffer.writePoint(fOffset); 96 buffer.writePoint(fOffset);
94 } 97 }
95 98
96 SkOffsetImageFilter::SkOffsetImageFilter(SkScalar dx, SkScalar dy, SkImageFilter * input, 99 SkOffsetImageFilter::SkOffsetImageFilter(SkScalar dx, SkScalar dy, SkImageFilter * input,
97 const CropRect* cropRect) : INHERITED(i nput, cropRect) { 100 const CropRect* cropRect) : INHERITED(i nput, cropRect) {
98 fOffset.set(dx, dy); 101 fOffset.set(dx, dy);
99 } 102 }
100 103
101 SkOffsetImageFilter::SkOffsetImageFilter(SkReadBuffer& buffer) 104 SkOffsetImageFilter::SkOffsetImageFilter(SkReadBuffer& buffer)
102 : INHERITED(1, buffer) { 105 : INHERITED(1, buffer) {
103 buffer.readPoint(&fOffset); 106 buffer.readPoint(&fOffset);
104 buffer.validate(SkScalarIsFinite(fOffset.fX) && 107 buffer.validate(SkScalarIsFinite(fOffset.fX) &&
105 SkScalarIsFinite(fOffset.fY)); 108 SkScalarIsFinite(fOffset.fY));
106 } 109 }
OLDNEW
« no previous file with comments | « no previous file | tests/ImageFilterTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698