Revert "Rename SkLargeBitmap to SkBitmapRegionDecoder."
This reverts commit 2d8e78250676546c549082dc988e7262ab1bb154.
diff --git a/Android.mk b/Android.mk
index fd98e66..6f8162c 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/SkBitmapRegionDecoder.cpp \
+ src/images/SkLargeBitmap.cpp \
src/images/SkMovie.cpp \
src/images/SkMovie_gif.cpp \
src/images/SkPageFlipper.cpp \
@@ -282,3 +282,4 @@
# unit-tests
include $(BASE_PATH)/tests/Android.mk
+
diff --git a/include/images/SkBitmapRegionDecoder.h b/include/images/SkLargeBitmap.h
similarity index 71%
rename from include/images/SkBitmapRegionDecoder.h
rename to include/images/SkLargeBitmap.h
index 5b35371..0d19f32 100644
--- a/include/images/SkBitmapRegionDecoder.h
+++ b/include/images/SkLargeBitmap.h
@@ -1,18 +1,18 @@
-#ifndef SkBitmapRegionDecoder_DEFINED
-#define SkBitmapRegionDecoder_DEFINED
+#ifndef SkLargeBitmap_DEFINED
+#define SkLargeBitmap_DEFINED
#include "SkBitmap.h"
#include "SkRect.h"
#include "SkImageDecoder.h"
-class SkBitmapRegionDecoder {
+class SkLargeBitmap {
public:
- SkBitmapRegionDecoder(SkImageDecoder *decoder, int width, int height) {
+ SkLargeBitmap(SkImageDecoder *decoder, int width, int height) {
fDecoder = decoder;
fWidth = width;
fHeight = height;
}
- virtual ~SkBitmapRegionDecoder() {
+ virtual ~SkLargeBitmap() {
delete fDecoder;
}
diff --git a/src/images/SkBitmapRegionDecoder.cpp b/src/images/SkBitmapRegionDecoder.cpp
deleted file mode 100644
index 24bc446..0000000
--- a/src/images/SkBitmapRegionDecoder.cpp
+++ /dev/null
@@ -1,7 +0,0 @@
-#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
new file mode 100644
index 0000000..18fb36f
--- /dev/null
+++ b/src/images/SkLargeBitmap.cpp
@@ -0,0 +1,7 @@
+#include "SkLargeBitmap.h"
+
+bool SkLargeBitmap::decodeRegion(SkBitmap* bitmap, SkIRect rect,
+ SkBitmap::Config pref, int sampleSize) {
+ fDecoder->setSampleSize(sampleSize);
+ return fDecoder->decodeRegion(bitmap, rect, pref);
+}
