Fix assignment of non-copyable.

see http://connect.microsoft.com/VisualStudio/feedback/details/552586/inherting-noncopyable-base-allows-equal-sign-initialization


git-svn-id: http://skia.googlecode.com/svn/trunk@4008 2bbb7eff-a529-9590-31e7-b0007b416f81

1 files changed, 3 insertions, 4 deletions

diff --git a/src/ports/SkFontHost_win.cpp b/src/ports/SkFontHost_win.cpp
index cf23e93828..2944622070 100755
--- a/src/ports/SkFontHost_win.cpp
+++ b/src/ports/SkFontHost_win.cpp
@@ -1432,14 +1432,13 @@ SkTypeface* SkFontHost::CreateTypefaceFromStream(SkStream* stream) {
     }
     
     // Change the name of the font.
-    SkData* rewrittenFontData = SkOTUtils::RenameFont(stream, familyName, familyNameSize-1);
-    if (NULL == rewrittenFontData) {
+    SkAutoTUnref<SkData> rewrittenFontData(SkOTUtils::RenameFont(stream, familyName, familyNameSize-1));
+    if (NULL == rewrittenFontData.get()) {
         return NULL;
     }
-    SkAutoUnref aur = SkAutoUnref(rewrittenFontData);
 
     // Register the font with GDI.
-    HANDLE fontReference = activate_font(rewrittenFontData);
+    HANDLE fontReference = activate_font(rewrittenFontData.get());
     if (NULL == fontReference) {
         return NULL;
     }