Reland 'Update expectations for skimage.'

expectations/skimage/Test-Win7-ShuttleA-HD2000-x86-Debug-ANGLE.json

Index: expectations/skimage/Test-Win7-ShuttleA-HD2000-x86-Debug-ANGLE.json
diff --git a/expectations/skimage/base-android-nexus-s.json b/expectations/skimage/Test-Win7-ShuttleA-HD2000-x86-Debug-ANGLE.json
similarity index 69%
copy from expectations/skimage/base-android-nexus-s.json
copy to expectations/skimage/Test-Win7-ShuttleA-HD2000-x86-Debug-ANGLE.json
index c8a0451f267dfe965b7c100055cf0b69990bdf7d..94aff880d98170aa1a9699a7ff0b053eeb7d65c9 100644
--- a/expectations/skimage/base-android-nexus-s.json
+++ b/expectations/skimage/Test-Win7-ShuttleA-HD2000-x86-Debug-ANGLE.json
@@ -32,37 +32,43 @@
       },
       "5.sm.webp" : {
          "allowed-digests" : [
-            [ "bitmap-64bitMD5", 11012800850215976675 ]
+            [ "bitmap-64bitMD5", 2589463703907036000 ]
          ],
          "ignore-failure" : false
       },
       "5.sm.webp_[103,149,154,207]" : {
          "allowed-digests" : [
-            [ "bitmap-64bitMD5", 10521784414039399107 ]
+            [ "bitmap-64bitMD5", 12604103674453802403 ]
          ],
          "ignore-failure" : false
       },
       "5.sm.webp_[110,45,267,119]" : {
          "allowed-digests" : [
-            [ "bitmap-64bitMD5", 14291416917202096079 ]
+            [ "bitmap-64bitMD5", 10993479620469649955 ]
          ],
          "ignore-failure" : false
       },
       "5.sm.webp_[194,120,303,142]" : {
          "allowed-digests" : [
-            [ "bitmap-64bitMD5", 12732953684533999536 ]
+            [ "bitmap-64bitMD5", 896969226539617906 ]
          ],
          "ignore-failure" : false
       },
       "5.sm.webp_[223,42,242,84]" : {
          "allowed-digests" : [
-            [ "bitmap-64bitMD5", 9189318772600174958 ]
+            [ "bitmap-64bitMD5", 15689397369237750677 ]
          ],
          "ignore-failure" : false
       },
       "5.sm.webp_[67,3,262,9]" : {
          "allowed-digests" : [
-            [ "bitmap-64bitMD5", 11402050129389682331 ]
+            [ "bitmap-64bitMD5", 13985179766273397720 ]
+         ],
+         "ignore-failure" : false
+      },
+      "CMYK.jpg" : {
+         "allowed-digests" : [
+            [ "bitmap-64bitMD5", 8044662098954176130 ]
          ],
          "ignore-failure" : false
       },
@@ -84,6 +90,12 @@
          ],
          "ignore-failure" : false
       },
+      "Softskin-Series-Folder-Folder-TV-DEXTER-2.ico" : {
+         "allowed-digests" : [
+            [ "bitmap-64bitMD5", 6383196142855109799 ]
+         ],
+         "ignore-failure" : false
+      },
       "Upper_Left.jpg" : {
          "allowed-digests" : [
             [ "bitmap-64bitMD5", 7518208176958373090 ]
@@ -96,105 +108,105 @@
          ],
          "ignore-failure" : false
       },
