aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoseph Wen <josephwen@google.com>2010-08-17 17:05:03 +0800
committerJoseph Wen <josephwen@google.com>2010-08-17 17:06:42 +0800
commitae3c9823f39f96243d0f69d90363dc43e1540c09 (patch)
tree57a8abebd65d3c5fd8a4238c6e426fb46a659727
parent97fa2e455b2040c99c5b6f3e3d2ad6c9b4062081 (diff)
downloadexternal_skia-ae3c9823f39f96243d0f69d90363dc43e1540c09.zip
external_skia-ae3c9823f39f96243d0f69d90363dc43e1540c09.tar.gz
external_skia-ae3c9823f39f96243d0f69d90363dc43e1540c09.tar.bz2
Fix master sim break
Change-Id: If1fd071cad08b23bc44c4ca29bcc71a9c68696b9
-rw-r--r--include/images/SkImageDecoder.h4
-rw-r--r--src/images/SkImageDecoder.cpp3
2 files changed, 5 insertions, 2 deletions
diff --git a/include/images/SkImageDecoder.h b/include/images/SkImageDecoder.h
index be1046b..a3d7f1d 100644
--- a/include/images/SkImageDecoder.h
+++ b/include/images/SkImageDecoder.h
@@ -25,8 +25,8 @@ class SkStream;
class SkVMMemoryReporter : public SkRefCnt {
public:
- virtual ~SkVMMemoryReporter() {}
- virtual bool reportMemory(size_t memorySize);
+ virtual ~SkVMMemoryReporter();
+ virtual bool reportMemory(size_t memorySize) = 0;
};
/** \class SkImageDecoder
diff --git a/src/images/SkImageDecoder.cpp b/src/images/SkImageDecoder.cpp
index 5191117..8c57886 100644
--- a/src/images/SkImageDecoder.cpp
+++ b/src/images/SkImageDecoder.cpp
@@ -22,6 +22,9 @@
#include "SkTemplates.h"
#include "SkCanvas.h"
+SkVMMemoryReporter::~SkVMMemoryReporter() {
+}
+
const char *SkImageDecoder::kFormatName[] = {
"Unknown Format",
"BMP",