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

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

Issue 1782913002: Rename the kRAW_SkEncodedFormat to kDNG_SkEncodedFormat as it is actually only used for DNG for… (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Fix code formatting 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:
View unified diff | Download patch
« no previous file with comments | « include/codec/SkEncodedFormat.h ('k') | src/codec/SkRawCodec.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 "SkAndroidCodec.h" 8 #include "SkAndroidCodec.h"
9 #include "SkCodec.h" 9 #include "SkCodec.h"
10 #include "SkCodecPriv.h" 10 #include "SkCodecPriv.h"
(...skipping 29 matching lines...) Expand all
40 case kGIF_SkEncodedFormat: 40 case kGIF_SkEncodedFormat:
41 #endif 41 #endif
42 case kBMP_SkEncodedFormat: 42 case kBMP_SkEncodedFormat:
43 case kWBMP_SkEncodedFormat: 43 case kWBMP_SkEncodedFormat:
44 return new SkSampledCodec(codec.detach()); 44 return new SkSampledCodec(codec.detach());
45 #ifdef SK_CODEC_DECODES_WEBP 45 #ifdef SK_CODEC_DECODES_WEBP
46 case kWEBP_SkEncodedFormat: 46 case kWEBP_SkEncodedFormat:
47 return new SkWebpAdapterCodec((SkWebpCodec*) codec.detach()); 47 return new SkWebpAdapterCodec((SkWebpCodec*) codec.detach());
48 #endif 48 #endif
49 #ifdef SK_CODEC_DECODES_RAW 49 #ifdef SK_CODEC_DECODES_RAW
50 case kRAW_SkEncodedFormat: 50 case kDNG_SkEncodedFormat:
51 return new SkRawAdapterCodec((SkRawCodec*)codec.detach()); 51 return new SkRawAdapterCodec((SkRawCodec*)codec.detach());
52 #endif 52 #endif
53 default: 53 default:
54 return nullptr; 54 return nullptr;
55 } 55 }
56 } 56 }
57 57
58 SkAndroidCodec* SkAndroidCodec::NewFromData(SkData* data, SkPngChunkReader* chun kReader) { 58 SkAndroidCodec* SkAndroidCodec::NewFromData(SkData* data, SkPngChunkReader* chun kReader) {
59 if (!data) { 59 if (!data) {
60 return nullptr; 60 return nullptr;
(...skipping 127 matching lines...) Expand 10 before | Expand all | Expand 10 after
188 } 188 }
189 } 189 }
190 190
191 return this->onGetAndroidPixels(info, pixels, rowBytes, *options); 191 return this->onGetAndroidPixels(info, pixels, rowBytes, *options);
192 } 192 }
193 193
194 SkCodec::Result SkAndroidCodec::getAndroidPixels(const SkImageInfo& info, void* pixels, 194 SkCodec::Result SkAndroidCodec::getAndroidPixels(const SkImageInfo& info, void* pixels,
195 size_t rowBytes) { 195 size_t rowBytes) {
196 return this->getAndroidPixels(info, pixels, rowBytes, nullptr); 196 return this->getAndroidPixels(info, pixels, rowBytes, nullptr);
197 } 197 }
OLDNEW
« no previous file with comments | « include/codec/SkEncodedFormat.h ('k') | src/codec/SkRawCodec.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698