SkJpegCodec

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 179 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));
-            // Intentional fall through
-            // FIXME: Is this a long term solution for testing wbmps decodes to kIndex8?
+            break;
+            // Disallowing fall through
+            // FIXME: Without fall through we skip testing wbmp decodes to kIndex8.
+            //        With fall through we test jpg decodes to kIndex8, which are disallowed.

[scroggo, 2015/04/10 17:19:05]

Won't we just return Error::Nonfatal?

[msarett, 2015/04/13 20:54:04]

This code from my last CL was actually buggy.  It would decode to kGray in both
the kGrayscale_Always case and the kIndex_Always case.  Except in the
kIndex_Always case it would *say* that it decoded to kIndex.

I didn't catch this until I ran jpegs through it because I knew jpegs couldn't
possibly be decoded to kIndex.

My fix was to disallow fall through and add checks to DMSrcSink.  That
was probably overkill.  All I need to do, as you mentioned, is to keep the fall
through and set the color type to kIndex in the kIndexAlways case etc.

Then we will just get the Error:Nonfatal in conversion possible.

             // 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));
         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));
 }
 
 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", "png", "ico", "wbmp",
-        "BMP", "GIF", "PNG", "ICO", "WBMP"
+        "bmp", "gif", "jpg", "jpeg", "png", "ico", "wbmp",
+        "BMP", "GIF", "JPG", "JPEG", "PNG", "ICO", "WBMP"
     };
 
     for (uint32_t i = 0; i < SK_ARRAY_COUNT(exts); i++) {
         if (0 == strcmp(exts[i], ext)) {
             return true;
         }
     }
     return false;
 }
 
@@ skipping 506 matching lines @@
     }
     return 0;
 }
 
 #if !defined(SK_BUILD_FOR_IOS)
 int main(int argc, char** argv) {
     SkCommandLineFlags::Parse(argc, argv);
     return dm_main();
 }
 #endif