add explicit filepaths to render_pictures JSON summary

tools/render_pictures_main.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 "LazyDecodeBitmap.h"
 #include "CopyTilesRenderer.h"
 #include "SkBitmap.h"
@@ skipping 30 matching lines @@
 DEFINE_bool(writeWholeImage, false, "In tile mode, write the entire rendered image to a "
             "file, instead of an image for each tile.");
 DEFINE_bool(validate, false, "Verify that the rendered image contains the same pixels as "
             "the picture rendered in simple mode. When used in conjunction with --bbh, results "
             "are validated against the picture rendered in the same mode, but without the bbh.");
 
 DEFINE_bool(bench_record, false, "If true, drop into an infinite loop of recording the picture.");
 
 DEFINE_bool(preprocess, false, "If true, perform device specific preprocessing before rendering.");
 
-static void make_output_filepath(SkString* path, const SkString& dir,
-                                 const SkString& name) {
-    sk_tools::make_filepath(path, dir, name);
-    // Remove ".skp"
-    path->remove(path->size() - 4, 4);
-}
-
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 
 /**
  *  Table for translating from format of data to a suffix.
  */
 struct Format {
     SkImageDecoder::Format  fFormat;
     const char*             fSuffix;
 };
 static const Format gFormats[] = {
@@ skipping 273 matching lines @@
         for (int i = 1; i <= 255; ++i) {
             if(diffs[i] > 0) {
                 SkDebugf("Number of pixels with max diff of %i is %i\n", i, diffs[i]);
             }
         }
     }
 
     if (FLAGS_writeWholeImage) {
         sk_tools::force_all_opaque(*bitmap);
 
+        // TODO(epoger): It would be better for the filename (without outputDir) to be passed in
+        // here, and used both for the checksum file and writing into outputDir.
+        SkString inputFilename, outputPath;
+        sk_tools::get_basename(&inputFilename, inputPath);
+        sk_tools::make_filepath(&outputPath, *outputDir, inputFilename);
+        sk_tools::replace_char(&outputPath, '.', '_');
+        outputPath.append(".png");
+
         if (NULL != jsonSummaryPtr) {
-            // TODO(epoger): This is a hacky way of constructing the filename associated with the
-            // image checksum; we basically are repeating the logic of make_output_filepath()
-            // and code below here, within here.
-            // It would be better for the filename (without outputDir) to be passed in here,
-            // and used both for the checksum file and writing into outputDir.
-            //
-            // TODO(epoger): what about including the config type within hashFilename?  That way,
-            // we could combine results of different config types without conflicting filenames.
-            SkString hashFilename;
-            sk_tools::get_basename(&hashFilename, inputPath);
-            hashFilename.remove(hashFilename.size() - 4, 4); // Remove ".skp"
-            hashFilename.append(".png");
-            jsonSummaryPtr->add(hashFilename.c_str(), *bitmap);
+            SkString outputFileBasename;
+            sk_tools::get_basename(&outputFileBasename, outputPath);
+            jsonSummaryPtr->add(inputFilename.c_str(), outputFileBasename.c_str(), *bitmap);
         }
 
         if (NULL != outputDir) {
-            SkString inputFilename;
-            sk_tools::get_basename(&inputFilename, inputPath);
-            SkString outputPath;
-            make_output_filepath(&outputPath, *outputDir, inputFilename);
-            outputPath.append(".png");
             if (!SkImageEncoder::EncodeFile(outputPath.c_str(), *bitmap,
                                             SkImageEncoder::kPNG_Type, 100)) {
                 SkDebugf("Failed to draw the picture.\n");
                 success = false;
             }
         }
     }
     SkDELETE(bitmap);
 
     return success;
@@ skipping 111 matching lines @@
         jsonSummary.writeToFile(FLAGS_writeJsonSummaryPath[0]);
     }
     return 0;
 }
 
 #if !defined SK_BUILD_FOR_IOS
 int main(int argc, char * const argv[]) {
     return tool_main(argc, (char**) argv);
 }
 #endif