2 files changed, 8 insertions, 8 deletions
diff --git a/src/images/SkImageDecoder.cpp b/src/images/SkImageDecoder.cpp
index 768d671d6a..347a6da58c 100644
--- a/src/images/SkImageDecoder.cpp
+++ b/src/images/SkImageDecoder.cpp
@@ -42,9 +42,9 @@ SkImageDecoder::SkImageDecoder()
 }
 
 SkImageDecoder::~SkImageDecoder() {
-    fPeeker->safeUnref();
-    fChooser->safeUnref();
-    fAllocator->safeUnref();
+    SkSafeUnref(fPeeker);
+    SkSafeUnref(fChooser);
+    SkSafeUnref(fAllocator);
 }
 
 SkImageDecoder::Format SkImageDecoder::getFormat() const {
diff --git a/src/images/SkImageRef.cpp b/src/images/SkImageRef.cpp
index 60e01c672b..16c2820b92 100644
--- a/src/images/SkImageRef.cpp
+++ b/src/images/SkImageRef.cpp
@@ -40,16 +40,16 @@ SkImageRef::~SkImageRef() {
 #endif
 
     fStream->unref();
-    fFactory->safeUnref();
+    SkSafeUnref(fFactory);
 }
 
 bool SkImageRef::getInfo(SkBitmap* bitmap) {
     SkAutoMutexAcquire ac(gImageRefMutex);
-    
+
     if (!this->prepareBitmap(SkImageDecoder::kDecodeBounds_Mode)) {
         return false;
     }
-    
+
     SkASSERT(SkBitmap::kNo_Config != fBitmap.config());
     if (bitmap) {
         bitmap->setConfig(fBitmap.config(), fBitmap.width(), fBitmap.height());
@@ -77,7 +77,7 @@ bool SkImageRef::prepareBitmap(SkImageDecoder::Mode mode) {
     if (fErrorInDecoding) {
         return false;
     }
-    
+
     /*  As soon as we really know our config, we record it, so that on
         subsequent calls to the codec, we are sure we will always get the same
         result.
@@ -85,7 +85,7 @@ bool SkImageRef::prepareBitmap(SkImageDecoder::Mode mode) {
     if (SkBitmap::kNo_Config != fBitmap.config()) {
         fConfig = fBitmap.config();
     }
-    
+
     if (NULL != fBitmap.getPixels() ||
             (SkBitmap::kNo_Config != fBitmap.config() &&
              SkImageDecoder::kDecodeBounds_Mode == mode)) {