dm changes

dm/DM.cpp

 /*
  * Copyright 2013 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "CrashHandler.h"
 #include "DMJsonWriter.h"
 #include "DMSrcSink.h"
@@ skipping 189 matching lines @@
         return;
     }
 
     // Build additional test cases for images that decode natively to non-canvas types
     switch(codec->getInfo().colorType()) {
         case kGray_8_SkColorType:
             push_src("image", "codec_kGray8", new CodecSrc(path, CodecSrc::kNormal_Mode,
                     CodecSrc::kGrayscale_Always_DstColorType));
             push_src("image", "scanline_kGray8", new CodecSrc(path, CodecSrc::kScanline_Mode,
                     CodecSrc::kGrayscale_Always_DstColorType));
+            push_src("image", "scanline_kGray8", new CodecSrc(path, CodecSrc::kSubset_Mode,
+                    CodecSrc::kGrayscale_Always_DstColorType));
             // Intentional fall through
             // FIXME: Is this a long term solution for testing wbmps decodes to kIndex8?
             // Further discussion on this topic is at skbug.com/3683
       case kIndex_8_SkColorType:
           push_src("image", "codec_kIndex8", new CodecSrc(path, CodecSrc::kNormal_Mode,
                   CodecSrc::kIndex8_Always_DstColorType));
           push_src("image", "scanline_kIndex8", new CodecSrc(path, CodecSrc::kScanline_Mode,
                   CodecSrc::kIndex8_Always_DstColorType));
+          push_src("image", "scanline_kIndex8", new CodecSrc(path, CodecSrc::kSubset_Mode,
+                  CodecSrc::kIndex8_Always_DstColorType));
         break;
       default:
         // Do nothing
         break;
     }
 
     // Decode all images to the canvas color type
     push_src("image", "codec", new CodecSrc(path, CodecSrc::kNormal_Mode,
             CodecSrc::kGetFromCanvas_DstColorType));
     push_src("image", "scanline", new CodecSrc(path, CodecSrc::kScanline_Mode,
             CodecSrc::kGetFromCanvas_DstColorType));
+    push_src("image", "subset", new CodecSrc(path, CodecSrc::kSubset_Mode,
+            CodecSrc::kGetFromCanvas_DstColorType));
 }
 
 static bool codec_supported(const char* ext) {
     // FIXME: Once other versions of SkCodec are available, we can add them to this
     // list (and eventually we can remove this check once they are all supported).
     static const char* const exts[] = {
         "bmp", "gif", "jpg", "jpeg", "png", "ico", "wbmp",
         "BMP", "GIF", "JPG", "JPEG", "PNG", "ICO", "WBMP"
     };
 
@@ skipping 27 matching lines @@
     for (int i = 0; i < FLAGS_images.count(); i++) {
         const char* flag = FLAGS_images[i];
         if (sk_isdir(flag)) {
             for (size_t j = 0; j < SK_ARRAY_COUNT(exts); j++) {
                 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", "subset", new ImageSrc(path, 2)); // Decode into 2x2 subsets
                     if (codec_supported(exts[j])) {
-                        push_codec_srcs(path);
+                        push_codec_srcs(path); //hits bp

[scroggo, 2015/05/18 14:03:58]

Was this accidentally left in?

[emmaleeroach, 2015/05/18 20:04:27]

Yea, I removed it 

                     }
                 }
             }
         } 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", "subset", new ImageSrc(flag, 2)); // Decode into 2 x 2 subsets
             push_codec_srcs(flag);
         }
     }
@@ skipping 471 matching lines @@
     }
     return 0;
 }
 
 #if !defined(SK_BUILD_FOR_IOS)
 int main(int argc, char** argv) {
     SkCommandLineFlags::Parse(argc, argv);
     return dm_main();
 }
 #endif