Rename SkLargeBitmap to SkBitmapRegionDecoder.
Change-Id: I093aea3d5e3e89c75b5086ede2b8bb30d8ceed95
diff --git a/Android.mk b/Android.mk
index 6f8162c..fd98e66 100644
--- a/Android.mk
+++ b/Android.mk
@@ -78,7 +78,7 @@
src/images/SkImageRef_GlobalPool.cpp \
src/images/SkImageRefPool.cpp \
src/images/SkJpegUtility.cpp \
- src/images/SkLargeBitmap.cpp \
+ src/images/SkBitmapRegionDecoder.cpp \
src/images/SkMovie.cpp \
src/images/SkMovie_gif.cpp \
src/images/SkPageFlipper.cpp \
@@ -282,4 +282,3 @@
# unit-tests
include $(BASE_PATH)/tests/Android.mk
-
diff --git a/include/images/SkLargeBitmap.h b/include/images/SkBitmapRegionDecoder.h
similarity index 71%
rename from include/images/SkLargeBitmap.h
rename to include/images/SkBitmapRegionDecoder.h
index 0d19f32..5b35371 100644
--- a/include/images/SkLargeBitmap.h
+++ b/include/images/SkBitmapRegionDecoder.h
@@ -1,18 +1,18 @@
-#ifndef SkLargeBitmap_DEFINED
-#define SkLargeBitmap_DEFINED
+#ifndef SkBitmapRegionDecoder_DEFINED
+#define SkBitmapRegionDecoder_DEFINED
#include "SkBitmap.h"
#include "SkRect.h"
#include "SkImageDecoder.h"
-class SkLargeBitmap {
+class SkBitmapRegionDecoder {
public:
- SkLargeBitmap(SkImageDecoder *decoder, int width, int height) {
+ SkBitmapRegionDecoder(SkImageDecoder *decoder, int width, int height) {
fDecoder = decoder;
fWidth = width;
fHeight = height;
}
- virtual ~SkLargeBitmap() {
+ virtual ~SkBitmapRegionDecoder() {
delete fDecoder;
}
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);
-}
