Add dm target to BUILD and refactor BUILD file. Fix blaze compilation errors.

src/codec/SkJpegCodec.cpp

 /*
  * Copyright 2015 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkCodec.h"
 #include "SkJpegCodec.h"
 #include "SkJpegDecoderMgr.h"
@@ skipping 133 matching lines @@
         JpegDecoderMgr* decoderMgr)
     : INHERITED(srcInfo, stream)
     , fDecoderMgr(decoderMgr)
     , fReadyState(decoderMgr->dinfo()->global_state)
 {}
 
 /*
  * Return the row bytes of a particular image type and width
  */
 static int get_row_bytes(const j_decompress_ptr dinfo) {
+#if defined (GOOGLE3)
+    int colorBytes = dinfo->out_color_components;
+#else
     int colorBytes = (dinfo->out_color_space == JCS_RGB565) ? 2 : dinfo->out_color_components;

[msarett, 2015/10/14 19:58:25]

RGB565 is relatively new to turbo.

I had to add this to chromium's copy from upstream not too long ago.

[dogben, 2015/10/14 23:11:06]

Acknowledged.

+#endif
     return dinfo->output_width * colorBytes;
 
 }
 
 /*
  *  Calculate output dimensions based on the provided factors.
  *
  *  Not to be used on the actual jpeg_decompress_struct used for decoding, since it will
  *  incorrectly modify num_components.
  */
@@ skipping 75 matching lines @@
     bool isCMYK = JCS_CMYK == colorSpace || JCS_YCCK == colorSpace;
 
     // Check for valid color types and set the output color space
     switch (dst.colorType()) {
         case kN32_SkColorType:
             if (isCMYK) {
                 fDecoderMgr->dinfo()->out_color_space = JCS_CMYK;
             } else {
                 // Check the byte ordering of the RGBA color space for the
                 // current platform
-#if defined(SK_PMCOLOR_IS_RGBA)
+#if defined(GOOGLE3)
+                return false;
+#else
+    #if defined(SK_PMCOLOR_IS_RGBA)
                 fDecoderMgr->dinfo()->out_color_space = JCS_EXT_RGBA;

[msarett, 2015/10/14 19:58:25]

RGBA and BGRA aren't a part of libjpeg.

We will have to change our implementation to work with regular libjpeg.  Or is
this really old turbo?

[dogben, 2015/10/14 23:11:05]

It's libjpeg. I'll follow up with you about this.

-#else
+    #else
                 fDecoderMgr->dinfo()->out_color_space = JCS_EXT_BGRA;
+    #endif
 #endif
             }
             return true;
         case kRGB_565_SkColorType:
             if (isCMYK) {
                 // FIXME (msarett): We need to support 565 here.  It's not hard to do, considering
                 // we already convert CMYK to RGBA, I just need to do it.  I think it might be
                 // best to do this in SkSwizzler and also move convert_CMYK_to_RGBA into SkSwizzler.
                 return false;
             } else {
+#if defined(GOOGLE3)
+                return false;
+#else
                 fDecoderMgr->dinfo()->dither_mode = JDITHER_NONE;
                 fDecoderMgr->dinfo()->out_color_space = JCS_RGB565;
+#endif
             }
             return true;
         case kGray_8_SkColorType:
             if (isCMYK) {
                 return false;
             } else {
                 // We will enable decodes to gray even if the image is color because this is
                 // much faster than decoding to color and then converting
                 fDecoderMgr->dinfo()->out_color_space = JCS_GRAYSCALE;
             }
@@ skipping 114 matching lines @@
             srcConfig = SkSwizzler::kRGBX;
             break;
         case kBGRA_8888_SkColorType:
             srcConfig = SkSwizzler::kBGRX;
             break;
         case kRGB_565_SkColorType:
             srcConfig = SkSwizzler::kRGB_565;
             break;
         default:
             // This function should only be called if the colorType is supported by jpeg
+#if defined(GOOGLE3)
+            SK_CRASH();
+#else
             SkASSERT(false);
+#endif
     }
 
     fSwizzler.reset(SkSwizzler::CreateSwizzler(srcConfig, nullptr, dstInfo, options));
     fStorage.reset(get_row_bytes(fDecoderMgr->dinfo()));
     fSrcRow = static_cast<uint8_t*>(fStorage.get());
 }
 
 SkSampler* SkJpegCodec::getSampler(bool createIfNecessary) {
     if (!createIfNecessary || fSwizzler) {
         SkASSERT(!fSwizzler || (fSrcRow && static_cast<uint8_t*>(fStorage.get()) == fSrcRow));
@@ skipping 85 matching lines @@
         jpeg_read_scanlines(dinfo, &storagePtr, 1);                          \
     }
 #endif
 
 bool SkJpegCodec::onSkipScanlines(int count) {
     // Set the jump location for libjpeg errors
     if (setjmp(fDecoderMgr->getJmpBuf())) {
         return fDecoderMgr->returnFalse("setjmp");
     }
 
+#ifndef TURBO_HAS_SKIP
+    jpeg_skip_scanlines(fDecoderMgr->dinfo(), count);

[msarett, 2015/10/14 19:58:25]

This works for now.  I need to clean this up.

[dogben, 2015/10/14 23:11:05]

Cool, thanks!

+    return true;
+#else
     return count == jpeg_skip_scanlines(fDecoderMgr->dinfo(), count);
+#endif
 }