summaryrefslogtreecommitdiffstats
path: root/media/tests
diff options
context:
space:
mode:
authorYing Wang <wangying@google.com>2014-06-20 17:30:45 -0700
committerYing Wang <wangying@google.com>2014-06-20 17:30:45 -0700
commit7c0e6219c3c812354a507dd3db7a741a6e33b073 (patch)
treead40ea4030f160e697ea528746e8c0a5701cfda0 /media/tests
parent07f08d5043648192c911bd170d7e28bddaff4eac (diff)
downloadframeworks_base-7c0e6219c3c812354a507dd3db7a741a6e33b073.zip
frameworks_base-7c0e6219c3c812354a507dd3db7a741a6e33b073.tar.gz
frameworks_base-7c0e6219c3c812354a507dd3db7a741a6e33b073.tar.bz2
Fix build.
Change-Id: I2b161a4020862d83347d5a8989467c612fff08db
Diffstat (limited to 'media/tests')
-rw-r--r--media/tests/omxjpegdecoder/omx_jpeg_decoder.cpp5
1 files changed, 2 insertions, 3 deletions
diff --git a/media/tests/omxjpegdecoder/omx_jpeg_decoder.cpp b/media/tests/omxjpegdecoder/omx_jpeg_decoder.cpp
index b8b6c04..229bfdb 100644
--- a/media/tests/omxjpegdecoder/omx_jpeg_decoder.cpp
+++ b/media/tests/omxjpegdecoder/omx_jpeg_decoder.cpp
@@ -105,7 +105,7 @@ bool OmxJpegImageDecoder::onDecode(SkStream* stream,
meta->findInt32(kKeyWidth, &width);
meta->findInt32(kKeyHeight, &height);
configBitmapSize(
- bm, SkColorTypeToBitmapConfig(getPrefColorType(k32Bit_SrcDepth, false)),
+ bm, getPrefColorType(k32Bit_SrcDepth, false),
width, height);
// mode == DecodeBounds
@@ -173,6 +173,5 @@ void OmxJpegImageDecoder::configBitmapSize(SkBitmap* bm, SkColorType pref,
int width, int height) {
// Set the color space to ARGB_8888 for now (ignoring pref)
// because of limitation in hardware support.
- bm->setInfo(SkImageInfo::MakeN32(width, height, kOpaque_SkAlphaType);
+ bm->setInfo(SkImageInfo::MakeN32(width, height, kOpaque_SkAlphaType));
}
-