dm changes

dm/DM.cpp

Index: dm/DM.cpp
diff --git a/dm/DM.cpp b/dm/DM.cpp
index 139e9eb82396d35e09c69bfa979a321093b694fd..c873dc047e976586db25d7d0242244ec19b8fabf 100644
--- a/dm/DM.cpp
+++ b/dm/DM.cpp
@@ -207,6 +207,8 @@ static void push_codec_srcs(Path path) {
                     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
@@ -215,6 +217,8 @@ static void push_codec_srcs(Path path) {
                   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
@@ -226,6 +230,8 @@ static void push_codec_srcs(Path path) {
             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) {
@@ -273,7 +279,7 @@ static void gather_srcs() {
                     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 

                     }
                 }
             }