Index: bench/nanobench.cpp |
diff --git a/bench/nanobench.cpp b/bench/nanobench.cpp |
index d6c4c596c1a6d59fb5e4a0242f8be7d3fd7f762b..e0858e3e58665c23af8d8af5c205de9b0228c4f2 100644 |
--- a/bench/nanobench.cpp |
+++ b/bench/nanobench.cpp |
@@ -621,10 +621,10 @@ public: |
// Choose the candidate color types for image decoding |
const SkColorType colorTypes[] = |
{ kN32_SkColorType, |
- kRGB_565_SkColorType, |
+ /*kRGB_565_SkColorType, |
kAlpha_8_SkColorType, |
kIndex_8_SkColorType, |
- kGray_8_SkColorType }; |
+ kGray_8_SkColorType*/ }; |
fColorTypes.reset(colorTypes, SK_ARRAY_COUNT(colorTypes)); |
} |
@@ -741,9 +741,9 @@ public: |
fSourceType = "image"; |
fBenchType = "skcodec"; |
const SkString& path = fImages[fCurrentCodec]; |
- if (SkCommandLineFlags::ShouldSkip(FLAGS_match, path.c_str())) { |
- continue; |
- } |
+ //if (SkCommandLineFlags::ShouldSkip(FLAGS_match, path.c_str())) { |
+ // continue; |
+ //} |
SkAutoTUnref<SkData> encoded(SkData::NewFromFileName(path.c_str())); |
SkAutoTDelete<SkCodec> codec(SkCodec::NewFromData(encoded)); |
if (!codec) { |
@@ -765,8 +765,8 @@ public: |
case kPremul_SkAlphaType: |
if (0 == fCurrentAlphaType) { |
// Test unpremul first. |
- alphaType = kUnpremul_SkAlphaType; |
- fCurrentAlphaType++; |
+ alphaType = kPremul_SkAlphaType; |
+ fCurrentColorType++; |
} else { |
// Test premul. |
alphaType = kPremul_SkAlphaType; |