firefox-hg: make patch apply again

[Thomas Klausner <wiz%NetBSD.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Thomas Klausner <wiz%NetBSD.org@localhost>
Pushed By:	wiz
Date:		Wed Jul 6 09:45:47 2016 +0200
Changeset:	3068fc4850322f4ab523e7cfd624cb0214503e41

Modified Files:
	firefox-hg/distinfo
	firefox-hg/patches/patch-image_decoders_nsJPEGDecoder.cpp

Log Message:
firefox-hg: make patch apply again

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=3068fc4850322f4ab523e7cfd624cb0214503e41

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 firefox-hg/distinfo                                      |  2 +-
 .../patches/patch-image_decoders_nsJPEGDecoder.cpp       | 16 ++++++++--------
 2 files changed, 9 insertions(+), 9 deletions(-)

diffs:
diff --git a/firefox-hg/distinfo b/firefox-hg/distinfo
index 763229e..6a60ecc 100644
--- a/firefox-hg/distinfo
+++ b/firefox-hg/distinfo
@@ -6,7 +6,7 @@ Size (firefox-31.0.source.tar.bz2) = 147507120 bytes
 SHA1 (patch-aa) = 12baede30120947ffae5cf1aed2886943548b46a
 SHA1 (patch-ao) = fd708563f119823f5634ecd57e5a2089682040e0
 SHA1 (patch-build_gyp.mozbuild) = b811edb2f76fdd241edff0b4945977c810a987b8
-SHA1 (patch-image_decoders_nsJPEGDecoder.cpp) = fb650d1ae95321a6fc7565ffe3375944d06f95a9
+SHA1 (patch-image_decoders_nsJPEGDecoder.cpp) = 2be8b355ef1de83371e6b3a15216b1eaf4ae58cf
 SHA1 (patch-media_webrtc_trunk_webrtc_modules_video__capture_linux_device__info__linux.cc) = 37c5750a2994d338de2c3e729be0360ad1da9b95
 SHA1 (patch-media_webrtc_trunk_webrtc_modules_video__capture_linux_video__capture__linux.cc) = ba581d0edc7cfa4a43e6f0dc8a75a914fef18ea9
 SHA1 (patch-modules_libpref_init_all.js) = 73dbe0c7001f9bfadb6ff7b50c340f7d135cb42a
diff --git a/firefox-hg/patches/patch-image_decoders_nsJPEGDecoder.cpp b/firefox-hg/patches/patch-image_decoders_nsJPEGDecoder.cpp
index f7a74eb..871ea7b 100644
--- a/firefox-hg/patches/patch-image_decoders_nsJPEGDecoder.cpp
+++ b/firefox-hg/patches/patch-image_decoders_nsJPEGDecoder.cpp
@@ -3,9 +3,9 @@ $NetBSD: patch-image_decoders_nsJPEGDecoder.cpp,v 1.6 2015/04/20 10:01:53 thomas
 Partially revert https://bugzilla.mozilla.org/show_bug.cgi?id=791305
 to allow building against jpeg (not jpeg-turbo).
 
---- image/decoders/nsJPEGDecoder.cpp.orig	2015-04-20 02:19:51.000000000 +0000
+--- image/decoders/nsJPEGDecoder.cpp.orig	2016-07-06 07:39:37.205420975 +0000
 +++ image/decoders/nsJPEGDecoder.cpp
-@@ -23,13 +23,28 @@
+@@ -28,13 +28,28 @@
  
  extern "C" {
  #include "iccjpeg.h"
@@ -35,7 +35,7 @@ to allow building against jpeg (not jpeg-turbo).
  
  static void cmyk_convert_rgb(JSAMPROW row, JDIMENSION width);
  
-@@ -373,6 +388,7 @@ nsJPEGDecoder::WriteInternal(const char*
+@@ -366,6 +381,7 @@ nsJPEGDecoder::ReadJPEGData(const char* 
          case JCS_GRAYSCALE:
          case JCS_RGB:
          case JCS_YCbCr:
@@ -43,7 +43,7 @@ to allow building against jpeg (not jpeg-turbo).
            // 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*
+@@ -374,6 +390,9 @@ nsJPEGDecoder::ReadJPEGData(const char* 
            } else {
                mInfo.out_color_space = JCS_RGB;
            }
@@ -53,8 +53,8 @@ to allow building against jpeg (not jpeg-turbo).
            break;
          case JCS_CMYK:
          case JCS_YCCK:
-@@ -448,6 +467,15 @@ nsJPEGDecoder::WriteInternal(const char*
-       return; // I/O suspension
+@@ -448,6 +467,15 @@ nsJPEGDecoder::ReadJPEGData(const char* 
+       return Transition::ContinueUnbuffered(State::JPEG_DATA); // I/O suspension
      }
  
 +#ifndef JCS_EXTENSIONS
@@ -69,7 +69,7 @@ to allow building against jpeg (not jpeg-turbo).
      // If this is a progressive JPEG ...
      mState = mInfo.buffered_image ?
               JPEG_DECOMPRESS_PROGRESSIVE : JPEG_DECOMPRESS_SEQUENTIAL;
-@@ -629,7 +657,11 @@ nsJPEGDecoder::OutputScanlines(bool* sus
+@@ -645,7 +673,11 @@ nsJPEGDecoder::OutputScanlines(bool* sus
  
        MOZ_ASSERT(imageRow, "Should have a row buffer here");
  
@@ -81,7 +81,7 @@ to allow building against jpeg (not jpeg-turbo).
          // Special case: scanline will be directly converted into packed ARGB
          if (jpeg_read_scanlines(&mInfo, (JSAMPARRAY)&imageRow, 1) != 1) {
            *suspend = true; // suspend
-@@ -953,6 +985,282 @@ term_source (j_decompress_ptr jd)
+@@ -969,6 +1001,282 @@ term_source (j_decompress_ptr jd)
  } // namespace image
  } // namespace mozilla