More work to integrate skimage with rebaseline tools.

tools/skimage_main.cpp:
Add the ability to write the results to checksum based filenames,
much like GM uses. This will allow using the skpdiff server to
rebaseline images.
Write the keys in the JSON file as <original image>_<pref config>.png,
so it matches gm_json.IMAGE_FILENAME_PATTERN. Also replace '_' with
'-' in the original file name, to avoid confusing the pattern matcher.
The '_' to '-' replacement also happens on the output filename.
Read the keys in a similar manner.
In make_outname, no longer remove a suffix. This fixes a bug where
subset decoding writes multiple subsets to the same file.

tools/rebaseline.py:
Since the filenames written to json files now match
gm_json.IMAGE_FILENAME_PATTERN, enable the option to match based
on configs/tests when rebaselining skimage.

test json files:
Update to match the new format of output.

gm/gm_expectations:
Add a constructor that takes a BitmapAndDigest as input.

tools/tests/skimage_self_test.py:
Test that reading the expectations file just created by skimage with
the same file actually compares to the original file (rather than just
succeeding because expectations were missing).

Change the expectations files to match the new format.

Will require a buildbot change to use the new flag: https://codereview.chromium.org/27389002/

BUG=1466
R=epoger@google.com

Review URL: https://codereview.chromium.org/26297004

git-svn-id: http://skia.googlecode.com/svn/trunk@11902 2bbb7eff-a529-9590-31e7-b0007b416f81

1 files changed, 129 insertions, 129 deletions

