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

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

Issue 1254963006: Rename SkCodec_libbmp to SkBmpCodec (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 5 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 | « src/codec/SkBmpCodec.cpp ('k') | src/codec/SkCodec_libbmp.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 "SkBmpCodec.h"
8 #include "SkCodec.h" 9 #include "SkCodec.h"
9 #include "SkData.h" 10 #include "SkData.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 16 #ifndef SK_BUILD_FOR_ANDROID_FRAMEWORK
17 #include "SkJpegCodec.h" 17 #include "SkJpegCodec.h"
18 #endif 18 #endif
19 #include "SkStream.h" 19 #include "SkStream.h"
20 #include "SkWebpCodec.h" 20 #include "SkWebpCodec.h"
(...skipping 131 matching lines...) Expand 10 before | Expand all | Expand 10 after
152 return this->onGetScanlineDecoder(dstInfo, *options, ctable, ctableCount); 152 return this->onGetScanlineDecoder(dstInfo, *options, ctable, ctableCount);
153 } 153 }
154 154
155 SkScanlineDecoder* SkCodec::getScanlineDecoder(const SkImageInfo& dstInfo) { 155 SkScanlineDecoder* SkCodec::getScanlineDecoder(const SkImageInfo& dstInfo) {
156 SkASSERT(kIndex_8_SkColorType != dstInfo.colorType()); 156 SkASSERT(kIndex_8_SkColorType != dstInfo.colorType());
157 if (kIndex_8_SkColorType == dstInfo.colorType()) { 157 if (kIndex_8_SkColorType == dstInfo.colorType()) {
158 return NULL; 158 return NULL;
159 } 159 }
160 return this->getScanlineDecoder(dstInfo, NULL, NULL, NULL); 160 return this->getScanlineDecoder(dstInfo, NULL, NULL, NULL);
161 } 161 }
OLDNEW
« no previous file with comments | « src/codec/SkBmpCodec.cpp ('k') | src/codec/SkCodec_libbmp.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698