Changeset 71162 in webkit


Ignore:
Timestamp:
Nov 2, 2010 1:48:40 PM (13 years ago)
Author:
commit-queue@webkit.org
Message:

2010-11-02 Sheriff Bot <​webkit.review.bot@gmail.com>

Unreviewed, rolling out r71152.
​http://trac.webkit.org/changeset/71152
​https://bugs.webkit.org/show_bug.cgi?id=48866

Causes lots and lots of crashes (Requested by jamesr_ on
#webkit).

  • platform/image-decoders/jpeg/JPEGImageDecoder.cpp: (WebCore::JPEGImageReader::JPEGImageReader): (WebCore::JPEGImageReader::decode): (WebCore::JPEGImageDecoder::outputScanlines):
  • platform/image-decoders/jpeg/JPEGImageDecoder.h:
Location:
trunk/WebCore
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • trunk/WebCore/ChangeLog

    r71161 r71162  
     12010-11-02  Sheriff Bot  <webkit.review.bot@gmail.com>
     2
     3        Unreviewed, rolling out r71152.
     4        http://trac.webkit.org/changeset/71152
     5        https://bugs.webkit.org/show_bug.cgi?id=48866
     6
     7        Causes lots and lots of crashes (Requested by jamesr_ on
     8        #webkit).
     9
     10        * platform/image-decoders/jpeg/JPEGImageDecoder.cpp:
     11        (WebCore::JPEGImageReader::JPEGImageReader):
     12        (WebCore::JPEGImageReader::decode):
     13        (WebCore::JPEGImageDecoder::outputScanlines):
     14        * platform/image-decoders/jpeg/JPEGImageDecoder.h:
     15
    1162010-11-02  Alexey Proskuryakov  <ap@apple.com>
    217

  • trunk/WebCore/platform/image-decoders/jpeg/JPEGImageDecoder.cpp

    r71152 r71162  
    5252
    5353extern "C" {
    54 
    5554#include "jpeglib.h"
    56 
    57 #if USE(ICCJPEG)
    58 #include "iccjpeg.h"
    59 #endif
    60 
    6155}
    6256
    … …  
    9286    JPEGImageReader* decoder;
    9387};
    94 
    95 static ColorProfile readColorProfile(jpeg_decompress_struct* info)
    96 {
    97 #if USE(ICCJPEG)
    98     JOCTET* profile;
    99     unsigned int profileLength;
    100 
    101     if (!read_icc_profile(info, &profile, &profileLength))
    102         return ColorProfile();
    103 
    104     ColorProfile colorProfile;
    105     colorProfile.append(reinterpret_cast<char*>(profile), profileLength);
    106     free(profile);
    107     return colorProfile;
    108 #else
    109     return ColorProfile();
    110 #endif
    111 }
    11288
    11389class JPEGImageReader
    … …  
    148124        src->pub.term_source = term_source;
    149125        src->decoder = this;
    150 
    151         // Enable these markers for the ICC color profile.
    152         for (unsigned i = JPEG_APP0; i < JPEG_COM; ++i)
    153             jpeg_save_markers(&m_info, i, 0xFFFF);
    154126    }
    155127
    … …  
    241213                return false;
    242214
    243             m_decoder->setColorProfile(readColorProfile(info()));             
    244 
    245215            if (m_decodingSizeOnly) {
    246216                // We can stop here.  Reduce our buffer length and available
    … …  
    452422        buffer.setStatus(RGBA32Buffer::FramePartial);
    453423        buffer.setHasAlpha(false);
    454         buffer.setColorProfile(m_colorProfile);
    455424
    456425        // For JPEGs, the frame always fills the entire image.

  • trunk/WebCore/platform/image-decoders/jpeg/JPEGImageDecoder.h

    r71152 r71162  
    5555        void jpegComplete();
    5656
    57         void setColorProfile(const ColorProfile& colorProfile) { m_colorProfile = colorProfile; }
    58 
    5957    private:
    6058        // Decodes the image.  If |onlySize| is true, stops decoding after
Note: See TracChangeset for help on using the changeset viewer.