| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright 2006 The Android Open Source Project | 2 * Copyright 2006 The Android Open Source Project |
| 3 * | 3 * |
| 4 * Use of this source code is governed by a BSD-style license that can be | 4 * Use of this source code is governed by a BSD-style license that can be |
| 5 * found in the LICENSE file. | 5 * found in the LICENSE file. |
| 6 */ | 6 */ |
| 7 | 7 |
| 8 #ifndef SkBitmap_DEFINED | 8 #ifndef SkBitmap_DEFINED |
| 9 #define SkBitmap_DEFINED | 9 #define SkBitmap_DEFINED |
| 10 | 10 |
| (...skipping 729 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 740 void setPackedAtY(int y, uint8_t* addr) { | 740 void setPackedAtY(int y, uint8_t* addr) { |
| 741 SkASSERT((unsigned)y < (unsigned)fHeight); | 741 SkASSERT((unsigned)y < (unsigned)fHeight); |
| 742 fYPtrs[y] = addr; | 742 fYPtrs[y] = addr; |
| 743 } | 743 } |
| 744 | 744 |
| 745 private: | 745 private: |
| 746 uint8_t** fYPtrs; | 746 uint8_t** fYPtrs; |
| 747 int fHeight; | 747 int fHeight; |
| 748 }; | 748 }; |
| 749 | 749 |
| 750 SkDEVCODE(void toString(SkString* str) const;) | 750 SK_TO_STRING_NONVIRT() |
| 751 | 751 |
| 752 private: | 752 private: |
| 753 struct MipMap; | 753 struct MipMap; |
| 754 mutable MipMap* fMipMap; | 754 mutable MipMap* fMipMap; |
| 755 | 755 |
| 756 mutable SkPixelRef* fPixelRef; | 756 mutable SkPixelRef* fPixelRef; |
| 757 mutable int fPixelLockCount; | 757 mutable int fPixelLockCount; |
| 758 // These are just caches from the locked pixelref | 758 // These are just caches from the locked pixelref |
| 759 mutable void* fPixels; | 759 mutable void* fPixels; |
| 760 mutable SkColorTable* fColorTable; // only meaningful for kIndex8 | 760 mutable SkColorTable* fColorTable; // only meaningful for kIndex8 |
| (...skipping 157 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 918 } | 918 } |
| 919 | 919 |
| 920 /////////////////////////////////////////////////////////////////////////////// | 920 /////////////////////////////////////////////////////////////////////////////// |
| 921 // | 921 // |
| 922 // Helpers until we can fully deprecate SkBitmap::Config | 922 // Helpers until we can fully deprecate SkBitmap::Config |
| 923 // | 923 // |
| 924 extern SkBitmap::Config SkColorTypeToBitmapConfig(SkColorType); | 924 extern SkBitmap::Config SkColorTypeToBitmapConfig(SkColorType); |
| 925 extern SkColorType SkBitmapConfigToColorType(SkBitmap::Config); | 925 extern SkColorType SkBitmapConfigToColorType(SkBitmap::Config); |
| 926 | 926 |
| 927 #endif | 927 #endif |
| OLD | NEW |