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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: src/effects/SkMatrixConvolutionImageFilter.cpp

Issue 305133006: use colortype instead of config (Closed) Base URL: https://skia.googlecode.com/svn/trunk
Patch Set: Created 6 years, 7 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 side-by-side diff with in-line comments
Download patch
« src/effects/SkMagnifierImageFilter.cpp ('K') | « src/effects/SkMagnifierImageFilter.cpp ('k') | src/effects/SkMorphologyImageFilter.cpp » ('j') | src/effects/SkMorphologyImageFilter.cpp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/effects/SkMatrixConvolutionImageFilter.cpp
diff --git a/src/effects/SkMatrixConvolutionImageFilter.cpp b/src/effects/SkMatrixConvolutionImageFilter.cpp
index f6bc6a1f1f47c30db1a0093cfc40ce4d829e20bf..292171b3738ee06722b460b8ceb8a8de64f2ad26 100644
--- a/src/effects/SkMatrixConvolutionImageFilter.cpp
+++ b/src/effects/SkMatrixConvolutionImageFilter.cpp
@@ -238,9 +238,7 @@ static SkBitmap unpremultiplyBitmap(const SkBitmap& src)
return SkBitmap();
}
SkBitmap result;
robertphillips 2014/06/02 13:15:59 ditto
reed1 2014/06/02 19:43:06 Done.
- result.setConfig(src.config(), src.width(), src.height());
- result.allocPixels();
- if (!result.getPixels()) {
+ if (!result.allocPixels(src.info().makeWH(src.width(), src.height()))) {
return SkBitmap();
}
for (int y = 0; y < src.height(); ++y) {
« src/effects/SkMagnifierImageFilter.cpp ('K') | « src/effects/SkMagnifierImageFilter.cpp ('k') | src/effects/SkMorphologyImageFilter.cpp » ('j') | src/effects/SkMorphologyImageFilter.cpp » ('J')

Powered by Google App Engine
This is Rietveld 408576698