GM: create GmResultDigest that encapsulates digest type ("bitmap-64bitMD5") and value (12345)

tools/skimage_main.cpp

 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "gm_expectations.h"
 #include "SkBitmap.h"
 #include "SkBitmapHasher.h"

[scroggo, 2013/05/23 20:42:58]

This file no longer needs to be included.

[epoger, 2013/05/23 21:06:18]

Done.

 #include "SkColorPriv.h"
 #include "SkCommandLineFlags.h"
 #include "SkData.h"
 #include "SkGraphics.h"
 #include "SkImageDecoder.h"
 #include "SkImageEncoder.h"
 #include "SkOSFile.h"
 #include "SkRandom.h"
 #include "SkStream.h"
 #include "SkTArray.h"
@@ skipping 152 matching lines @@
             SkASSERT(rect.fBottom < maxY);
         }
     }
     return rect;
 }
 
 // Stored expectations to be written to a file if createExpectationsPath is specified.
 static Json::Value gExpectationsToWrite;
 
 /**
- *  If expectations are to be recorded, record the expected checksum of bitmap into global
+ *  If expectations are to be recorded, record the bitmap expectations into global
  *  expectations array.
  */
 static void write_expectations(const SkBitmap& bitmap, const char* filename) {
     if (!FLAGS_createExpectationsPath.isEmpty()) {
         // Creates an Expectations object, and add it to the list to write.
         skiagm::Expectations expectation(bitmap);
         Json::Value value = expectation.asJsonValue();
         gExpectationsToWrite[filename] = value;
     }
 }
@@ skipping 18 matching lines @@
 
     skiagm::Expectations jsExpectation = gJsonExpectations->get(filename);
     if (jsExpectation.empty()) {
         if (failureArray != NULL) {
             failureArray->push_back().printf("decoded %s, but could not find expectation.",
                                              filename);
         }
         return false;
     }
 
-    SkHashDigest checksum;
-    if (!SkBitmapHasher::ComputeDigest(bitmap, &checksum)) {
-        if (failureArray != NULL) {
-            failureArray->push_back().printf("decoded %s, but could not create a checksum.",
-                                             filename);
-        }
-        return false;
-    }
-
-    if (jsExpectation.match(checksum)) {
+    skiagm::GmResultDigest resultDigest(bitmap);
+    if (jsExpectation.match(resultDigest)) {

[epoger, 2013/05/23 21:06:18]

Added code to check the new isValid() method, regaining the error checking I had
previously removed from here.

         return true;
     }
 
     if (failureArray != NULL) {
         failureArray->push_back().printf("decoded %s, but the result does not match "
                                          "expectations.",
                                          filename);
     }
     return false;
 }
@@ skipping 323 matching lines @@
     }
 
     return failed ? -1 : 0;
 }
 
 #if !defined SK_BUILD_FOR_IOS
 int main(int argc, char * const argv[]) {
     return tool_main(argc, (char**) argv);
 }
 #endif