AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Rename the kRAW_SkEncodedFormat to kDNG_SkEncodedFormat as it is actually only used for DNG format

Browse Source 
BUG=b/27587823
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1782913002

Review URL: https://codereview.chromium.org/1782913002
This commit is contained in:
yujieqin 2016-03-11 07:32:33 -08:00 committed by Commit bot
parent 40dec542cc
commit 7a307df926
5 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dm/DM.cpp
View File

@ -485,7 +485,7 @@ static void push_codec_srcs(Path path) {
case SkEncodedFormat::kWEBP_SkEncodedFormat:
nativeModes.push_back(CodecSrc::kSubset_Mode);
break;
case SkEncodedFormat::kRAW_SkEncodedFormat:
case SkEncodedFormat::kDNG_SkEncodedFormat:
break;
default:
nativeModes.push_back(CodecSrc::kScanline_Mode);

2
include/codec/SkEncodedFormat.h
View File

@ -23,6 +23,6 @@ enum SkEncodedFormat {
kPKM_SkEncodedFormat,
kKTX_SkEncodedFormat,
kASTC_SkEncodedFormat,
kRAW_SkEncodedFormat,
kDNG_SkEncodedFormat,
};
#endif // SkEncodedFormat_DEFINED

2
src/codec/SkAndroidCodec.cpp
View File

@ -47,7 +47,7 @@ SkAndroidCodec* SkAndroidCodec::NewFromStream(SkStream* stream, SkPngChunkReader
return new SkWebpAdapterCodec((SkWebpCodec*) codec.detach());
#endif
#ifdef SK_CODEC_DECODES_RAW
case kRAW_SkEncodedFormat:
case kDNG_SkEncodedFormat:
return new SkRawAdapterCodec((SkRawCodec*)codec.detach());
#endif
default:

2
src/codec/SkRawCodec.h
View File

@ -38,7 +38,7 @@ protected:
SkPMColor*, int*, int*) override;
SkEncodedFormat onGetEncodedFormat() const override {
return kRAW_SkEncodedFormat;
return kDNG_SkEncodedFormat;
}
SkISize onGetScaledDimensions(float desiredScale) const override;

2
tools/get_images_from_skps.cpp
View File

@ -50,7 +50,7 @@ struct Sniffer : public SkPixelSerializer {
case SkEncodedFormat::kICO_SkEncodedFormat: ext = "ico"; break;
case SkEncodedFormat::kJPEG_SkEncodedFormat: ext = "jpg"; break;
case SkEncodedFormat::kPNG_SkEncodedFormat: ext = "png"; break;
case SkEncodedFormat::kRAW_SkEncodedFormat: ext = "dng"; break;
case SkEncodedFormat::kDNG_SkEncodedFormat: ext = "dng"; break;
case SkEncodedFormat::kWBMP_SkEncodedFormat: ext = "wbmp"; break;
case SkEncodedFormat::kWEBP_SkEncodedFormat: ext = "webp"; break;
default: gUnknown++; return;