diff options
author | 2015-06-24 15:14:48 -0700 | |
---|---|---|
committer | 2015-06-24 15:14:48 -0700 | |
commit | c0bdecb920a957665f66adefd3f3fb865e32e5d0 (patch) | |
tree | 055fac27d0c76067ec1f2271dd9a5879450c0b18 /src | |
parent | b60c3f8291529303299262dba19b1a896060bd2d (diff) |
Revert of Switch SkJpegCode to libjpeg-turbo (patchset #11 id:540001 of https://codereview.chromium.org/1180983002/)
Reason for revert:
https://uberchromegw.corp.google.com/i/client.skia.compile/builders/Build-Ubuntu-GCC-MipsDSP2-Debug-Android/builds/1136/steps/build%20most/logs/stdio
Original issue's description:
> Add libjpeg-turbo library (depends on yasm)
> Mangle external function names to avoid conflict with libjpeg
> Take advantage of direct color conversion (RGBA, BGRA, 565)
> Prepare to use jpeg_skip_scanlines (when it is upstreamed)
>
> BUG=skia:
>
> Committed: https://skia.googlesource.com/skia/+/b60c3f8291529303299262dba19b1a896060bd2d
TBR=scroggo@google.com,djsollen@google.com,emmaleer@google.com,msarett@google.com
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=skia:
Review URL: https://codereview.chromium.org/1199253006
Diffstat (limited to 'src')
-rw-r--r-- | src/codec/SkJpegCodec.cpp | 321 | ||||
-rw-r--r-- | src/codec/SkJpegCodec.h | 9 | ||||
-rw-r--r-- | src/codec/SkJpegDecoderMgr.cpp | 15 | ||||
-rw-r--r-- | src/codec/SkJpegDecoderMgr.h | 1 | ||||
-rw-r--r-- | src/codec/SkJpegUtility_codec.cpp | 2 | ||||
-rw-r--r-- | src/codec/SkJpegUtility_codec.h | 1 |
6 files changed, 184 insertions, 165 deletions
diff --git a/src/codec/SkJpegCodec.cpp b/src/codec/SkJpegCodec.cpp index ec58710a1c..2eaff1a9a6 100644 --- a/src/codec/SkJpegCodec.cpp +++ b/src/codec/SkJpegCodec.cpp @@ -15,23 +15,53 @@ #include "SkTemplates.h" #include "SkTypes.h" -// stdio is needed for libjpeg-turbo +// stdio is needed for jpeglib #include <stdio.h> extern "C" { - #include "jpeglibmangler.h" #include "jerror.h" + #include "jmorecfg.h" #include "jpegint.h" #include "jpeglib.h" } +// ANDROID_RGB +// If this is defined in the jpeg headers it indicates that jpeg offers +// support for two additional formats: JCS_RGBA_8888 and JCS_RGB_565. + +/* + * Get the source configuarion for the swizzler + */ +SkSwizzler::SrcConfig get_src_config(const jpeg_decompress_struct& dinfo) { + if (JCS_CMYK == dinfo.out_color_space) { + // We will need to perform a manual conversion + return SkSwizzler::kRGBX; + } + if (3 == dinfo.out_color_components && JCS_RGB == dinfo.out_color_space) { + return SkSwizzler::kRGB; + } +#ifdef ANDROID_RGB + if (JCS_RGBA_8888 == dinfo.out_color_space) { + return SkSwizzler::kRGBX; + } + + if (JCS_RGB_565 == dinfo.out_color_space) { + return SkSwizzler::kRGB_565; + } +#endif + if (1 == dinfo.out_color_components && JCS_GRAYSCALE == dinfo.out_color_space) { + return SkSwizzler::kGray; + } + return SkSwizzler::kUnknown; +} + /* - * Convert a row of CMYK samples to RGBA in place. + * Convert a row of CMYK samples to RGBX in place. * Note that this method moves the row pointer. * @param width the number of pixels in the row that is being converted * CMYK is stored as four bytes per pixel */ -static void convert_CMYK_to_RGBA(uint8_t* row, uint32_t width) { +static void convert_CMYK_to_RGB(uint8_t* row, uint32_t width) { // We will implement a crude conversion from CMYK -> RGB using formulas // from easyrgb.com. // @@ -74,16 +104,9 @@ static void convert_CMYK_to_RGBA(uint8_t* row, uint32_t width) { // G = M * K / 255 // B = Y * K / 255 for (uint32_t x = 0; x < width; x++, row += 4) { -#if defined(SK_PMCOLOR_IS_RGBA) row[0] = SkMulDiv255Round(row[0], row[3]); row[1] = SkMulDiv255Round(row[1], row[3]); row[2] = SkMulDiv255Round(row[2], row[3]); -#else - uint8_t tmp = row[0]; - row[0] = SkMulDiv255Round(row[2], row[3]); - row[1] = SkMulDiv255Round(row[1], row[3]); - row[2] = SkMulDiv255Round(tmp, row[3]); -#endif row[3] = 0xFF; } } @@ -110,7 +133,7 @@ bool SkJpegCodec::ReadHeader(SkStream* stream, SkCodec** codecOut, decoderMgr->init(); // Read the jpeg header - if (JPEG_HEADER_OK != turbo_jpeg_read_header(decoderMgr->dinfo(), true)) { + if (JPEG_HEADER_OK != jpeg_read_header(decoderMgr->dinfo(), true)) { return decoderMgr->returnFalse("read_header"); } @@ -145,32 +168,24 @@ SkJpegCodec::SkJpegCodec(const SkImageInfo& srcInfo, SkStream* stream, JpegDecoderMgr* decoderMgr) : INHERITED(srcInfo, stream) , fDecoderMgr(decoderMgr) + , fSwizzler(NULL) + , fSrcRowBytes(0) {} /* * Return a valid set of output dimensions for this decoder, given an input scale */ SkISize SkJpegCodec::onGetScaledDimensions(float desiredScale) const { - // libjpeg-turbo supports scaling by 1/8, 1/4, 3/8, 1/2, 5/8, 3/4, 7/8, and 1/1, so we will - // support these as well - long num; - long denom = 8; - if (desiredScale > 0.875f) { - num = 8; - } else if (desiredScale > 0.75f) { - num = 7; - } else if (desiredScale > 0.625f) { - num = 6; - } else if (desiredScale > 0.5f) { - num = 5; + // libjpeg supports scaling by 1/1, 1/2, 1/4, and 1/8, so we will support these as well + long scale; + if (desiredScale > 0.75f) { + scale = 1; } else if (desiredScale > 0.375f) { - num = 4; - } else if (desiredScale > 0.25f) { - num = 3; - } else if (desiredScale > 0.125f) { - num = 2; + scale = 2; + } else if (desiredScale > 0.1875f) { + scale = 4; } else { - num = 1; + scale = 8; } // Set up a fake decompress struct in order to use libjpeg to calculate output dimensions @@ -180,46 +195,20 @@ SkISize SkJpegCodec::onGetScaledDimensions(float desiredScale) const { dinfo.image_height = this->getInfo().height(); dinfo.global_state = DSTATE_READY; dinfo.num_components = 0; - dinfo.scale_num = num; - dinfo.scale_denom = denom; - turbo_jpeg_calc_output_dimensions(&dinfo); + dinfo.scale_num = 1; + dinfo.scale_denom = scale; + jpeg_calc_output_dimensions(&dinfo); // Return the calculated output dimensions for the given scale return SkISize::Make(dinfo.output_width, dinfo.output_height); } /* - * Handles rewinding the input stream if it is necessary - */ -bool SkJpegCodec::handleRewind() { - switch(this->rewindIfNeeded()) { - case kCouldNotRewind_RewindState: - return fDecoderMgr->returnFalse("could not rewind"); - case kRewound_RewindState: { - JpegDecoderMgr* decoderMgr = NULL; - if (!ReadHeader(this->stream(), NULL, &decoderMgr)) { - return fDecoderMgr->returnFalse("could not rewind"); - } - SkASSERT(NULL != decoderMgr); - fDecoderMgr.reset(decoderMgr); - return true; - } - case kNoRewindNecessary_RewindState: - return true; - default: - SkASSERT(false); - return false; - } -} - -/* * Checks if the conversion between the input image and the requested output * image has been implemented - * Sets the output color space */ -bool SkJpegCodec::setOutputColorSpace(const SkImageInfo& dst) { - const SkImageInfo& src = this->getInfo(); - +static bool conversion_possible(const SkImageInfo& dst, + const SkImageInfo& src) { // Ensure that the profile type is unchanged if (dst.profileType() != src.profileType()) { return false; @@ -230,43 +219,35 @@ bool SkJpegCodec::setOutputColorSpace(const SkImageInfo& dst) { return false; } - // Check if we will decode to CMYK because a conversion to RGBA is not supported - J_COLOR_SPACE colorSpace = fDecoderMgr->dinfo()->jpeg_color_space; - bool isCMYK = JCS_CMYK == colorSpace || JCS_YCCK == colorSpace; + // Always allow kN32 as the color type + if (kN32_SkColorType == dst.colorType()) { + return true; + } - // Check the byte ordering of the RGBA color space for the current platform -#if defined(SK_PMCOLOR_IS_RGBA) - J_COLOR_SPACE outRGBA = JCS_EXT_RGBA; -#else - J_COLOR_SPACE outRGBA = JCS_EXT_BGRA; -#endif + // Otherwise require that the destination color type match our recommendation + return dst.colorType() == src.colorType(); +} - // 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 { - fDecoderMgr->dinfo()->out_color_space = outRGBA; - } - return true; - case kRGB_565_SkColorType: - if (isCMYK) { - return false; - } else { - fDecoderMgr->dinfo()->out_color_space = JCS_RGB565; +/* + * Handles rewinding the input stream if it is necessary + */ +bool SkJpegCodec::handleRewind() { + switch(this->rewindIfNeeded()) { + case kCouldNotRewind_RewindState: + return fDecoderMgr->returnFalse("could not rewind"); + case kRewound_RewindState: { + JpegDecoderMgr* decoderMgr = NULL; + if (!ReadHeader(this->stream(), NULL, &decoderMgr)) { + return fDecoderMgr->returnFalse("could not rewind"); } + SkASSERT(NULL != decoderMgr); + fDecoderMgr.reset(decoderMgr); 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; - } + } + case kNoRewindNecessary_RewindState: return true; default: + SkASSERT(false); return false; } } @@ -276,28 +257,40 @@ bool SkJpegCodec::setOutputColorSpace(const SkImageInfo& dst) { * if possible */ bool SkJpegCodec::scaleToDimensions(uint32_t dstWidth, uint32_t dstHeight) { - // libjpeg-turbo can scale to 1/8, 1/4, 3/8, 1/2, 5/8, 3/4, 7/8, and 1/1 - fDecoderMgr->dinfo()->scale_denom = 8; - fDecoderMgr->dinfo()->scale_num = 8; - turbo_jpeg_calc_output_dimensions(fDecoderMgr->dinfo()); + // libjpeg can scale to 1/1, 1/2, 1/4, and 1/8 + SkASSERT(1 == fDecoderMgr->dinfo()->scale_num); + SkASSERT(1 == fDecoderMgr->dinfo()->scale_denom); + jpeg_calc_output_dimensions(fDecoderMgr->dinfo()); while (fDecoderMgr->dinfo()->output_width != dstWidth || fDecoderMgr->dinfo()->output_height != dstHeight) { // Return a failure if we have tried all of the possible scales - if (1 == fDecoderMgr->dinfo()->scale_num || + if (8 == fDecoderMgr->dinfo()->scale_denom || dstWidth > fDecoderMgr->dinfo()->output_width || dstHeight > fDecoderMgr->dinfo()->output_height) { return fDecoderMgr->returnFalse("could not scale to requested dimensions"); } // Try the next scale - fDecoderMgr->dinfo()->scale_num -= 1; - turbo_jpeg_calc_output_dimensions(fDecoderMgr->dinfo()); + fDecoderMgr->dinfo()->scale_denom *= 2; + jpeg_calc_output_dimensions(fDecoderMgr->dinfo()); } return true; } /* + * Create the swizzler based on the encoded format + */ +void SkJpegCodec::initializeSwizzler(const SkImageInfo& dstInfo, + void* dst, size_t dstRowBytes, + const Options& options) { + SkSwizzler::SrcConfig srcConfig = get_src_config(*fDecoderMgr->dinfo()); + fSwizzler.reset(SkSwizzler::CreateSwizzler(srcConfig, NULL, dstInfo, dst, dstRowBytes, + options.fZeroInitialized)); + fSrcRowBytes = SkSwizzler::BytesPerPixel(srcConfig) * dstInfo.width(); +} + +/* * Performs the jpeg decode */ SkCodec::Result SkJpegCodec::onGetPixels(const SkImageInfo& dstInfo, @@ -317,58 +310,79 @@ SkCodec::Result SkJpegCodec::onGetPixels(const SkImageInfo& dstInfo, return fDecoderMgr->returnFailure("setjmp", kInvalidInput); } - // Check if we can decode to the requested destination and set the output color space - if (!this->setOutputColorSpace(dstInfo)) { + // Check if we can decode to the requested destination + if (!conversion_possible(dstInfo, this->getInfo())) { return fDecoderMgr->returnFailure("conversion_possible", kInvalidConversion); } // Perform the necessary scaling if (!this->scaleToDimensions(dstInfo.width(), dstInfo.height())) { - return fDecoderMgr->returnFailure("cannot scale to requested dims", kInvalidScale); + fDecoderMgr->returnFailure("cannot scale to requested dims", kInvalidScale); } // Now, given valid output dimensions, we can start the decompress - if (!turbo_jpeg_start_decompress(dinfo)) { + if (!jpeg_start_decompress(dinfo)) { return fDecoderMgr->returnFailure("startDecompress", kInvalidInput); } - // The recommended output buffer height should always be 1 in high quality modes. - // If it's not, we want to know because it means our strategy is not optimal. - SkASSERT(1 == dinfo->rec_outbuf_height); + // Create the swizzler + this->initializeSwizzler(dstInfo, dst, dstRowBytes, options); + if (NULL == fSwizzler) { + return fDecoderMgr->returnFailure("getSwizzler", kUnimplemented); + } + + // This is usually 1, but can also be 2 or 4. + // If we wanted to always read one row at a time, we could, but we will save space and time + // by using the recommendation from libjpeg. + const uint32_t rowsPerDecode = dinfo->rec_outbuf_height; + SkASSERT(rowsPerDecode <= 4); + + // Create a buffer to contain decoded rows (libjpeg requires a 2D array) + SkASSERT(0 != fSrcRowBytes); + SkAutoTDeleteArray<uint8_t> srcBuffer(SkNEW_ARRAY(uint8_t, fSrcRowBytes * rowsPerDecode)); + JSAMPLE* srcRows[4]; + uint8_t* srcPtr = srcBuffer.get(); + for (uint8_t i = 0; i < rowsPerDecode; i++) { + srcRows[i] = (JSAMPLE*) srcPtr; + srcPtr += fSrcRowBytes; + } - // Perform the decode a single row at a time + // Ensure that we loop enough times to decode all of the rows + // libjpeg will prevent us from reading past the bottom of the image uint32_t dstHeight = dstInfo.height(); - JSAMPLE* dstRow = (JSAMPLE*) dst; - for (uint32_t y = 0; y < dstHeight; y++) { + for (uint32_t y = 0; y < dstHeight + rowsPerDecode - 1; y += rowsPerDecode) { // Read rows of the image - uint32_t rowsDecoded = turbo_jpeg_read_scanlines(dinfo, &dstRow, 1); + uint32_t rowsDecoded = jpeg_read_scanlines(dinfo, srcRows, rowsPerDecode); + + // Convert to RGB if necessary + if (JCS_CMYK == dinfo->out_color_space) { + convert_CMYK_to_RGB(srcRows[0], dstInfo.width() * rowsDecoded); + } + + // Swizzle to output destination + for (uint32_t i = 0; i < rowsDecoded; i++) { + fSwizzler->next(srcRows[i]); + } // If we cannot read enough rows, assume the input is incomplete - if (rowsDecoded != 1) { + if (rowsDecoded < rowsPerDecode && y + rowsDecoded < dstHeight) { // Fill the remainder of the image with black. This error handling // behavior is unspecified but SkCodec consistently uses black as // the fill color for opaque images. If the destination is kGray, // the low 8 bits of SK_ColorBLACK will be used. Conveniently, // these are zeros, which is the representation for black in kGray. - SkSwizzler::Fill(dstRow, dstInfo, dstRowBytes, dstHeight - y, SK_ColorBLACK, NULL); + SkSwizzler::Fill(fSwizzler->getDstRow(), dstInfo, dstRowBytes, + dstHeight - y - rowsDecoded, SK_ColorBLACK, NULL); // Prevent libjpeg from failing on incomplete decode dinfo->output_scanline = dstHeight; // Finish the decode and indicate that the input was incomplete. - turbo_jpeg_finish_decompress(dinfo); + jpeg_finish_decompress(dinfo); return fDecoderMgr->returnFailure("Incomplete image data", kIncompleteInput); } - - // Convert to RGBA if necessary - if (JCS_CMYK == dinfo->out_color_space) { - convert_CMYK_to_RGBA(dstRow, dstInfo.width()); - } - - // Move to the next row - dstRow = SkTAddOffset<JSAMPLE>(dstRow, dstRowBytes); } - turbo_jpeg_finish_decompress(dinfo); + jpeg_finish_decompress(dinfo); return kSuccess; } @@ -381,7 +395,10 @@ public: SkJpegScanlineDecoder(const SkImageInfo& dstInfo, SkJpegCodec* codec) : INHERITED(dstInfo) , fCodec(codec) - {} + { + fStorage.reset(fCodec->fSrcRowBytes); + fSrcRow = static_cast<uint8_t*>(fStorage.get()); + } SkImageGenerator::Result onGetScanlines(void* dst, int count, size_t rowBytes) override { // Set the jump location for libjpeg errors @@ -390,51 +407,38 @@ public: } // Read rows one at a time - JSAMPLE* dstRow = (JSAMPLE*) dst; for (int y = 0; y < count; y++) { // Read row of the image - uint32_t rowsDecoded = - turbo_jpeg_read_scanlines(fCodec->fDecoderMgr->dinfo(), &dstRow, 1); + uint32_t rowsDecoded = jpeg_read_scanlines(fCodec->fDecoderMgr->dinfo(), &fSrcRow, 1); if (rowsDecoded != 1) { - SkSwizzler::Fill( - dstRow, this->dstInfo(), rowBytes, count - y, SK_ColorBLACK, NULL); - fCodec->fDecoderMgr->dinfo()->output_scanline = this->dstInfo().height(); - turbo_jpeg_finish_decompress(fCodec->fDecoderMgr->dinfo()); + SkSwizzler::Fill(dst, this->dstInfo(), rowBytes, count - y, SK_ColorBLACK, NULL); return SkImageGenerator::kIncompleteInput; } - // Convert to RGBA if necessary + // Convert to RGB if necessary if (JCS_CMYK == fCodec->fDecoderMgr->dinfo()->out_color_space) { - convert_CMYK_to_RGBA(dstRow, this->dstInfo().width()); + convert_CMYK_to_RGB(fSrcRow, dstInfo().width()); } - // Move to the next row - dstRow = SkTAddOffset<JSAMPLE>(dstRow, rowBytes); + // Swizzle to output destination + fCodec->fSwizzler->setDstRow(dst); + fCodec->fSwizzler->next(fSrcRow); + dst = SkTAddOffset<void>(dst, rowBytes); } return SkImageGenerator::kSuccess; } - // This is a temporary macro that will be removed after we upstream jpeg_skip_scanlines() - // to libjpeg-turbo. - // skbug.com/3972 - // TODO (msarett): Remove this function when it is no longer necessary. -#ifndef turbo_jpeg_skip_scanlines -#define turbo_jpeg_skip_scanlines(dinfo, count) \ - SkAutoMalloc storage(dinfo->output_width * dinfo->out_color_components); \ - uint8_t* storagePtr = static_cast<uint8_t*>(storage.get()); \ - for (int y = 0; y < count; y++) { \ - turbo_jpeg_read_scanlines(dinfo, &storagePtr, 1); \ - } -#endif - SkImageGenerator::Result onSkipScanlines(int count) override { // Set the jump location for libjpeg errors if (setjmp(fCodec->fDecoderMgr->getJmpBuf())) { return fCodec->fDecoderMgr->returnFailure("setjmp", SkImageGenerator::kInvalidInput); } - turbo_jpeg_skip_scanlines(fCodec->fDecoderMgr->dinfo(), count); + // Read rows but ignore the output + for (int y = 0; y < count; y++) { + jpeg_read_scanlines(fCodec->fDecoderMgr->dinfo(), &fSrcRow, 1); + } return SkImageGenerator::kSuccess; } @@ -445,11 +449,13 @@ public: return; } - turbo_jpeg_finish_decompress(fCodec->fDecoderMgr->dinfo()); + jpeg_finish_decompress(fCodec->fDecoderMgr->dinfo()); } private: - SkJpegCodec* fCodec; // unowned + SkJpegCodec* fCodec; // unowned + SkAutoMalloc fStorage; + uint8_t* fSrcRow; // ptr into fStorage typedef SkScanlineDecoder INHERITED; }; @@ -469,24 +475,31 @@ SkScanlineDecoder* SkJpegCodec::onGetScanlineDecoder(const SkImageInfo& dstInfo, return NULL; } - // Check if we can decode to the requested destination and set the output color space - if (!this->setOutputColorSpace(dstInfo)) { + // Check if we can decode to the requested destination + if (!conversion_possible(dstInfo, this->getInfo())) { SkCodecPrintf("Cannot convert to output type\n"); return NULL; } // Perform the necessary scaling if (!this->scaleToDimensions(dstInfo.width(), dstInfo.height())) { - SkCodecPrintf("Cannot scale to output dimensions\n"); + SkCodecPrintf("Cannot scale ot output dimensions\n"); return NULL; } // Now, given valid output dimensions, we can start the decompress - if (!turbo_jpeg_start_decompress(fDecoderMgr->dinfo())) { + if (!jpeg_start_decompress(fDecoderMgr->dinfo())) { SkCodecPrintf("start decompress failed\n"); return NULL; } + // Create the swizzler + this->initializeSwizzler(dstInfo, NULL, dstInfo.minRowBytes(), options); + if (NULL == fSwizzler) { + SkCodecPrintf("Could not create swizzler\n"); + return NULL; + } + // Return the new scanline decoder return SkNEW_ARGS(SkJpegScanlineDecoder, (dstInfo, this)); } diff --git a/src/codec/SkJpegCodec.h b/src/codec/SkJpegCodec.h index 1844269e6b..87c925d9d1 100644 --- a/src/codec/SkJpegCodec.h +++ b/src/codec/SkJpegCodec.h @@ -100,13 +100,6 @@ private: bool handleRewind(); /* - * Checks if the conversion between the input image and the requested output - * image has been implemented - * Sets the output color space - */ - bool setOutputColorSpace(const SkImageInfo& dst); - - /* * Checks if we can scale to the requested dimensions and scales the dimensions * if possible */ @@ -119,6 +112,8 @@ private: const Options& options); SkAutoTDelete<JpegDecoderMgr> fDecoderMgr; + SkAutoTDelete<SkSwizzler> fSwizzler; + size_t fSrcRowBytes; friend class SkJpegScanlineDecoder; diff --git a/src/codec/SkJpegDecoderMgr.cpp b/src/codec/SkJpegDecoderMgr.cpp index b5a12297a0..f0ed4522ca 100644 --- a/src/codec/SkJpegDecoderMgr.cpp +++ b/src/codec/SkJpegDecoderMgr.cpp @@ -39,9 +39,22 @@ SkCodec::Result JpegDecoderMgr::returnFailure(const char caller[], SkCodec::Resu SkColorType JpegDecoderMgr::getColorType() { switch (fDInfo.jpeg_color_space) { + case JCS_CMYK: + case JCS_YCCK: + // libjpeg cannot convert from CMYK or YCCK to RGB. + // Here, we ask libjpeg to give us CMYK samples back and + // we will later manually convert them to RGB. + fDInfo.out_color_space = JCS_CMYK; + return kN32_SkColorType; case JCS_GRAYSCALE: + fDInfo.out_color_space = JCS_GRAYSCALE; return kGray_8_SkColorType; default: +#ifdef ANDROID_RGB + fDInfo.out_color_space = JCS_RGBA_8888; +#else + fDInfo.out_color_space = JCS_RGB; +#endif return kN32_SkColorType; } } @@ -51,7 +64,7 @@ JpegDecoderMgr::JpegDecoderMgr(SkStream* stream) , fInit(false) { // Error manager must be set before any calls to libjeg in order to handle failures - fDInfo.err = turbo_jpeg_std_error(&fErrorMgr); + fDInfo.err = jpeg_std_error(&fErrorMgr); fErrorMgr.error_exit = skjpeg_err_exit; } diff --git a/src/codec/SkJpegDecoderMgr.h b/src/codec/SkJpegDecoderMgr.h index e65ef52c5a..0775dc07f0 100644 --- a/src/codec/SkJpegDecoderMgr.h +++ b/src/codec/SkJpegDecoderMgr.h @@ -18,7 +18,6 @@ #include <stdio.h> extern "C" { - #include "jpeglibmangler.h" #include "jpeglib.h" } diff --git a/src/codec/SkJpegUtility_codec.cpp b/src/codec/SkJpegUtility_codec.cpp index 418c899cbb..75a562a004 100644 --- a/src/codec/SkJpegUtility_codec.cpp +++ b/src/codec/SkJpegUtility_codec.cpp @@ -73,7 +73,7 @@ skjpeg_source_mgr::skjpeg_source_mgr(SkStream* stream) init_source = sk_init_source; fill_input_buffer = sk_fill_input_buffer; skip_input_data = sk_skip_input_data; - resync_to_restart = turbo_jpeg_resync_to_restart; + resync_to_restart = jpeg_resync_to_restart; term_source = sk_term_source; } diff --git a/src/codec/SkJpegUtility_codec.h b/src/codec/SkJpegUtility_codec.h index 4b3f1ab23b..43391017b5 100644 --- a/src/codec/SkJpegUtility_codec.h +++ b/src/codec/SkJpegUtility_codec.h @@ -16,7 +16,6 @@ #include <stdio.h> extern "C" { - #include "jpeglibmangler.h" #include "jpeglib.h" #include "jerror.h" } |