diff options
| -rw-r--r-- | dm/DM.cpp | 2 | ||||
| -rw-r--r-- | include/codec/SkEncodedFormat.h | 2 | ||||
| -rw-r--r-- | src/codec/SkAndroidCodec.cpp | 2 | ||||
| -rw-r--r-- | src/codec/SkRawCodec.h | 2 | ||||
| -rw-r--r-- | tools/get_images_from_skps.cpp | 2 |
5 files changed, 5 insertions, 5 deletions
@@ -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); diff --git a/include/codec/SkEncodedFormat.h b/include/codec/SkEncodedFormat.h index 275dde608e..c097e088f2 100644 --- a/include/codec/SkEncodedFormat.h +++ b/include/codec/SkEncodedFormat.h @@ -23,6 +23,6 @@ enum SkEncodedFormat { kPKM_SkEncodedFormat, kKTX_SkEncodedFormat, kASTC_SkEncodedFormat, - kRAW_SkEncodedFormat, + kDNG_SkEncodedFormat, }; #endif // SkEncodedFormat_DEFINED diff --git a/src/codec/SkAndroidCodec.cpp b/src/codec/SkAndroidCodec.cpp index 7dfd64de75..6c3efe095a 100644 --- a/src/codec/SkAndroidCodec.cpp +++ b/src/codec/SkAndroidCodec.cpp @@ -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: diff --git a/src/codec/SkRawCodec.h b/src/codec/SkRawCodec.h index e091c97d3f..3ca7b9c17e 100644 --- a/src/codec/SkRawCodec.h +++ b/src/codec/SkRawCodec.h @@ -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; diff --git a/tools/get_images_from_skps.cpp b/tools/get_images_from_skps.cpp index 64b39b0682..7d0854d4d4 100644 --- a/tools/get_images_from_skps.cpp +++ b/tools/get_images_from_skps.cpp @@ -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; |