More work to integrate skimage with rebaseline tools.

gm/gm_expectations.h

 /*
  * Copyright 2013 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 #ifndef gm_expectations_DEFINED
 #define gm_expectations_DEFINED
 
 #include "gm.h"
@@ skipping 98 matching lines @@
     public:
         /**
          * No expectations at all.
          */
         explicit Expectations(bool ignoreFailure=kDefaultIgnoreFailure);
 
         /**
          * Expect exactly one image (appropriate for the case when we
          * are comparing against a single PNG file).
          */
-        Expectations(const SkBitmap& bitmap, bool ignoreFailure=kDefaultIgnoreFailure);
+        explicit Expectations(const SkBitmap& bitmap, bool ignoreFailure=kDefaultIgnoreFailure);
+
+        /**
+         * Expect exactly one image, whose digest has already been computed.
+         */
+        explicit Expectations(const BitmapAndDigest& bitmapAndDigest);

[scroggo, 2013/10/16 23:10:51]

For my use case, this could just take a digest. Either way is fine with me.

I also did not add ignoreFailure, since I do not need it, but I'm fine with
adding it for consistency.

 
         /**
          * Create Expectations from a JSON element as found within the
          * kJsonKey_ExpectedResults section.
          *
          * It's fine if the jsonElement is null or empty; in that case, we just
          * don't have any expectations.
          */
         explicit Expectations(Json::Value jsonElement);
 
@@ skipping 139 matching lines @@
          * Returns true if successful.
          */
         static bool Parse(const char *jsonPath, Json::Value *jsonRoot);
 
         Json::Value fJsonRoot;
         Json::Value fJsonExpectedResults;
     };
 
 }
 #endif