diff options
| author | Wei-Ta Chen <weita@google.com> | 2010-09-22 23:09:42 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-22 23:09:42 -0700 |
| commit | bfa4ebfb277423431a6958a7e024d16d95e7f6bc (patch) | |
| tree | 69d6f23a24d9fc8ddf9aebaee842f3fc24ecca34 /src | |
| parent | 4ab44089c879dbd9a23d8ca567d77e34763d41b2 (diff) | |
| parent | 2626a12394e8b284ff7d88e0ec0e99beaa31b795 (diff) | |
| download | external_skia-bfa4ebfb277423431a6958a7e024d16d95e7f6bc.zip external_skia-bfa4ebfb277423431a6958a7e024d16d95e7f6bc.tar.gz external_skia-bfa4ebfb277423431a6958a7e024d16d95e7f6bc.tar.bz2 | |
am 2626a123: am c408f5a2: Merge "Rename SkLargeBitmap to SkBitmapRegionDecoder (the previous renaming was reverted)." into gingerbread
Merge commit '2626a12394e8b284ff7d88e0ec0e99beaa31b795'
* commit '2626a12394e8b284ff7d88e0ec0e99beaa31b795':
Rename SkLargeBitmap to SkBitmapRegionDecoder (the previous renaming was reverted).
Diffstat (limited to 'src')
| -rw-r--r-- | src/images/SkBitmapRegionDecoder.cpp | 7 | ||||
| -rw-r--r-- | src/images/SkLargeBitmap.cpp | 7 |
2 files changed, 7 insertions, 7 deletions
diff --git a/src/images/SkBitmapRegionDecoder.cpp b/src/images/SkBitmapRegionDecoder.cpp new file mode 100644 index 0000000..24bc446 --- /dev/null +++ b/src/images/SkBitmapRegionDecoder.cpp @@ -0,0 +1,7 @@ +#include "SkBitmapRegionDecoder.h" + +bool SkBitmapRegionDecoder::decodeRegion(SkBitmap* bitmap, SkIRect rect, + SkBitmap::Config pref, int sampleSize) { + fDecoder->setSampleSize(sampleSize); + return fDecoder->decodeRegion(bitmap, rect, pref); +} diff --git a/src/images/SkLargeBitmap.cpp b/src/images/SkLargeBitmap.cpp deleted file mode 100644 index 18fb36f..0000000 --- a/src/images/SkLargeBitmap.cpp +++ /dev/null @@ -1,7 +0,0 @@ -#include "SkLargeBitmap.h" - -bool SkLargeBitmap::decodeRegion(SkBitmap* bitmap, SkIRect rect, - SkBitmap::Config pref, int sampleSize) { - fDecoder->setSampleSize(sampleSize); - return fDecoder->decodeRegion(bitmap, rect, pref); -} |