Index: src/codec/SkJpegCodec.h |
diff --git a/src/codec/SkJpegCodec.h b/src/codec/SkJpegCodec.h |
index 1844269e6b3eff13a2e53dd636a8845e299c8739..2e18af68f9bd2b708b66a4c8450a2dcf718b4a98 100644 |
--- a/src/codec/SkJpegCodec.h |
+++ b/src/codec/SkJpegCodec.h |
@@ -60,6 +60,7 @@ protected: |
SkPMColor ctable[], int* ctableCount) override; |
private: |
+ SkAutoTDelete<SkSwizzler> fSwizzler; |
/* |
* Read enough of the stream to initialize the SkJpegCodec. |
@@ -95,6 +96,11 @@ private: |
SkJpegCodec(const SkImageInfo& srcInfo, SkStream* stream, JpegDecoderMgr* decoderMgr); |
/* |
+ * Create the swizzler based on the encoded format |
+ */ |
+ Result initializeSwizzler(const SkImageInfo& requestedInfo, const Options&); |
+ |
+ /* |
* Handles rewinding the input stream if it is necessary |
*/ |
bool handleRewind(); |
@@ -107,19 +113,14 @@ private: |
bool setOutputColorSpace(const SkImageInfo& dst); |
/* |
- * Checks if we can scale to the requested dimensions and scales the dimensions |
- * if possible |
+ * Checks if we can natively scale to the requested dimensions and natively scales the |
+ * dimensions if possible |
*/ |
- bool scaleToDimensions(uint32_t width, uint32_t height); |
- |
- /* |
- * Create the swizzler based on the encoded format |
- */ |
- void initializeSwizzler(const SkImageInfo& dstInfo, void* dst, size_t dstRowBytes, |
- const Options& options); |
+ bool nativelyScaleToDimensions(uint32_t width, uint32_t height); |
SkAutoTDelete<JpegDecoderMgr> fDecoderMgr; |
- |
+ int fPartialDenom; |
scroggo
2015/08/05 19:10:04
These are no longer needed, right?
emmaleer
2015/08/06 13:45:46
Acknowledged.
|
+ int fPartialNum; |
friend class SkJpegScanlineDecoder; |
typedef SkCodec INHERITED; |