diff options
| author | Mike Reed <reed@google.com> | 2014-07-07 18:06:18 -0400 |
|---|---|---|
| committer | Mike Reed <reed@google.com> | 2014-07-07 18:11:24 -0400 |
| commit | 42a1d08df7d417fd4e67eabc91ff05ee77fd9995 (patch) | |
| tree | 7bfa7e66b153087c56b19c6dd8b340e0ea2ddb42 /media/tests | |
| parent | 95f621a1a4a0891075f1f9daf8e0323aab488793 (diff) | |
| download | frameworks_base-42a1d08df7d417fd4e67eabc91ff05ee77fd9995.zip frameworks_base-42a1d08df7d417fd4e67eabc91ff05ee77fd9995.tar.gz frameworks_base-42a1d08df7d417fd4e67eabc91ff05ee77fd9995.tar.bz2 | |
SkBitmap::Config is deprecated, use SkColorType
Change-Id: Ida181d2aac760072cf2d01409edac37699dea216
Diffstat (limited to 'media/tests')
| -rw-r--r-- | media/tests/omxjpegdecoder/jpeg_decoder_bench.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/media/tests/omxjpegdecoder/jpeg_decoder_bench.cpp b/media/tests/omxjpegdecoder/jpeg_decoder_bench.cpp index 7537e35..de6294d 100644 --- a/media/tests/omxjpegdecoder/jpeg_decoder_bench.cpp +++ b/media/tests/omxjpegdecoder/jpeg_decoder_bench.cpp @@ -52,11 +52,11 @@ static int64_t getNowUs() { int testDecodeBounds(SkImageDecoder* decoder, SkStream* stream, SkBitmap* bitmap) { int64_t startTime = getNowUs(); - SkBitmap::Config prefConfig = SkBitmap::kARGB_8888_Config; + SkColorType prefColorType = kN32_SkColorType; SkImageDecoder::Mode decodeMode = SkImageDecoder::kDecodeBounds_Mode; // Decode the input stream and then use the bitmap. - if (!decoder->decode(stream, bitmap, prefConfig, decodeMode)) { + if (!decoder->decode(stream, bitmap, prefColorType, decodeMode)) { return nullObjectReturn("decoder->decode returned false"); } else { int64_t delay = getNowUs() - startTime; @@ -69,11 +69,11 @@ int testDecodeBounds(SkImageDecoder* decoder, SkStream* stream, int testDecodePixels(SkImageDecoder* decoder, SkStream* stream, SkBitmap* bitmap) { int64_t startTime = getNowUs(); - SkBitmap::Config prefConfig = SkBitmap::kARGB_8888_Config; + SkColorType prefColorType = kN32_SkColorType; SkImageDecoder::Mode decodeMode = SkImageDecoder::kDecodePixels_Mode; // Decode the input stream and then use the bitmap. - if (!decoder->decode(stream, bitmap, prefConfig, decodeMode)) { + if (!decoder->decode(stream, bitmap, prefColorType, decodeMode)) { return nullObjectReturn("decoder->decode returned false"); } else { int64_t delay = getNowUs() - startTime; |