diff --git a/expectations/skimage/Test-Android-GalaxyNexus-SGX540-Arm7-Debug/expected-results.json b/expectations/skimage/Test-Android-GalaxyNexus-SGX540-Arm7-Debug/expected-results.json
index 2f885a8b92..9db60ed367 100644
--- a/expectations/skimage/Test-Android-GalaxyNexus-SGX540-Arm7-Debug/expected-results.json
+++ b/expectations/skimage/Test-Android-GalaxyNexus-SGX540-Arm7-Debug/expected-results.json
@@ -6,7 +6,7 @@
     "succeeded": null
   }, 
   "expected-results": {
-    "01_original.jpg": {
+    "01-original-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -15,7 +15,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "01_original.jpg_[1283,728,1670,749]": {
+    "01-original-jpg-[1283,728,1670,749]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -24,7 +24,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "01_original.jpg_[1291,725,1774,1184]": {
+    "01-original-jpg-[1291,725,1774,1184]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -33,7 +33,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "01_original.jpg_[1767,337,1818,684]": {
+    "01-original-jpg-[1767,337,1818,684]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -42,7 +42,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "01_original.jpg_[306,297,863,724]": {
+    "01-original-jpg-[306,297,863,724]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -51,7 +51,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "01_original.jpg_[514,137,879,980]": {
+    "01-original-jpg-[514,137,879,980]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -60,7 +60,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "02_empty_filter.JPG": {
+    "02-empty-filter-JPG_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -69,7 +69,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "02_empty_filter.JPG_[1283,728,1670,749]": {
+    "02-empty-filter-JPG-[1283,728,1670,749]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -78,7 +78,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "02_empty_filter.JPG_[1291,725,1774,1184]": {
+    "02-empty-filter-JPG-[1291,725,1774,1184]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -87,7 +87,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "02_empty_filter.JPG_[1767,337,1818,684]": {
+    "02-empty-filter-JPG-[1767,337,1818,684]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -96,7 +96,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "02_empty_filter.JPG_[306,297,863,724]": {
+    "02-empty-filter-JPG-[306,297,863,724]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -105,7 +105,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "02_empty_filter.JPG_[514,137,879,980]": {
+    "02-empty-filter-JPG-[514,137,879,980]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -114,7 +114,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "03_none_filter.JPG": {
+    "03-none-filter-JPG_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -123,7 +123,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "03_none_filter.JPG_[1283,728,1670,749]": {
+    "03-none-filter-JPG-[1283,728,1670,749]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -132,7 +132,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "03_none_filter.JPG_[1291,725,1774,1184]": {
+    "03-none-filter-JPG-[1291,725,1774,1184]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -141,7 +141,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "03_none_filter.JPG_[1767,337,1818,684]": {
+    "03-none-filter-JPG-[1767,337,1818,684]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -150,7 +150,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "03_none_filter.JPG_[306,297,863,724]": {
+    "03-none-filter-JPG-[306,297,863,724]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -159,7 +159,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "03_none_filter.JPG_[514,137,879,980]": {
+    "03-none-filter-JPG-[514,137,879,980]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -168,7 +168,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "1.bmp": {
+    "1-bmp_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -177,7 +177,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "5.sm.webp": {
+    "5-sm-webp_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -186,7 +186,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "5.sm.webp_[103,149,154,207]": {
+    "5-sm-webp-[103,149,154,207]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -195,7 +195,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "5.sm.webp_[110,45,267,119]": {
+    "5-sm-webp-[110,45,267,119]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -204,7 +204,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "5.sm.webp_[194,120,303,142]": {
+    "5-sm-webp-[194,120,303,142]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -213,7 +213,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "5.sm.webp_[223,42,242,84]": {
+    "5-sm-webp-[223,42,242,84]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -222,7 +222,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "5.sm.webp_[67,3,262,9]": {
+    "5-sm-webp-[67,3,262,9]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -231,7 +231,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "CMYK.jpg": {
+    "CMYK-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -240,7 +240,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "CMYK.jpg_[381,433,494,496]": {
+    "CMYK-jpg-[381,433,494,496]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -249,7 +249,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "CMYK.jpg_[43,296,68,433]": {
+    "CMYK-jpg-[43,296,68,433]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -258,7 +258,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "CMYK.jpg_[46,148,293,209]": {
+    "CMYK-jpg-[46,148,293,209]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -267,7 +267,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "CMYK.jpg_[554,68,627,409]": {
+    "CMYK-jpg-[554,68,627,409]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -276,7 +276,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "CMYK.jpg_[7,149,504,316]": {
+    "CMYK-jpg-[7,149,504,316]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -285,7 +285,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Lower_Left.jpg": {
+    "Lower-Left-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -294,7 +294,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Lower_Left.jpg_[122,128,147,160]": {
+    "Lower-Left-jpg-[122,128,147,160]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -303,7 +303,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Lower_Left.jpg_[123,2,137,55]": {
+    "Lower-Left-jpg-[123,2,137,55]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -312,7 +312,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Lower_Left.jpg_[183,8,204,124]": {
+    "Lower-Left-jpg-[183,8,204,124]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -321,7 +321,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Lower_Left.jpg_[82,106,255,166]": {
+    "Lower-Left-jpg-[82,106,255,166]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -330,7 +330,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Lower_Left.jpg_[93,178,184,182]": {
+    "Lower-Left-jpg-[93,178,184,182]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -339,7 +339,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Lower_Right.jpg": {
+    "Lower-Right-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -348,7 +348,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Lower_Right.jpg_[142,56,255,189]": {
+    "Lower-Right-jpg-[142,56,255,189]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -357,7 +357,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Lower_Right.jpg_[17,52,133,57]": {
+    "Lower-Right-jpg-[17,52,133,57]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -366,7 +366,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Lower_Right.jpg_[182,17,223,92]": {
+    "Lower-Right-jpg-[182,17,223,92]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -375,7 +375,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Lower_Right.jpg_[63,84,206,121]": {
+    "Lower-Right-jpg-[63,84,206,121]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -384,7 +384,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Lower_Right.jpg_[86,53,213,176]": {
+    "Lower-Right-jpg-[86,53,213,176]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -393,7 +393,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "PANO_20121023_214540.jpg": {
+    "PANO-20121023-214540-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -402,7 +402,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "PANO_20121023_214540.jpg_[2502,197,3999,706]": {
+    "PANO-20121023-214540-jpg-[2502,197,3999,706]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -411,7 +411,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "PANO_20121023_214540.jpg_[3153,152,3336,413]": {
+    "PANO-20121023-214540-jpg-[3153,152,3336,413]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -420,7 +420,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "PANO_20121023_214540.jpg_[3166,50,4165,115]": {
+    "PANO-20121023-214540-jpg-[3166,50,4165,115]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -429,7 +429,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "PANO_20121023_214540.jpg_[526,283,7495,788]": {
+    "PANO-20121023-214540-jpg-[526,283,7495,788]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -438,7 +438,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "PANO_20121023_214540.jpg_[656,164,3947,413]": {
+    "PANO-20121023-214540-jpg-[656,164,3947,413]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -447,7 +447,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Softskin-Series-Folder-Folder-TV-DEXTER-2.ico": {
+    "Softskin-Series-Folder-Folder-TV-DEXTER-2-ico_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -456,7 +456,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Upper_Left.jpg": {
+    "Upper-Left-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -465,7 +465,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Upper_Left.jpg_[122,29,147,60]": {
+    "Upper-Left-jpg-[122,29,147,60]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -474,7 +474,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Upper_Left.jpg_[123,16,137,189]": {
+    "Upper-Left-jpg-[123,16,137,189]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -483,7 +483,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Upper_Left.jpg_[183,77,204,180]": {
+    "Upper-Left-jpg-[183,77,204,180]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -492,7 +492,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Upper_Left.jpg_[82,116,255,149]": {
+    "Upper-Left-jpg-[82,116,255,149]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -501,7 +501,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Upper_Left.jpg_[93,33,184,112]": {
+    "Upper-Left-jpg-[93,33,184,112]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -510,7 +510,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Upper_Right.jpg": {
+    "Upper-Right-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -519,7 +519,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Upper_Right.jpg_[142,29,255,60]": {
+    "Upper-Right-jpg-[142,29,255,60]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -528,7 +528,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Upper_Right.jpg_[17,16,133,189]": {
+    "Upper-Right-jpg-[17,16,133,189]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -537,7 +537,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Upper_Right.jpg_[182,33,223,112]": {
+    "Upper-Right-jpg-[182,33,223,112]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -546,7 +546,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Upper_Right.jpg_[63,77,206,180]": {
+    "Upper-Right-jpg-[63,77,206,180]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -555,7 +555,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Upper_Right.jpg_[86,116,213,149]": {
+    "Upper-Right-jpg-[86,116,213,149]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -564,7 +564,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "art.jpg": {
+    "art-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -573,7 +573,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "art.jpg_[223,697,962,884]": {
+    "art-jpg-[223,697,962,884]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -582,7 +582,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "art.jpg_[507,565,830,784]": {
+    "art-jpg-[507,565,830,784]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -591,7 +591,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "art.jpg_[547,29,822,808]": {
+    "art-jpg-[547,29,822,808]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -600,7 +600,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "art.jpg_[634,124,743,737]": {
+    "art-jpg-[634,124,743,737]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -609,7 +609,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "art.jpg_[783,937,1154,980]": {
+    "art-jpg-[783,937,1154,980]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -618,7 +618,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "baseline_jpeg.jpg": {
+    "baseline-jpeg-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -627,7 +627,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "baseline_jpeg.jpg_[267,565,750,784]": {
+    "baseline-jpeg-jpg-[267,565,750,784]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -636,7 +636,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "baseline_jpeg.jpg_[514,260,623,697]": {
+    "baseline-jpeg-jpg-[514,260,623,697]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -645,7 +645,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "baseline_jpeg.jpg_[562,884,863,937]": {
+    "baseline-jpeg-jpg-[562,884,863,937]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -654,7 +654,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "baseline_jpeg.jpg_[743,497,794,604]": {
+    "baseline-jpeg-jpg-[743,497,794,604]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -663,7 +663,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "baseline_jpeg.jpg_[902,749,1027,808]": {
+    "baseline-jpeg-jpg-[902,749,1027,808]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -672,7 +672,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "baseline_restart_jpeg.jpg": {
+    "baseline-restart-jpeg-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -681,7 +681,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "baseline_restart_jpeg.jpg_[267,565,750,784]": {
+    "baseline-restart-jpeg-jpg-[267,565,750,784]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -690,7 +690,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "baseline_restart_jpeg.jpg_[514,260,623,697]": {
+    "baseline-restart-jpeg-jpg-[514,260,623,697]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -699,7 +699,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "baseline_restart_jpeg.jpg_[562,884,863,937]": {
+    "baseline-restart-jpeg-jpg-[562,884,863,937]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -708,7 +708,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "baseline_restart_jpeg.jpg_[743,497,794,604]": {
+    "baseline-restart-jpeg-jpg-[743,497,794,604]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -717,7 +717,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "baseline_restart_jpeg.jpg_[902,749,1027,808]": {
+    "baseline-restart-jpeg-jpg-[902,749,1027,808]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -726,7 +726,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "bmp_test.bmp": {
+    "bmp-test-bmp_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -735,7 +735,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "desk_yahoonews_0.jpg": {
+    "desk-yahoonews-0-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -744,7 +744,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "desk_yahoonews_0.jpg_[267,80,750,373]": {
+    "desk-yahoonews-0-jpg-[267,80,750,373]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -753,7 +753,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "desk_yahoonews_0.jpg_[514,132,623,377]": {
+    "desk-yahoonews-0-jpg-[514,132,623,377]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -762,7 +762,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "desk_yahoonews_0.jpg_[562,745,863,820]": {
+    "desk-yahoonews-0-jpg-[562,745,863,820]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -771,7 +771,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "desk_yahoonews_0.jpg_[743,348,794,945]": {
+    "desk-yahoonews-0-jpg-[743,348,794,945]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -780,7 +780,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "desk_yahoonews_0.jpg_[902,45,1027,936]": {
+    "desk-yahoonews-0-jpg-[902,45,1027,936]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -789,7 +789,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "kokteylogo.png": {
+    "kokteylogo-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -798,7 +798,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "kokteylogo.png_[26,0,57,17]": {
+    "kokteylogo-png-[26,0,57,17]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -807,7 +807,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "kokteylogo.png_[26,4,45,5]": {
+    "kokteylogo-png-[26,4,45,5]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -816,7 +816,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "kokteylogo.png_[27,8,36,9]": {
+    "kokteylogo-png-[27,8,36,9]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -825,7 +825,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "kokteylogo.png_[38,4,53,17]": {
+    "kokteylogo-png-[38,4,53,17]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -834,7 +834,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "kokteylogo.png_[69,4,71,17]": {
+    "kokteylogo-png-[69,4,71,17]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -843,7 +843,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "photo.jpg.png": {
+    "photo-jpg-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -852,7 +852,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "photo.jpg.png_[134,45,259,424]": {
+    "photo-jpg-png-[134,45,259,424]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -861,7 +861,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "photo.jpg.png_[2,132,367,377]": {
+    "photo-jpg-png-[2,132,367,377]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -870,7 +870,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "photo.jpg.png_[231,348,282,433]": {
+    "photo-jpg-png-[231,348,282,433]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -879,7 +879,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "photo.jpg.png_[238,80,267,373]": {
+    "photo-jpg-png-[238,80,267,373]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -888,7 +888,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "photo.jpg.png_[306,233,351,308]": {
+    "photo-jpg-png-[306,233,351,308]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -897,7 +897,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "png_test.png": {
+    "png-test-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -906,7 +906,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "png_test.png_[103,17,154,124]": {
+    "png-test-png-[103,17,154,124]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -915,7 +915,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "png_test.png_[110,85,267,304]": {
+    "png-test-png-[110,85,267,304]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -924,7 +924,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "png_test.png_[223,404,562,457]": {
+    "png-test-png-[223,404,562,457]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -933,7 +933,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "png_test.png_[262,269,387,328]": {
+    "png-test-png-[262,269,387,328]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -942,7 +942,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "png_test.png_[514,217,623,260]": {
+    "png-test-png-[514,217,623,260]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -951,7 +951,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "progressive_jpeg.jpg": {
+    "progressive-jpeg-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -960,7 +960,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "progressive_jpeg.jpg_[267,565,750,784]": {
+    "progressive-jpeg-jpg-[267,565,750,784]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -969,7 +969,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "progressive_jpeg.jpg_[514,260,623,697]": {
+    "progressive-jpeg-jpg-[514,260,623,697]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -978,7 +978,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "progressive_jpeg.jpg_[562,884,863,937]": {
+    "progressive-jpeg-jpg-[562,884,863,937]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -987,7 +987,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "progressive_jpeg.jpg_[743,497,794,604]": {
+    "progressive-jpeg-jpg-[743,497,794,604]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -996,7 +996,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "progressive_jpeg.jpg_[902,749,1027,808]": {
+    "progressive-jpeg-jpg-[902,749,1027,808]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1005,7 +1005,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "progressive_restart_jpeg.jpg": {
+    "progressive-restart-jpeg-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1014,7 +1014,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "progressive_restart_jpeg.jpg_[267,565,750,784]": {
+    "progressive-restart-jpeg-jpg-[267,565,750,784]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1023,7 +1023,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "progressive_restart_jpeg.jpg_[514,260,623,697]": {
+    "progressive-restart-jpeg-jpg-[514,260,623,697]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1032,7 +1032,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "progressive_restart_jpeg.jpg_[562,884,863,937]": {
+    "progressive-restart-jpeg-jpg-[562,884,863,937]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1041,7 +1041,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "progressive_restart_jpeg.jpg_[743,497,794,604]": {
+    "progressive-restart-jpeg-jpg-[743,497,794,604]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1050,7 +1050,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "progressive_restart_jpeg.jpg_[902,749,1027,808]": {
+    "progressive-restart-jpeg-jpg-[902,749,1027,808]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1059,7 +1059,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "tabl_mozilla_0.jpg": {
+    "tabl-mozilla-0-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1068,7 +1068,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "tabl_mozilla_0.jpg_[187,29,1065,403]": {
+    "tabl-mozilla-0-jpg-[187,29,1065,403]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1077,7 +1077,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "tabl_mozilla_0.jpg_[194,100,951,214]": {
+    "tabl-mozilla-0-jpg-[194,100,951,214]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1086,7 +1086,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "tabl_mozilla_0.jpg_[443,259,934,572]": {
+    "tabl-mozilla-0-jpg-[443,259,934,572]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1095,7 +1095,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "tabl_mozilla_0.jpg_[567,322,737,425]": {
+    "tabl-mozilla-0-jpg-[567,322,737,425]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1104,7 +1104,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "tabl_mozilla_0.jpg_[809,359,1249,532]": {
+    "tabl-mozilla-0-jpg-[809,359,1249,532]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1113,7 +1113,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "webp_test.webp": {
+    "webp-test-webp_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1122,7 +1122,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "webp_test.webp_[103,17,154,124]": {
+    "webp-test-webp-[103,17,154,124]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1131,7 +1131,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "webp_test.webp_[110,85,267,304]": {
+    "webp-test-webp-[110,85,267,304]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1140,7 +1140,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "webp_test.webp_[223,404,562,457]": {
+    "webp-test-webp-[223,404,562,457]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1149,7 +1149,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "webp_test.webp_[262,269,387,328]": {
+    "webp-test-webp-[262,269,387,328]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1158,7 +1158,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "webp_test.webp_[514,217,623,260]": {
+    "webp-test-webp-[514,217,623,260]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5",