Import of pkgsrc-2016Q3

mail/thunderbird/patches/patch-mozilla_image_decoders_nsJPEGDecoder.cpp

@@ -1,6 +1,6 @@
-$NetBSD: patch-mozilla_image_decoders_nsJPEGDecoder.cpp,v 1.2 2015/07/09 15:17:34 ryoon Exp $
+$NetBSD: patch-mozilla_image_decoders_nsJPEGDecoder.cpp,v 1.3 2016/04/17 18:33:50 ryoon Exp $
 
---- mozilla/image/decoders/nsJPEGDecoder.cpp.orig	2015-06-08 17:49:17.000000000 +0000
+--- mozilla/image/decoders/nsJPEGDecoder.cpp.orig	2016-04-07 21:33:16.000000000 +0000
 +++ mozilla/image/decoders/nsJPEGDecoder.cpp
 @@ -23,13 +23,28 @@
  
@@ -32,7 +32,7 @@ $NetBSD: patch-mozilla_image_decoders_nsJPEGDecoder.cpp,v 1.2 2015/07/09 15:17:3
  
  static void cmyk_convert_rgb(JSAMPROW row, JDIMENSION width);
  
-@@ -373,6 +388,7 @@ nsJPEGDecoder::WriteInternal(const char*
+@@ -339,6 +354,7 @@ nsJPEGDecoder::WriteInternal(const char*
          case JCS_GRAYSCALE:
          case JCS_RGB:
          case JCS_YCbCr:
@@ -40,7 +40,7 @@ $NetBSD: patch-mozilla_image_decoders_nsJPEGDecoder.cpp,v 1.2 2015/07/09 15:17:3
            // if we're not color managing we can decode directly to
            // MOZ_JCS_EXT_NATIVE_ENDIAN_XRGB
            if (mCMSMode != eCMSMode_All) {
-@@ -381,6 +397,9 @@ nsJPEGDecoder::WriteInternal(const char*
+@@ -347,6 +363,9 @@ nsJPEGDecoder::WriteInternal(const char*
            } else {
                mInfo.out_color_space = JCS_RGB;
            }
@@ -50,7 +50,7 @@ $NetBSD: patch-mozilla_image_decoders_nsJPEGDecoder.cpp,v 1.2 2015/07/09 15:17:3
            break;
          case JCS_CMYK:
          case JCS_YCCK:
-@@ -450,6 +469,15 @@ nsJPEGDecoder::WriteInternal(const char*
+@@ -420,6 +439,16 @@ nsJPEGDecoder::WriteInternal(const char*
        return; // I/O suspension
      }
  
@@ -63,10 +63,11 @@ $NetBSD: patch-mozilla_image_decoders_nsJPEGDecoder.cpp,v 1.2 2015/07/09 15:17:3
 +      mInfo.cconvert->color_convert = ycc_rgb_convert_argb;
 +    }
 +#endif
- 
++
      // If this is a progressive JPEG ...
      mState = mInfo.buffered_image ?
-@@ -632,7 +660,11 @@ nsJPEGDecoder::OutputScanlines(bool* sus
+              JPEG_DECOMPRESS_PROGRESSIVE : JPEG_DECOMPRESS_SEQUENTIAL;
+@@ -601,7 +630,11 @@ nsJPEGDecoder::OutputScanlines(bool* sus
  
        MOZ_ASSERT(imageRow, "Should have a row buffer here");
  
@@ -78,10 +79,10 @@ $NetBSD: patch-mozilla_image_decoders_nsJPEGDecoder.cpp,v 1.2 2015/07/09 15:17:3
          // Special case: scanline will be directly converted into packed ARGB
          if (jpeg_read_scanlines(&mInfo, (JSAMPARRAY)&imageRow, 1) != 1) {
            *suspend = true; // suspend
-@@ -959,6 +991,282 @@ term_source (j_decompress_ptr jd)
+@@ -925,6 +958,282 @@ term_source (j_decompress_ptr jd)
+ } // namespace image
  } // namespace mozilla
  
- 
 +#ifndef JCS_EXTENSIONS
 +/**************** YCbCr -> Cairo's RGB24/ARGB32 conversion: most common case **************/
 +