-      "check.gif" : {
+      "art.jpg" : {
          "allowed-digests" : [
-            [ "bitmap-64bitMD5", 14142355171478789839 ]
+            [ "bitmap-64bitMD5", 1194865470158040918 ]
          ],
          "ignore-failure" : false
       },
-      "desk_yahoonews_0.jpg" : {
+      "baseline_jpeg.jpg" : {
          "allowed-digests" : [
-            [ "bitmap-64bitMD5", 11660520904814991699 ]
+            [ "bitmap-64bitMD5", 4163734972868667214 ]
          ],
          "ignore-failure" : false
       },
-      "friend.wbmp" : {
+      "baseline_restart_jpeg.jpg" : {
          "allowed-digests" : [
-            [ "bitmap-64bitMD5", 8444311348702753929 ]
+            [ "bitmap-64bitMD5", 4163734972868667214 ]
          ],
          "ignore-failure" : false
       },
-      "kokteylogo.png" : {
+      "bmp_test.bmp" : {
          "allowed-digests" : [
-            [ "bitmap-64bitMD5", 168800254427225818 ]
+            [ "bitmap-64bitMD5", 13377769522785041821 ]
          ],
          "ignore-failure" : false
       },
-      "kokteylogo.png_[26,0,57,17]" : {
+      "desk_yahoonews_0.jpg" : {
          "allowed-digests" : [
-            [ "bitmap-64bitMD5", 3464562511481035166 ]
+            [ "bitmap-64bitMD5", 11660520904814991699 ]
          ],
          "ignore-failure" : false
       },
-      "kokteylogo.png_[26,4,45,5]" : {
+      "kokteylogo.png" : {
          "allowed-digests" : [
-            [ "bitmap-64bitMD5", 11569166933584178547 ]
+            [ "bitmap-64bitMD5", 168800254427225818 ]
          ],
          "ignore-failure" : false
       },
-      "kokteylogo.png_[27,8,36,9]" : {
+      "photo.jpg.png" : {
          "allowed-digests" : [
-            [ "bitmap-64bitMD5", 14506072359562678944 ]
+            [ "bitmap-64bitMD5", 76400998740744557 ]
          ],
          "ignore-failure" : false
       },
-      "kokteylogo.png_[38,4,53,17]" : {
+      "png_test.png" : {
          "allowed-digests" : [
-            [ "bitmap-64bitMD5", 4980413816844234835 ]
+            [ "bitmap-64bitMD5", 3962535646133419277 ]
          ],
          "ignore-failure" : false
       },
-      "kokteylogo.png_[69,4,71,17]" : {
+      "progressive_jpeg.jpg" : {
          "allowed-digests" : [
-            [ "bitmap-64bitMD5", 15430159324265259188 ]
+            [ "bitmap-64bitMD5", 4163734972868667214 ]
          ],
          "ignore-failure" : false
       },
-      "pac2.wbmp" : {
+      "progressive_restart_jpeg.jpg" : {
          "allowed-digests" : [
-            [ "bitmap-64bitMD5", 16120779150350061767 ]
+            [ "bitmap-64bitMD5", 4163734972868667214 ]
          ],
          "ignore-failure" : false
       },
-      "photo.jpg.png" : {
+      "tabl_mozilla_0.jpg" : {
          "allowed-digests" : [
-            [ "bitmap-64bitMD5", 76400998740744557 ]
+            [ "bitmap-64bitMD5", 12021873154910819088 ]
          ],
          "ignore-failure" : false
       },
-      "photo.jpg.png_[134,45,259,424]" : {
+      "webp_test.webp" : {
          "allowed-digests" : [
-            [ "bitmap-64bitMD5", 10088437173476931079 ]
+            [ "bitmap-64bitMD5", 2946264152433674804 ]
          ],
          "ignore-failure" : false
       },
-      "photo.jpg.png_[2,132,367,377]" : {
+      "webp_test.webp_[103,17,154,124]" : {
          "allowed-digests" : [
-            [ "bitmap-64bitMD5", 6938435300895122197 ]
+            [ "bitmap-64bitMD5", 8972288090774759642 ]
          ],
          "ignore-failure" : false
       },
-      "photo.jpg.png_[231,348,282,433]" : {
+      "webp_test.webp_[110,85,267,304]" : {
          "allowed-digests" : [
-            [ "bitmap-64bitMD5", 13214547049530016247 ]
+            [ "bitmap-64bitMD5", 261638602306139829 ]
          ],
          "ignore-failure" : false
       },
-      "photo.jpg.png_[238,80,267,373]" : {
+      "webp_test.webp_[223,404,562,457]" : {
          "allowed-digests" : [
-            [ "bitmap-64bitMD5", 7766349704315583680 ]
+            [ "bitmap-64bitMD5", 6408120322797303128 ]
          ],
          "ignore-failure" : false
       },
-      "photo.jpg.png_[306,233,351,308]" : {
+      "webp_test.webp_[262,269,387,328]" : {
          "allowed-digests" : [
-            [ "bitmap-64bitMD5", 11244796826105366429 ]
+            [ "bitmap-64bitMD5", 18424384439009379931 ]
          ],
          "ignore-failure" : false
       },
-      "tabl_mozilla_0.jpg" : {
+      "webp_test.webp_[514,217,623,260]" : {
          "allowed-digests" : [
-            [ "bitmap-64bitMD5", 12021873154910819088 ]
+            [ "bitmap-64bitMD5", 1549338922479921698 ]
          ],
          "ignore-failure" : false
       }