add point of interest API

experimental/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.
  */
 
 #define __NO_STD_VECTOR // Uses cl::vectpr instead of std::vectpr
 #define __NO_STD_STRING // Uses cl::STRING_CLASS instead of std::string
 #include <CL/cl.hpp>
 
 #include "SkCommandLineFlags.h"
 #include "SkGraphics.h"
+#include "SkPoint.h"
 #include "SkOSFile.h"
 #include "SkString.h"
 #include "SkTArray.h"
 #include "SkTDArray.h"
 
 #include "SkImageDiffer.h"
 #include "SkCLImageDiffer.h"
 #include "SkPMetric.h"
 #include "skpdiff_util.h"
 
@@ skipping 52 matching lines @@
     // Get the files in the baseline, we will then look for those inside the test path
     SkTArray<SkString> baselineEntries;
     if (!get_directory(baselinePath, &baselineEntries)) {
         SkDebugf("Unable to open path \"%s\"\n", baselinePath);
         return;
     }
 
     SkTDArray<int> queuedDiffIDs;
     for (int baselineIndex = 0; baselineIndex < baselineEntries.count(); baselineIndex++) {
         const char* baseFilename = baselineEntries[baselineIndex].c_str();
-        SkDebugf("%s\n", baseFilename);
+        SkDebugf("\n%s\n", baseFilename);
 
         // Find the real location of each file to compare
         SkString baselineFile = SkOSPath::SkPathJoin(baselinePath, baseFilename);
         SkString testFile = SkOSPath::SkPathJoin(testPath, baseFilename);
 
         // Check that the test file exists and is a file
         if (sk_exists(testFile.c_str()) && !sk_isdir(testFile.c_str())) {
             // Queue up the comparison with the differ
             int diffID = differ->queueDiffOfFile(baselineFile.c_str(), testFile.c_str());
             if (diffID >= 0) {
                 queuedDiffIDs.push(diffID);
                 SkDebugf("Result: %f\n", differ->getResult(diffID));
+                SkDebugf("POI Count: %i\n", differ->getPointsOfInterestCount(diffID));
+                differ->deleteDiff(diffID);
             }
         } else {
             SkDebugf("Baseline file \"%s\" has no corresponding test file\n", baselineFile.c_str());
         }
     }
 }
 
 
 /// Compares two sets of images identified by glob style patterns with the given differ
 static void diff_patterns(const char baselinePattern[], const char testPattern[], SkImageDiffer* differ) {
@@ skipping 14 matching lines @@
 
     if (baselineEntries.count() != testEntries.count()) {
         SkDebugf("Baseline and test patterns do not yield corresponding number of files\n");
         return;
     }
 
     SkTDArray<int> queuedDiffIDs;
     for (int entryIndex = 0; entryIndex < baselineEntries.count(); entryIndex++) {
         const char* baselineFilename = baselineEntries[entryIndex].c_str();
         const char* testFilename     = testEntries    [entryIndex].c_str();
-        SkDebugf("%s %s\n", baselineFilename, testFilename);
+        SkDebugf("\n%s %s\n", baselineFilename, testFilename);
 
         int diffID = differ->queueDiffOfFile(baselineFilename, testFilename);
         if (diffID >= 0) {
             queuedDiffIDs.push(diffID);
             SkDebugf("Result: %f\n", differ->getResult(diffID));
+            SkDebugf("POI Count: %i\n", differ->getPointsOfInterestCount(diffID));
+            differ->deleteDiff(diffID);
         }
     }
 }
 
 
 static bool init_cl_diff(SkImageDiffer* differ) {
     // Setup OpenCL
     cl::Device device;
     cl::Context context;
     if (!init_device_and_context(&device, &context)) {
@@ skipping 103 matching lines @@
         }
 
         // Perform a pattern diff if one is requested
         if (!FLAGS_patterns.isEmpty()) {
             diff_patterns(FLAGS_patterns[0], FLAGS_patterns[1], differ);
         }
     }
 
     return 0;
 }