* CON: Can't do this with checksums.
*/
static Checksum get_checksum(const SkBitmap& bitmap) {
- force_all_opaque(bitmap);
- return SkBitmapChecksummer::Compute64(bitmap);
+ SkBitmap copy;
+ const SkBitmap* bm = &bitmap;
+ if (bitmap.config() != SkBitmap::kARGB_8888_Config) {
+ bitmap.copyTo(©, SkBitmap::kARGB_8888_Config);
+ bm = ©
+ }
+ force_all_opaque(*bm);
+ return SkBitmapChecksummer::Compute64(*bm);
}
/* since PNG insists on unpremultiplying our alpha, we take no
-out/Debug/gm --match aaclip --config 8888 -r gm/tests/tempfiles/aaclip-images --writeJsonSummary gm/tests/outputs/aaclip-readback/output-actual/json-summary.txt
+out/Debug/gm --match simpleaaclip_path --config 8888 -r gm/tests/tempfiles/aaclip-images --writeJsonSummary gm/tests/outputs/aaclip-readback/output-actual/json-summary.txt
"failure-ignored" : null,
"no-comparison" : null,
"succeeded" : {
- "aaclip_8888" : {
- "checksum" : FAKE
- },
- "simpleaaclip_aaclip_8888" : {
- "checksum" : FAKE
- },
"simpleaaclip_path_8888" : {
"checksum" : FAKE
- },
- "simpleaaclip_rect_8888" : {
- "checksum" : FAKE
}
}
},
"expected-results" : {
- "aaclip_8888" : {
- "checksums" : [ FAKE ],
- "ignore-failure" : false
- },
- "simpleaaclip_aaclip_8888" : {
- "checksums" : [ FAKE ],
- "ignore-failure" : false
- },
"simpleaaclip_path_8888" : {
"checksums" : [ FAKE ],
"ignore-failure" : false
- },
- "simpleaaclip_rect_8888" : {
- "checksums" : [ FAKE ],
- "ignore-failure" : false
}
}
}
reading from gm/tests/tempfiles/aaclip-images
-drawing... aaclip [640 480]
-drawing... simpleaaclip_aaclip [640 480]
drawing... simpleaaclip_path [640 480]
-drawing... simpleaaclip_rect [640 480]
-Ran 4 tests: 4 passed, 0 failed, 0 missing reference images
+Ran 1 tests: 1 passed, 0 failed, 0 missing reference images
-out/Debug/gm --match aaclip --config 8888 -w gm/tests/tempfiles/aaclip-images --writeJsonSummary gm/tests/outputs/aaclip-write/output-actual/json-summary.txt
+out/Debug/gm --match simpleaaclip_path --config 8888 -w gm/tests/tempfiles/aaclip-images --writeJsonSummary gm/tests/outputs/aaclip-write/output-actual/json-summary.txt
"failed" : null,
"failure-ignored" : null,
"no-comparison" : {
- "aaclip_8888" : {
- "checksum" : FAKE
- },
- "simpleaaclip_aaclip_8888" : {
- "checksum" : FAKE
- },
"simpleaaclip_path_8888" : {
"checksum" : FAKE
- },
- "simpleaaclip_rect_8888" : {
- "checksum" : FAKE
}
},
"succeeded" : null
writing to gm/tests/tempfiles/aaclip-images
-drawing... aaclip [640 480]
-drawing... simpleaaclip_aaclip [640 480]
drawing... simpleaaclip_path [640 480]
-drawing... simpleaaclip_rect [640 480]
-Ran 4 tests: 0 passed, 0 failed, 4 missing reference images
+Ran 1 tests: 0 passed, 0 failed, 1 missing reference images
# section should be empty.
gm_test "--hierarchy --match dashing2 --config 8888" "$GM_OUTPUTS/no-readpath"
-# Write out a handful of test images and read them back in.
+# Run a test which generates partially transparent images, write out those
+# images, and read them back in.
#
# This test would have caught
# http://code.google.com/p/skia/issues/detail?id=1079 ('gm generating
IMAGEDIR=$GM_TEMPFILES/aaclip-images
rm -rf $IMAGEDIR
mkdir -p $IMAGEDIR
-gm_test "--match aaclip --config 8888 -w $IMAGEDIR" "$GM_OUTPUTS/aaclip-write"
-gm_test "--match aaclip --config 8888 -r $IMAGEDIR" "$GM_OUTPUTS/aaclip-readback"
+gm_test "--match simpleaaclip_path --config 8888 -w $IMAGEDIR" "$GM_OUTPUTS/aaclip-write"
+gm_test "--match simpleaaclip_path --config 8888 -r $IMAGEDIR" "$GM_OUTPUTS/aaclip-readback"
echo "All tests passed."