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

Side by Side Diff: src/codec/SkCodec.cpp

Issue 1214023003: Revert of Switch SkJpegCode to libjpeg-turbo (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 5 years, 5 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 | « gyp/yasm.gyp ('k') | src/codec/SkJpegCodec.h » ('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 #include "SkCodec.h" 8 #include "SkCodec.h"
9 #include "SkData.h" 9 #include "SkData.h"
10 #include "SkCodec_libbmp.h" 10 #include "SkCodec_libbmp.h"
11 #include "SkCodec_libgif.h" 11 #include "SkCodec_libgif.h"
12 #include "SkCodec_libico.h" 12 #include "SkCodec_libico.h"
13 #include "SkCodec_libpng.h" 13 #include "SkCodec_libpng.h"
14 #include "SkCodec_wbmp.h" 14 #include "SkCodec_wbmp.h"
15 #include "SkCodecPriv.h" 15 #include "SkCodecPriv.h"
16 #ifndef SK_BUILD_FOR_ANDROID_FRAMEWORK
17 #include "SkJpegCodec.h" 16 #include "SkJpegCodec.h"
18 #endif
19 #include "SkStream.h" 17 #include "SkStream.h"
20 #include "SkWebpCodec.h" 18 #include "SkWebpCodec.h"
21 19
22 struct DecoderProc { 20 struct DecoderProc {
23 bool (*IsFormat)(SkStream*); 21 bool (*IsFormat)(SkStream*);
24 SkCodec* (*NewFromStream)(SkStream*); 22 SkCodec* (*NewFromStream)(SkStream*);
25 }; 23 };
26 24
27 static const DecoderProc gDecoderProcs[] = { 25 static const DecoderProc gDecoderProcs[] = {
28 { SkPngCodec::IsPng, SkPngCodec::NewFromStream }, 26 { SkPngCodec::IsPng, SkPngCodec::NewFromStream },
29 #ifndef SK_BUILD_FOR_ANDROID_FRAMEWORK
30 { SkJpegCodec::IsJpeg, SkJpegCodec::NewFromStream }, 27 { SkJpegCodec::IsJpeg, SkJpegCodec::NewFromStream },
31 #endif
32 { SkWebpCodec::IsWebp, SkWebpCodec::NewFromStream }, 28 { SkWebpCodec::IsWebp, SkWebpCodec::NewFromStream },
33 { SkGifCodec::IsGif, SkGifCodec::NewFromStream }, 29 { SkGifCodec::IsGif, SkGifCodec::NewFromStream },
34 { SkIcoCodec::IsIco, SkIcoCodec::NewFromStream }, 30 { SkIcoCodec::IsIco, SkIcoCodec::NewFromStream },
35 { SkBmpCodec::IsBmp, SkBmpCodec::NewFromStream }, 31 { SkBmpCodec::IsBmp, SkBmpCodec::NewFromStream },
36 { SkWbmpCodec::IsWbmp, SkWbmpCodec::NewFromStream } 32 { SkWbmpCodec::IsWbmp, SkWbmpCodec::NewFromStream }
37 }; 33 };
38 34
39 SkCodec* SkCodec::NewFromStream(SkStream* stream) { 35 SkCodec* SkCodec::NewFromStream(SkStream* stream) {
40 if (!stream) { 36 if (!stream) {
41 return NULL; 37 return NULL;
(...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after
106 return fScanlineDecoder.get(); 102 return fScanlineDecoder.get();
107 } 103 }
108 104
109 SkScanlineDecoder* SkCodec::getScanlineDecoder(const SkImageInfo& dstInfo) { 105 SkScanlineDecoder* SkCodec::getScanlineDecoder(const SkImageInfo& dstInfo) {
110 SkASSERT(kIndex_8_SkColorType != dstInfo.colorType()); 106 SkASSERT(kIndex_8_SkColorType != dstInfo.colorType());
111 if (kIndex_8_SkColorType == dstInfo.colorType()) { 107 if (kIndex_8_SkColorType == dstInfo.colorType()) {
112 return NULL; 108 return NULL;
113 } 109 }
114 return this->getScanlineDecoder(dstInfo, NULL, NULL, NULL); 110 return this->getScanlineDecoder(dstInfo, NULL, NULL, NULL);
115 } 111 }
OLDNEW
« no previous file with comments | « gyp/yasm.gyp ('k') | src/codec/SkJpegCodec.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698