src/codec/SkCodec.cpp - Issue 1418423008: Remove SkJpegCodec.cpp from Google3 BUILD due to differing libjpeg_turbo versions.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: src/codec/SkCodec.cpp

Issue 1418423008: Remove SkJpegCodec.cpp from Google3 BUILD due to differing libjpeg_turbo versions. (Closed) Base URL: https://skia.googlesource.com/skia@master

Patch Set: Created 5 years, 2 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

Index: src/codec/SkCodec.cpp

diff --git a/src/codec/SkCodec.cpp b/src/codec/SkCodec.cpp

index 56f6a8de9e4c6f6d9c72abef44d1402d5586828c..0c6c95ae2d2e45a270bb27ab63ce49bf59514b89 100644

--- a/src/codec/SkCodec.cpp

+++ b/src/codec/SkCodec.cpp

@@ -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 },

« no previous file with comments | « BUILD.public ('k') | src/codec/SkJpegCodec.cpp » ('j') | no next file with comments »