diff options
| author | Leon Scroggins III <scroggo@google.com> | 2014-03-07 18:26:19 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-03-07 18:26:19 +0000 |
| commit | 42ae4cf2ce5ba02c2211813452badc07eab33735 (patch) | |
| tree | 19f59abb78c92ba4acbcd9db92670cec0e8a6a70 /media | |
| parent | 4ee594e30529b0e4a89c829488dce4d58457c371 (diff) | |
| parent | e648c19bf33ce78b3f67b7ffd95c92fd6996c418 (diff) | |
| download | frameworks_base-42ae4cf2ce5ba02c2211813452badc07eab33735.zip frameworks_base-42ae4cf2ce5ba02c2211813452badc07eab33735.tar.gz frameworks_base-42ae4cf2ce5ba02c2211813452badc07eab33735.tar.bz2 | |
Merge "resolved conflicts for merge of 8d3281f5 to klp-dev-plus-aosp" into klp-dev-plus-aosp
Diffstat (limited to 'media')
| -rw-r--r-- | media/tests/omxjpegdecoder/omx_jpeg_decoder.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/media/tests/omxjpegdecoder/omx_jpeg_decoder.cpp b/media/tests/omxjpegdecoder/omx_jpeg_decoder.cpp index 6424744..53f04bc 100644 --- a/media/tests/omxjpegdecoder/omx_jpeg_decoder.cpp +++ b/media/tests/omxjpegdecoder/omx_jpeg_decoder.cpp @@ -30,6 +30,7 @@ #include <media/stagefright/MetaData.h> #include <media/stagefright/OMXClient.h> #include <media/stagefright/OMXCodec.h> +#include <SkImage.h> #include <SkMallocPixelRef.h> #include "omx_jpeg_decoder.h" @@ -184,8 +185,7 @@ void OmxJpegImageDecoder::installPixelRef(MediaBuffer *buffer, sp<MediaSource> d void OmxJpegImageDecoder::configBitmapSize(SkBitmap* bm, SkBitmap::Config pref, int width, int height) { - bm->setConfig(getColorSpaceConfig(pref), width, height); - bm->setIsOpaque(true); + bm->setConfig(getColorSpaceConfig(pref), width, height, 0, kOpaque_SkAlphaType); } SkBitmap::Config OmxJpegImageDecoder::getColorSpaceConfig( |