AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

make bitmap width/height 32bits, matching the API

Browse Source 
git-svn-id: http://skia.googlecode.com/svn/trunk@137 2bbb7eff-a529-9590-31e7-b0007b416f81
This commit is contained in:
reed@android.com 2009-03-27 12:33:50 +00:00
parent 3eab80cc1f
commit f459a4949d
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/core/SkBitmap.h
View File

@ -464,7 +464,8 @@ private:
}; };
uint32_t fRowBytes; uint32_t fRowBytes;
uint16_t fWidth, fHeight; uint32_t fWidth;
uint32_t fHeight;
uint8_t fConfig; uint8_t fConfig;
uint8_t fFlags; uint8_t fFlags;
uint8_t fBytesPerPixel; // based on config uint8_t fBytesPerPixel; // based on config

14
src/core/SkBitmap.cpp
View File

@ -30,7 +30,7 @@
struct MipLevel { struct MipLevel {
void* fPixels; void* fPixels;
uint32_t fRowBytes; uint32_t fRowBytes;
uint16_t fWidth, fHeight; uint32_t fWidth, fHeight;
}; };
struct SkBitmap::MipMap : SkNoncopyable { struct SkBitmap::MipMap : SkNoncopyable {
@ -132,9 +132,9 @@ void SkBitmap::swap(SkBitmap& other) {
SkTSwap<MipMap*>(fMipMap, other.fMipMap); SkTSwap<MipMap*>(fMipMap, other.fMipMap);
#endif #endif
SkTSwap<void*>(fPixels, other.fPixels); SkTSwap<void*>(fPixels, other.fPixels);
SkTSwap<uint16_t>(fWidth, other.fWidth);
SkTSwap<uint16_t>(fHeight, other.fHeight);
SkTSwap<uint32_t>(fRowBytes, other.fRowBytes); SkTSwap<uint32_t>(fRowBytes, other.fRowBytes);
SkTSwap<uint32_t>(fWidth, other.fWidth);
SkTSwap<uint32_t>(fHeight, other.fHeight);
SkTSwap<uint8_t>(fConfig, other.fConfig); SkTSwap<uint8_t>(fConfig, other.fConfig);
SkTSwap<uint8_t>(fFlags, other.fFlags); SkTSwap<uint8_t>(fFlags, other.fFlags);
SkTSwap<uint8_t>(fBytesPerPixel, other.fBytesPerPixel); SkTSwap<uint8_t>(fBytesPerPixel, other.fBytesPerPixel);
@ -225,8 +225,8 @@ void SkBitmap::setConfig(Config c, int width, int height, int rowBytes) {
rowBytes = SkBitmap::ComputeRowBytes(c, width); rowBytes = SkBitmap::ComputeRowBytes(c, width);
} }
fConfig = SkToU8(c); fConfig = SkToU8(c);
fWidth = SkToU16(width); fWidth = width;
fHeight = SkToU16(height); fHeight = height;
fRowBytes = rowBytes; fRowBytes = rowBytes;
fBytesPerPixel = (uint8_t)ComputeBytesPerPixel(c); fBytesPerPixel = (uint8_t)ComputeBytesPerPixel(c);
@ -891,8 +891,8 @@ void SkBitmap::buildMipMap(bool forceRebuild) {
rowBytes = ComputeRowBytes(config, width); rowBytes = ComputeRowBytes(config, width);
level[i].fPixels = addr; level[i].fPixels = addr;
level[i].fWidth = SkToU16(width); level[i].fWidth = width;
level[i].fHeight = SkToU16(height); level[i].fHeight = height;
level[i].fRowBytes = rowBytes; level[i].fRowBytes = rowBytes;
dstBM.setConfig(config, width, height, rowBytes); dstBM.setConfig(config, width, height, rowBytes);