src/codec/SkCodec.cpp - Issue 1687863003: Make SkJpegCodec compatible with libjpeg

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 1687863003: Make SkJpegCodec compatible with libjpeg (Closed) Base URL: https://skia.googlesource.com/skia.git@master

Patch Set: Fix gyp Created 4 years, 10 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:

Index: src/codec/SkCodec.cpp

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

index f5a6d36e3b981a31efba661ba05447f4611c575e..0da36bb17182ad298060ee110911d6d288dd925d 100644

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

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

@@ -11,9 +11,7 @@

#include "SkData.h"

#include "SkGifCodec.h"

#include "SkIcoCodec.h"

-#if !defined(GOOGLE3)

#include "SkJpegCodec.h"

-#endif

#include "SkPngCodec.h"

#ifdef SK_CODEC_DECODES_RAW

#include "SkRawCodec.h"

@@ -28,9 +26,7 @@ struct DecoderProc {

};

static const DecoderProc gDecoderProcs[] = {

-#if !defined(GOOGLE3)

{ SkJpegCodec::IsJpeg, SkJpegCodec::NewFromStream },

-#endif

{ SkWebpCodec::IsWebp, SkWebpCodec::NewFromStream },

{ SkGifCodec::IsGif, SkGifCodec::NewFromStream },

{ SkIcoCodec::IsIco, SkIcoCodec::NewFromStream },

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