summaryrefslogtreecommitdiffstats
path: root/media/tests/omxjpegdecoder
diff options
context:
space:
mode:
authorLeon Scroggins III <scroggo@google.com>2013-12-03 16:26:51 -0500
committerLeon Scroggins III <scroggo@google.com>2014-01-15 11:37:04 -0500
commit8790be6de3644e332ec6a17c855da89ffc13a9bf (patch)
tree45dd6bf1f37585b02335b9ed5e35d35463c2a650 /media/tests/omxjpegdecoder
parentcae6b43b03d0be44c6e63ed1db5ef835633a3b86 (diff)
downloadframeworks_base-8790be6de3644e332ec6a17c855da89ffc13a9bf.zip
frameworks_base-8790be6de3644e332ec6a17c855da89ffc13a9bf.tar.gz
frameworks_base-8790be6de3644e332ec6a17c855da89ffc13a9bf.tar.bz2
Remove calls to deprecated SkBitmap::setIsOpaque()
setIsOpaque() has been removed from ToT Skia. Update setters for mIsPremultiplied and hasAlpha to take the other into consideration. Change-Id: I1b36b0b0ce7126031eb7b769b563c17dcd4b306a
Diffstat (limited to 'media/tests/omxjpegdecoder')
-rw-r--r--media/tests/omxjpegdecoder/omx_jpeg_decoder.cpp4
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(