Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(387)

Side by Side Diff: src/codec/SkJpegCodec.h

Issue 2202763002: Fix SkJpegCodec::onSkipScanlines when TURBO_HAS_SKIP is not defined (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Comments Created 4 years, 4 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 unified diff | Download patch
« no previous file with comments | « no previous file | src/codec/SkJpegCodec.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright 2015 Google Inc. 2 * Copyright 2015 Google Inc.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license that can be 4 * Use of this source code is governed by a BSD-style license that can be
5 * found in the LICENSE file. 5 * found in the LICENSE file.
6 */ 6 */
7 7
8 #ifndef SkJpegCodec_DEFINED 8 #ifndef SkJpegCodec_DEFINED
9 #define SkJpegCodec_DEFINED 9 #define SkJpegCodec_DEFINED
10 10
11 // For testing.
12 #ifdef SKNX_NO_SIMD
13 #undef TURBO_HAS_CROP
14 #undef TURBO_HAS_SKIP
15 #undef TURBO_HAS_565
16 #endif
17
11 #include "SkCodec.h" 18 #include "SkCodec.h"
12 #include "SkColorSpace.h" 19 #include "SkColorSpace.h"
13 #include "SkColorSpaceXform.h" 20 #include "SkColorSpaceXform.h"
14 #include "SkImageInfo.h" 21 #include "SkImageInfo.h"
15 #include "SkSwizzler.h" 22 #include "SkSwizzler.h"
16 #include "SkStream.h" 23 #include "SkStream.h"
17 #include "SkTemplates.h" 24 #include "SkTemplates.h"
18 25
19 class JpegDecoderMgr; 26 class JpegDecoderMgr;
20 27
(...skipping 113 matching lines...) Expand 10 before | Expand all | Expand 10 after
134 // libjpeg-turbo provides some subsetting. In the case that libjpeg-turbo 141 // libjpeg-turbo provides some subsetting. In the case that libjpeg-turbo
135 // cannot take the exact the subset that we need, we will use the swizzler 142 // cannot take the exact the subset that we need, we will use the swizzler
136 // to further subset the output from libjpeg-turbo. 143 // to further subset the output from libjpeg-turbo.
137 SkIRect fSwizzlerSubset; 144 SkIRect fSwizzlerSubset;
138 145
139 SkAutoTDelete<SkSwizzler> fSwizzler; 146 SkAutoTDelete<SkSwizzler> fSwizzler;
140 std::unique_ptr<SkColorSpaceXform> fColorXform; 147 std::unique_ptr<SkColorSpaceXform> fColorXform;
141 148
142 sk_sp<SkData> fICCData; 149 sk_sp<SkData> fICCData;
143 150
151 #if !defined(TURBO_HAS_SKIP)
152 SkAutoTMalloc<uint8_t> fSkipStorage;
153 #endif
154
144 typedef SkCodec INHERITED; 155 typedef SkCodec INHERITED;
145 }; 156 };
146 157
147 #endif 158 #endif
OLDNEW
« no previous file with comments | « no previous file | src/codec/SkJpegCodec.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698