aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/core/SkConfig8888.cpp
diff options
context:
space:
mode:
authorGravatar Mike Reed <reed@google.com>2016-11-28 17:17:38 -0500
committerGravatar Skia Commit-Bot <skia-commit-bot@chromium.org>2016-11-29 12:58:26 +0000
commit22f348281a202f79989447cfde45a3834649e89f (patch)
tree76d6c3c768934d87c44b022690b6e872ff154ec7 /src/core/SkConfig8888.cpp
parent2c8104eb18d15916db8f7b648bd79f7384397af9 (diff)
don't support converting from alpha to non-alpha
BUG=skia: Change-Id: Ia06bef6c0bfc03b5ca9f569c07e993da0bbd67c3 Reviewed-on: https://skia-review.googlesource.com/5288 Reviewed-by: Matt Sarett <msarett@google.com> Commit-Queue: Mike Reed <reed@google.com>
Diffstat (limited to 'src/core/SkConfig8888.cpp')
-rw-r--r--src/core/SkConfig8888.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/core/SkConfig8888.cpp b/src/core/SkConfig8888.cpp
index 9af36216cc..3906a9a1ef 100644
--- a/src/core/SkConfig8888.cpp
+++ b/src/core/SkConfig8888.cpp
@@ -324,6 +324,12 @@ bool SkPixelInfo::CopyPixels(const SkImageInfo& dstInfo, void* dstPixels, size_t
return false;
}
+ if (srcInfo.colorType() == kAlpha_8_SkColorType &&
+ dstInfo.colorType() != kAlpha_8_SkColorType)
+ {
+ return false; // can't convert from alpha to non-alpha
+ }
+
const int width = srcInfo.width();
const int height = srcInfo.height();