diff options
Diffstat (limited to 'include/images')
| -rw-r--r-- | include/images/SkImageRef.h | 7 | ||||
| -rw-r--r-- | include/images/SkImageRef_GlobalPool.h | 2 |
2 files changed, 5 insertions, 4 deletions
diff --git a/include/images/SkImageRef.h b/include/images/SkImageRef.h index 36f95e64b2..0599a8d963 100644 --- a/include/images/SkImageRef.h +++ b/include/images/SkImageRef.h @@ -34,7 +34,7 @@ public: @param config The preferred config of the decoded bitmap. @param sampleSize Requested sampleSize for decoding. Defaults to 1. */ - SkImageRef(const SkImageInfo&, SkStreamRewindable*, int sampleSize = 1, + SkImageRef(SkStreamRewindable*, SkBitmap::Config config, int sampleSize = 1, SkBaseMutex* mutex = NULL); virtual ~SkImageRef(); @@ -72,9 +72,9 @@ protected: When these are called, we will have already acquired the mutex! */ - virtual bool onNewLockPixels(LockRec*) SK_OVERRIDE; + virtual void* onLockPixels(SkColorTable**); // override this in your subclass to clean up when we're unlocking pixels - virtual void onUnlockPixels() SK_OVERRIDE {} + virtual void onUnlockPixels() {} SkImageRef(SkFlattenableReadBuffer&, SkBaseMutex* mutex = NULL); virtual void flatten(SkFlattenableWriteBuffer&) const SK_OVERRIDE; @@ -89,6 +89,7 @@ private: SkImageDecoderFactory* fFactory; // may be null SkStreamRewindable* fStream; + SkBitmap::Config fConfig; int fSampleSize; bool fDoDither; bool fErrorInDecoding; diff --git a/include/images/SkImageRef_GlobalPool.h b/include/images/SkImageRef_GlobalPool.h index caaf2487de..3adc0f6150 100644 --- a/include/images/SkImageRef_GlobalPool.h +++ b/include/images/SkImageRef_GlobalPool.h @@ -15,7 +15,7 @@ class SkImageRef_GlobalPool : public SkImageRef { public: // if pool is null, use the global pool - SkImageRef_GlobalPool(const SkImageInfo&, SkStreamRewindable*, + SkImageRef_GlobalPool(SkStreamRewindable*, SkBitmap::Config, int sampleSize = 1); virtual ~SkImageRef_GlobalPool(); |