diff options
| author | Steve Kondik <shade@chemlab.org> | 2012-11-18 15:51:29 -0800 |
|---|---|---|
| committer | Steve Kondik <shade@chemlab.org> | 2012-11-18 15:51:29 -0800 |
| commit | a0a3a4d3f7e368311d896eaca0a22732a81d37fb (patch) | |
| tree | c4590b3f4713d99a0f55be9f270231ce56c98779 /include/core/SkBitmap.h | |
| parent | 93df05afa45a51715db60aa88cc6ea11f232b3ea (diff) | |
| parent | 7cd90d4eecdba0f40a36945749d40df95d6d641b (diff) | |
| download | external_skia-a0a3a4d3f7e368311d896eaca0a22732a81d37fb.zip external_skia-a0a3a4d3f7e368311d896eaca0a22732a81d37fb.tar.gz external_skia-a0a3a4d3f7e368311d896eaca0a22732a81d37fb.tar.bz2 | |
Merge branch 'jb-mr1-release' of https://android.googlesource.com/platform/external/skia into mr1-staging
Change-Id: I5cf0639d6ad25f58af4d5e0e480ee063148991f8
Diffstat (limited to 'include/core/SkBitmap.h')
| -rw-r--r-- | include/core/SkBitmap.h | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/include/core/SkBitmap.h b/include/core/SkBitmap.h index 57b80e5..2d5fc41 100644 --- a/include/core/SkBitmap.h +++ b/include/core/SkBitmap.h @@ -513,6 +513,16 @@ public: */ int extractMipLevel(SkBitmap* dst, SkFixed sx, SkFixed sy); +#ifdef SK_BUILD_FOR_ANDROID + bool hasHardwareMipMap() const { + return fHasHardwareMipMap; + } + + void setHasHardwareMipMap(bool hasHardwareMipMap) { + fHasHardwareMipMap = hasHardwareMipMap; + } +#endif + bool extractAlpha(SkBitmap* dst) const { return this->extractAlpha(dst, NULL, NULL, NULL); } @@ -614,6 +624,10 @@ private: uint8_t fFlags; uint8_t fBytesPerPixel; // based on config +#ifdef SK_BUILD_FOR_ANDROID + bool fHasHardwareMipMap; +#endif + /* Internal computations for safe size. */ static Sk64 ComputeSafeSize64(Config config, |