commit 4d98b740cdfa4adf3f5832a466294382570928fc
author robertphillips@google.com <robertphillips@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Fri May 10 14:51:54 2013 +0000
committer robertphillips@google.com <robertphillips@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Fri May 10 14:51:54 2013 +0000
tree 787e05ad7c055c23015fcf20e5bb8e64afb7f871
parent 0ce0df7d24b1b5335cbd6dc5d9621fcd1171f0d8

Fix memory leak in filter tool

https://codereview.chromium.org/15029008/
(SkipBuildbotRuns)



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

tools/filtermain.cpp

diff --git a/tools/filtermain.cpp b/tools/filtermain.cpp
index 7117faf..47b82d1 100644
--- a/tools/filtermain.cpp
+++ b/tools/filtermain.cpp
@@ -626,14 +626,14 @@
 
 
 static int filter_picture(const SkString& inFile, const SkString& outFile) {
-    SkPicture* inPicture = NULL;
+    SkAutoTDelete<SkPicture> inPicture;
 
     SkFILEStream inStream(inFile.c_str());
     if (inStream.isValid()) {
-        inPicture = SkNEW_ARGS(SkPicture, (&inStream, NULL, &SkImageDecoder::DecodeMemory));
+        inPicture.reset(SkNEW_ARGS(SkPicture, (&inStream, NULL, &SkImageDecoder::DecodeMemory)));
     }
 
-    if (NULL == inPicture) {
+    if (NULL == inPicture.get()) {
         SkDebugf("Could not read file %s\n", inFile.c_str());
         return -1;
     }
@@ -715,6 +715,10 @@
 int tool_main(int argc, char** argv); // suppress a warning on mac
 
 int tool_main(int argc, char** argv) {
+#if SK_ENABLE_INST_COUNT
+    gPrintInstCount = true;
+#endif
+
     SkGraphics::Init();
 
     if (argc < 3) {