Modify skpdiff to write diffs directly to provided directories

tools/skpdiff/skpdiff_main.cpp

 /*
  * Copyright 2013 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 // TODO(djsollen): Rename this whole package (perhaps to "SkMultiDiffer").
 // It's not just for "pdiff" (perceptual diffs)--it's a harness that allows
 // the execution of an arbitrary set of difference algorithms.
@@ skipping 31 matching lines @@
 DEFINE_string2(differs, d, "", "The names of the differs to use or all of them by default");
 DEFINE_string2(folders, f, "", "Compare two folders with identical subfile names: <baseline folder> <test folder>");
 DEFINE_string2(patterns, p, "", "Use two patterns to compare images: <baseline> <test>");
 DEFINE_string2(output, o, "", "Writes a JSON summary of these diffs to file: <filepath>");
 DEFINE_string(alphaDir, "", "If the differ can generate an alpha mask, write it into directory: <dirpath>");
 DEFINE_string(rgbDiffDir, "", "If the differ can generate an image showing the RGB diff at each pixel, write it into directory: <dirpath>");
 DEFINE_string(whiteDiffDir, "", "If the differ can generate an image showing every changed pixel in white, write it into directory: <dirpath>");
 DEFINE_bool(jsonp, true, "Output JSON with padding");
 DEFINE_string(csv, "", "Writes the output of these diffs to a csv file: <filepath>");
 DEFINE_int32(threads, -1, "run N threads in parallel [default is derived from CPUs available]");
+DEFINE_bool(longnames, false, "Output image names are a combination of baseline and test names");
 
 #if SK_SUPPORT_OPENCL
 /// A callback for any OpenCL errors
 static void CL_CALLBACK error_notify(const char* errorInfo, const void* privateInfoSize, ::size_t cb, void* userData) {
     SkDebugf("OpenCL error notify: %s\n", errorInfo);
     exit(1);
 }
 
 /// Creates a device and context with OpenCL
 static bool init_device_and_context(cl::Device* device, cl::Context* context) {
@@ skipping 137 matching lines @@
             SkDebugf("alphaDir flag expects one argument: <directory>\n");
             return 1;
         }
     }
     if (!FLAGS_rgbDiffDir.isEmpty()) {
         if (1 != FLAGS_rgbDiffDir.count()) {
             SkDebugf("rgbDiffDir flag expects one argument: <directory>\n");
             return 1;
         }
     }
+
     if (!FLAGS_whiteDiffDir.isEmpty()) {
         if (1 != FLAGS_whiteDiffDir.count()) {
             SkDebugf("whiteDiffDir flag expects one argument: <directory>\n");
             return 1;
         }
     }
 
     SkDiffContext ctx;
     ctx.setDiffers(chosenDiffers);
+    ctx.setLongNames(FLAGS_longnames);
 
     if (!FLAGS_alphaDir.isEmpty()) {
         ctx.setAlphaMaskDir(SkString(FLAGS_alphaDir[0]));
     }
     if (!FLAGS_rgbDiffDir.isEmpty()) {
         ctx.setRgbDiffDir(SkString(FLAGS_rgbDiffDir[0]));
     }
     if (!FLAGS_whiteDiffDir.isEmpty()) {
         ctx.setWhiteDiffDir(SkString(FLAGS_whiteDiffDir[0]));
     }
@@ skipping 24 matching lines @@
     }
 
     return 0;
 }
 
 #if !defined(SK_BUILD_FOR_IOS) && !defined(SK_BUILD_FOR_NACL)
 int main(int argc, char * argv[]) {
     return tool_main(argc, (char**) argv);
 }
 #endif