tools/skdiff_image.cpp - Issue 1788643003: Remove uses of SkImageDecoder from skdiff

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: tools/skdiff_image.cpp

Issue 1788643003: Remove uses of SkImageDecoder from skdiff (Closed) Base URL: https://skia.googlesource.com/skia.git@master

Patch Set: Created 4 years, 9 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: tools/skdiff_image.cpp

diff --git a/tools/skdiff_image.cpp b/tools/skdiff_image.cpp

index 9166988719447733a7989e18d3c61b06e1ac387b..f118d85b5c9abb8199d799fac0280e6c6ad60979 100644

--- a/tools/skdiff_image.cpp

+++ b/tools/skdiff_image.cpp

@@ -8,7 +8,6 @@

#include "skdiff_utils.h"

#include "SkBitmap.h"

#include "SkData.h"

-#include "SkImageDecoder.h"

#include "SkImageEncoder.h"

#include "SkOSFile.h"

#include "SkTDArray.h"

@@ -60,8 +59,8 @@ static void create_diff_images (DiffMetricProc dmp,

return;

}

- get_bitmap(baseFileBits, drp->fBase, SkImageDecoder::kDecodePixels_Mode);

- get_bitmap(comparisonFileBits, drp->fComparison, SkImageDecoder::kDecodePixels_Mode);

+ get_bitmap(baseFileBits, drp->fBase, false);

+ get_bitmap(comparisonFileBits, drp->fComparison, false);

if (DiffResource::kDecoded_Status != drp->fBase.fStatus ||

DiffResource::kDecoded_Status != drp->fComparison.fStatus)

{

« no previous file with comments | « no previous file | tools/skdiff_main.cpp » ('j') | tools/skdiff_main.cpp » ('J')