Fix memory leak in filter tool

tools/filtermain.cpp

 /*
  * Copyright 2012 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkDebugCanvas.h"
 #include "SkDevice.h"
 #include "SkGraphics.h"
@@ skipping 608 matching lines @@
     { check_4, apply_4, 0 },
     { check_5, apply_5, 0 },
     { check_6, apply_6, 0 },
     { check_7, apply_7, 0 },
     { check_8, apply_8, 0 },
     { check_9, apply_9, 0 },
 };
 
 
 static int filter_picture(const SkString& inFile, const SkString& outFile) {
-    SkPicture* inPicture = NULL;
+    SkAutoTDelete<SkPicture> inPicture;

[bungeman-skia, 2013/05/10 17:30:36]

SkPicture is SkRefCnt, it seems odd to SkAutoTDelete it. Did you mean
SkAutoTUnref? SkAutoTDelete kida-sorta works here since you're the one creating
the picture, but that's somewhat magic knowledge.

 
     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;
     }
 
     int localCount[SK_ARRAY_COUNT(gOptTable)];
 
     memset(localCount, 0, sizeof(localCount));
 
     SkDebugCanvas debugCanvas(inPicture->width(), inPicture->height());
     debugCanvas.setBounds(inPicture->width(), inPicture->height());
@@ skipping 61 matching lines @@
     }
 
     return 0;
 }
 
 // This function is not marked as 'static' so it can be referenced externally
 // in the iOS build.
 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
+

[jvanverth1, 2013/05/10 14:34:46]

Did you mean to leave this in there?

[robertphillips, 2013/05/10 14:36:18]

Yep - when enabled it prints out leak info

     SkGraphics::Init();
 
     if (argc < 3) {
         usage();
         return -1;
     }
 
     SkString inFile, outFile, inDir, outDir;
 
     char* const* stop = argv + argc;
@@ skipping 71 matching lines @@
 
     SkGraphics::Term();
     return 0;
 }
 
 #if !defined SK_BUILD_FOR_IOS
 int main(int argc, char * const argv[]) {
     return tool_main(argc, (char**) argv);
 }
 #endif