[seamonkey/el6] fix libjpeg62 patch

[Dmitry Butskoy]

commit 82ac651c07e7fb19ab5aa036db0aa83aadecc970
Author: Dmitry Butskoy <Dmitry at Butskoy.name>
Date:   Fri Feb 22 19:19:18 2013 +0400

    fix libjpeg62 patch

 seamonkey-2.15-libjpeg62.patch |   35 ++++++++++++++++++++++++-----------
 1 files changed, 24 insertions(+), 11 deletions(-)
---
diff --git a/seamonkey-2.15-libjpeg62.patch b/seamonkey-2.15-libjpeg62.patch
index 8d22293..2a8c031 100644
--- a/seamonkey-2.15-libjpeg62.patch
+++ b/seamonkey-2.15-libjpeg62.patch
@@ -1,7 +1,7 @@
-diff -Nrbu seamonkey-2.15/comm-release/mozilla/configure seamonkey-2.15-OK/comm-release/mozilla/configure
---- seamonkey-2.15/comm-release/mozilla/configure	2013-01-10 18:52:58.982539090 +0400
-+++ seamonkey-2.15-OK/comm-release/mozilla/configure	2013-01-10 18:55:13.118539419 +0400
-@@ -15471,9 +15471,6 @@
+diff -Nrbu seamonkey-2.16/comm-release/configure seamonkey-2.16-OK/comm-release/configure
+--- seamonkey-2.16/comm-release/configure	2013-02-22 19:15:35.530467615 +0400
++++ seamonkey-2.16-OK/comm-release/configure	2013-02-22 19:17:07.079582314 +0400
+@@ -13267,9 +13267,6 @@
   #if JPEG_LIB_VERSION < $MOZJPEG
                       #error "Insufficient JPEG library version ($MOZJPEG required)."
                       #endif
@@ -11,9 +11,22 @@ diff -Nrbu seamonkey-2.15/comm-release/mozilla/configure seamonkey-2.15-OK/comm-
                       
  ; return 0; }
  EOF
-diff -Nrbu seamonkey-2.15/comm-release/mozilla/image/decoders/nsJPEGDecoder.cpp seamonkey-2.15-OK/comm-release/mozilla/image/decoders/nsJPEGDecoder.cpp
---- seamonkey-2.15/comm-release/mozilla/image/decoders/nsJPEGDecoder.cpp	2013-01-06 10:26:16.000000000 +0400
-+++ seamonkey-2.15-OK/comm-release/mozilla/image/decoders/nsJPEGDecoder.cpp	2013-01-10 18:46:24.000000000 +0400
+diff -Nrbu seamonkey-2.16/comm-release/mozilla/configure seamonkey-2.16-OK/comm-release/mozilla/configure
+--- seamonkey-2.16/comm-release/mozilla/configure	2013-02-22 19:15:35.532517217 +0400
++++ seamonkey-2.16-OK/comm-release/mozilla/configure	2013-02-22 19:16:16.848769332 +0400
+@@ -15405,9 +15405,6 @@
+  #if JPEG_LIB_VERSION < $MOZJPEG
+                      #error "Insufficient JPEG library version ($MOZJPEG required)."
+                      #endif
+-                     #ifndef JCS_EXTENSIONS
+-                     #error "libjpeg-turbo JCS_EXTENSIONS required"
+-                     #endif
+                      
+ ; return 0; }
+ EOF
+diff -Nrbu seamonkey-2.16/comm-release/mozilla/image/decoders/nsJPEGDecoder.cpp seamonkey-2.16-OK/comm-release/mozilla/image/decoders/nsJPEGDecoder.cpp
+--- seamonkey-2.16/comm-release/mozilla/image/decoders/nsJPEGDecoder.cpp	2013-02-18 08:06:33.000000000 +0400
++++ seamonkey-2.16-OK/comm-release/mozilla/image/decoders/nsJPEGDecoder.cpp	2013-02-22 19:16:16.849769259 +0400
 @@ -21,13 +21,20 @@
  
  extern "C" {
@@ -41,7 +54,7 @@ diff -Nrbu seamonkey-2.15/comm-release/mozilla/image/decoders/nsJPEGDecoder.cpp
  
  static void cmyk_convert_rgb(JSAMPROW row, JDIMENSION width);
  
-@@ -324,14 +331,7 @@
+@@ -340,14 +347,7 @@
        case JCS_GRAYSCALE:
        case JCS_RGB:
        case JCS_YCbCr:
@@ -56,7 +69,7 @@ diff -Nrbu seamonkey-2.15/comm-release/mozilla/image/decoders/nsJPEGDecoder.cpp
          break;
        case JCS_CMYK:
        case JCS_YCCK:
-@@ -399,6 +399,13 @@
+@@ -415,6 +415,13 @@
        return; /* I/O suspension */
      }
  
@@ -70,7 +83,7 @@ diff -Nrbu seamonkey-2.15/comm-release/mozilla/image/decoders/nsJPEGDecoder.cpp
  
      /* If this is a progressive JPEG ... */
      mState = mInfo.buffered_image ? JPEG_DECOMPRESS_PROGRESSIVE : JPEG_DECOMPRESS_SEQUENTIAL;
-@@ -544,7 +551,7 @@
+@@ -560,7 +567,7 @@
        uint32_t *imageRow = ((uint32_t*)mImageData) +
                             (mInfo.output_scanline * mInfo.output_width);
  
@@ -79,7 +92,7 @@ diff -Nrbu seamonkey-2.15/comm-release/mozilla/image/decoders/nsJPEGDecoder.cpp
          /* Special case: scanline will be directly converted into packed ARGB */
          if (jpeg_read_scanlines(&mInfo, (JSAMPARRAY)&imageRow, 1) != 1) {
            *suspend = true; /* suspend */
-@@ -854,6 +861,280 @@
+@@ -870,6 +877,280 @@
  } // namespace mozilla