AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove SkJpegCodec.cpp from Google3 BUILD due to differing libjpeg_turbo versions.

Browse Source 
BUG=skia:4520

Review URL: https://codereview.chromium.org/1418423008
This commit is contained in:
benjaminwagner 2015-10-27 09:14:29 -07:00 committed by Commit bot
parent 13dd023882
commit aada3e802d
3 changed files with 5 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
BUILD.public
View File

@ -48,6 +48,7 @@ SRCS = glob(
"src/gpu/gl/GrGLDefaultInterface_none.cpp",
# Exclude files that don't compile with the current DEFINES.
"src/codec/SkJpegCodec.cpp", # libjpeg_turbo version mismatch.
"src/gpu/gl/angle/*", # Requires SK_ANGLE define.
"src/gpu/gl/command_buffer/*", # unknown type name 'HMODULE'
"src/gpu/gl/mesa/*", # Requires SK_MESA define.

4
src/codec/SkCodec.cpp
View File

@ -13,7 +13,7 @@
#include "SkCodec_libpng.h"
#include "SkCodec_wbmp.h"
#include "SkCodecPriv.h"
#ifndef SK_BUILD_FOR_ANDROID_FRAMEWORK
#if !defined(SK_BUILD_FOR_ANDROID_FRAMEWORK) && !defined(GOOGLE3)
#include "SkJpegCodec.h"
#endif
#include "SkStream.h"
@ -26,7 +26,7 @@ struct DecoderProc {
static const DecoderProc gDecoderProcs[] = {
{ SkPngCodec::IsPng, SkPngCodec::NewFromStream },
#ifndef SK_BUILD_FOR_ANDROID_FRAMEWORK
#if !defined(SK_BUILD_FOR_ANDROID_FRAMEWORK) && !defined(GOOGLE3)
{ SkJpegCodec::IsJpeg, SkJpegCodec::NewFromStream },
#endif
{ SkWebpCodec::IsWebp, SkWebpCodec::NewFromStream },

20
src/codec/SkJpegCodec.cpp
View File

@ -87,11 +87,7 @@ SkJpegCodec::SkJpegCodec(const SkImageInfo& srcInfo, SkStream* stream,
* Return the row bytes of a particular image type and width
*/
static int get_row_bytes(const j_decompress_ptr dinfo) {
#if defined (GOOGLE3)
int colorBytes = dinfo->out_color_components;
#else
int colorBytes = (dinfo->out_color_space == JCS_RGB565) ? 2 : dinfo->out_color_components;
#endif
return dinfo->output_width * colorBytes;
}
@ -187,14 +183,10 @@ bool SkJpegCodec::setOutputColorSpace(const SkImageInfo& dst) {
} else {
// Check the byte ordering of the RGBA color space for the
// current platform
#if defined(GOOGLE3)
return false;
#else
#if defined(SK_PMCOLOR_IS_RGBA)
#if defined(SK_PMCOLOR_IS_RGBA)
fDecoderMgr->dinfo()->out_color_space = JCS_EXT_RGBA;
#else
#else
fDecoderMgr->dinfo()->out_color_space = JCS_EXT_BGRA;
#endif
#endif
}
return true;
@ -202,12 +194,8 @@ bool SkJpegCodec::setOutputColorSpace(const SkImageInfo& dst) {
if (isCMYK) {
fDecoderMgr->dinfo()->out_color_space = JCS_CMYK;
} else {
#if defined(GOOGLE3)
return false;
#else
fDecoderMgr->dinfo()->dither_mode = JDITHER_NONE;
fDecoderMgr->dinfo()->out_color_space = JCS_RGB565;
#endif
}
return true;
case kGray_8_SkColorType:
@ -358,11 +346,7 @@ void SkJpegCodec::initializeSwizzler(const SkImageInfo& dstInfo, const Options&
break;
default:
// This function should only be called if the colorType is supported by jpeg
#if defined(GOOGLE3)
SK_CRASH();
#else
SkASSERT(false);
#endif
}
}