| Index: dm/DM.cpp
|
| diff --git a/dm/DM.cpp b/dm/DM.cpp
|
| index c7e0934008f3b5a8b2d8dd982976d169b1c923e0..11868ec347d6e1753b55bc3fd90a27c6a182de3f 100644
|
| --- a/dm/DM.cpp
|
| +++ b/dm/DM.cpp
|
| @@ -308,10 +308,10 @@ static void push_codec_srcs(Path path) {
|
| // TODO (msarett): Implement scaling tests for SkImageDecoder in order to compare with these
|
| // tests. SkImageDecoder supports downscales by integer factors.
|
| // SkJpegCodec natively supports scaling to: 0.125, 0.25, 0.375, 0.5, 0.625, 0.75, 0.875
|
| - const float nativeScales[] = { 0.125f, 0.25f, 0.375f, 0.5f, 0.625f, 0.750f, 0.875f, 1.0f };
|
| + const float nativeScales[] = { /*0.125f, 0.25f, 0.375f, 0.5f, 0.625f, 0.750f, 0.875f,*/ 1.0f };
|
|
|
| - const CodecSrc::Mode nativeModes[] = { CodecSrc::kCodec_Mode, CodecSrc::kScanline_Mode,
|
| - CodecSrc::kStripe_Mode, CodecSrc::kSubset_Mode };
|
| + const CodecSrc::Mode nativeModes[] = { CodecSrc::kCodec_Mode, //CodecSrc::kScanline_Mode,
|
| + CodecSrc::kStripe_Mode, /*CodecSrc::kSubset_Mode*/ };
|
|
|
| CodecSrc::DstColorType colorTypes[3];
|
| uint32_t numColorTypes;
|
| @@ -360,7 +360,7 @@ static void push_codec_srcs(Path path) {
|
| }
|
| }
|
|
|
| - const int sampleSizes[] = { 1, 2, 3, 4, 5, 6, 7, 8 };
|
| + const int sampleSizes[] = { /*1, 2, 3, 4, 5, 6, 7, 8*/ };
|
|
|
| for (int sampleSize : sampleSizes) {
|
| for (uint32_t i = 0; i < numColorTypes; i++) {
|
| @@ -448,8 +448,8 @@ static void push_brd_src(Path path, SkBitmapRegionDecoder::Strategy strategy,
|
| static void push_brd_srcs(Path path) {
|
|
|
| const SkBitmapRegionDecoder::Strategy strategies[] = {
|
| - SkBitmapRegionDecoder::kCanvas_Strategy,
|
| - SkBitmapRegionDecoder::kAndroidCodec_Strategy,
|
| + //SkBitmapRegionDecoder::kCanvas_Strategy,
|
| + //SkBitmapRegionDecoder::kAndroidCodec_Strategy,
|
| };
|
|
|
| // Test on a variety of sampleSizes, making sure to include:
|
| @@ -525,7 +525,7 @@ static void gather_srcs() {
|
| SkOSFile::Iter it(flag, exts[j]);
|
| for (SkString file; it.next(&file); ) {
|
| SkString path = SkOSPath::Join(flag, file.c_str());
|
| - push_src("image", "decode", new ImageSrc(path)); // Decode entire image
|
| + //push_src("image", "decode", new ImageSrc(path)); // Decode entire image
|
| push_codec_srcs(path);
|
| if (brd_supported(exts[j])) {
|
| push_brd_srcs(path);
|
| @@ -534,9 +534,9 @@ static void gather_srcs() {
|
| }
|
| } else if (sk_exists(flag)) {
|
| // assume that FLAGS_images[i] is a valid image if it is a file.
|
| - push_src("image", "decode", new ImageSrc(flag)); // Decode entire image.
|
| + //push_src("image", "decode", new ImageSrc(flag)); // Decode entire image.
|
| push_codec_srcs(flag);
|
| - push_brd_srcs(flag);
|
| + //push_brd_srcs(flag);
|
| }
|
| }
|
| }
|
|
|