Bug 386651 - Need regression tests for PNG image decoding. [Part 5, done!]

2008-01-09 21:49:18 -08:00 · 2008-01-09 21:49:18 -08:00 · 26a3af81cb
--- a/modules/libpr0n/test/reftest/img2html.html
+++ b/modules/libpr0n/test/reftest/img2html.html
@ -16,6 +16,8 @@ to a pure HTML representation (no images).</p>

 <form onsubmit="start_convert(); return false;">
    Path to image: <input type="text" id="filepath" size="60"><br>
+    <input id="fill" type="checkbox">
+        Fill canvas with <input id="fillRGB" value="rgb(10,100,250)"> (instead of transparency).<br>
    <button type='submit'>Convert!</button>
    <br><br>
    <img id="img" onload="run_convert();"><canvas id="canvas"></canvas><span id="span"></span><br>
@ -31,6 +33,8 @@ var img      = document.getElementById("img");
 var canvas   = document.getElementById("canvas");
 var span     = document.getElementById("span");
 var textarea = document.getElementById("textarea");
+var fill     = document.getElementById("fill");
+var fillRGB  = document.getElementById("fillRGB");

 function start_convert() {
    try {
@ -64,6 +68,10 @@ function run_convert() {
        canvas.height = img.height;
        var ctx = canvas.getContext("2d");
        ctx.clearRect(0, 0, img.width, img.height);
+        if (fill.checked) {
+            ctx.fillStyle = fillRGB.value;
+            ctx.fillRect (0, 0, img.width, img.height);
+        }
        ctx.drawImage(img, 0, 0);

        // [r, g, b, a, r, g, b, a, ...]
--- a/modules/libpr0n/test/reftest/pngsuite-background/bg__4a08.html
+++ b/modules/libpr0n/test/reftest/pngsuite-background/bg__4a08.html
--- a/modules/libpr0n/test/reftest/pngsuite-background/bg__4a16.html
+++ b/modules/libpr0n/test/reftest/pngsuite-background/bg__4a16.html
--- a/modules/libpr0n/test/reftest/pngsuite-background/bg__6a08.html
+++ b/modules/libpr0n/test/reftest/pngsuite-background/bg__6a08.html
--- a/modules/libpr0n/test/reftest/pngsuite-background/bg__6a16.html
+++ b/modules/libpr0n/test/reftest/pngsuite-background/bg__6a16.html
--- a/modules/libpr0n/test/reftest/pngsuite-background/bgai4a08.png
+++ b/modules/libpr0n/test/reftest/pngsuite-background/bgai4a08.png
--- a/modules/libpr0n/test/reftest/pngsuite-background/bgai4a16.png
+++ b/modules/libpr0n/test/reftest/pngsuite-background/bgai4a16.png
--- a/modules/libpr0n/test/reftest/pngsuite-background/bgan6a08.png
+++ b/modules/libpr0n/test/reftest/pngsuite-background/bgan6a08.png
--- a/modules/libpr0n/test/reftest/pngsuite-background/bgan6a16.png
+++ b/modules/libpr0n/test/reftest/pngsuite-background/bgan6a16.png
--- a/modules/libpr0n/test/reftest/pngsuite-background/bgbn4a08.png
+++ b/modules/libpr0n/test/reftest/pngsuite-background/bgbn4a08.png
--- a/modules/libpr0n/test/reftest/pngsuite-background/bggn4a16.png
+++ b/modules/libpr0n/test/reftest/pngsuite-background/bggn4a16.png
--- a/modules/libpr0n/test/reftest/pngsuite-background/bgwn6a08.png
+++ b/modules/libpr0n/test/reftest/pngsuite-background/bgwn6a08.png
--- a/modules/libpr0n/test/reftest/pngsuite-background/bgyn6a16.png
+++ b/modules/libpr0n/test/reftest/pngsuite-background/bgyn6a16.png
--- a/modules/libpr0n/test/reftest/pngsuite-background/reftest.list
+++ b/modules/libpr0n/test/reftest/pngsuite-background/reftest.list
@ -0,0 +1,22 @@
+# PngSuite - Background colors
+#
+# Note 1: The first 4 images have no bKGD chunk, the last 4 do. The background
+# color indicated by bKGD isn't used, so the two sets of images are rendered
+# identically and thus share common reference HTML files.
+
+# bgai4a08 - 8 bit grayscale, alpha, no background chunk, interlaced
+fails-if(MOZ_WIDGET_TOOLKIT=="windows") == wrapper.html?bgai4a08.png bg__4a08.html
+# bgai4a16 - 16 bit grayscale, alpha, no background chunk, interlaced
+fails-if(MOZ_WIDGET_TOOLKIT=="windows") == wrapper.html?bgai4a16.png bg__4a16.html
+# bgan6a08 - 3x8 bits rgb color, alpha, no background chunk
+fails-if(MOZ_WIDGET_TOOLKIT=="windows") == wrapper.html?bgan6a08.png bg__6a08.html
+# bgan6a16 - 3x16 bits rgb color, alpha, no background chunk
+fails-if(MOZ_WIDGET_TOOLKIT=="windows") == wrapper.html?bgan6a16.png bg__6a16.html
+# bgbn4a08 - 8 bit grayscale, alpha, black background chunk
+fails-if(MOZ_WIDGET_TOOLKIT=="windows") == wrapper.html?bgbn4a08.png bg__4a08.html
+# bggn4a16 - 16 bit grayscale, alpha, gray background chunk
+fails-if(MOZ_WIDGET_TOOLKIT=="windows") == wrapper.html?bggn4a16.png bg__4a16.html
+# bgwn6a08 - 3x8 bits rgb color, alpha, white background chunk
+fails-if(MOZ_WIDGET_TOOLKIT=="windows") == wrapper.html?bgwn6a08.png bg__6a08.html
+# bgyn6a16 - 3x16 bits rgb color, alpha, yellow background chunk 
+fails-if(MOZ_WIDGET_TOOLKIT=="windows") == wrapper.html?bgyn6a16.png bg__6a16.html
--- a/modules/libpr0n/test/reftest/pngsuite-background/wrapper.html
+++ b/modules/libpr0n/test/reftest/pngsuite-background/wrapper.html
@ -0,0 +1,21 @@
+<!DOCTYPE HTML>
+<html>
+<head>
+<title>Image reftest wrapper</title>
+<style type="text/css">
+    #image1 { background-color: rgb(10, 100, 250); }
+</style>
+</head>
+<body>
+<img id="image1">
+<script>
+// This loads a externally specified image with a background color
+// set via CSS, to test transparency effects.
+//
+// Use as "wrapper.html?image.png"
+//
+var imgURL = document.location.search.substr(1);
+document.images[0].src = imgURL;
+</script>
+</body>
+</html>
--- a/modules/libpr0n/test/reftest/pngsuite-corrupted/reftest.list
+++ b/modules/libpr0n/test/reftest/pngsuite-corrupted/reftest.list
@ -0,0 +1,10 @@
+# PngSuite - Corrupted files
+#
+# Note: these are corrupt files, and so no image should be rendered.
+
+# x00n0g01 - empty 0x0 grayscale file
+== wrapper.html?x00n0g01.png about:blank
+# xcrn0g04 - added cr bytes
+== wrapper.html?xcrn0g04.png about:blank
+# xlfn0g04 - added lf bytes 
+== wrapper.html?xlfn0g04.png about:blank
--- a/modules/libpr0n/test/reftest/pngsuite-corrupted/wrapper.html
+++ b/modules/libpr0n/test/reftest/pngsuite-corrupted/wrapper.html
@ -0,0 +1,21 @@
+<!DOCTYPE HTML>
+<html>
+<head>
+<title>Image reftest wrapper</title>
+<style type="text/css">
+    #image1 { background-color: rgb(10, 100, 250); }
+</style>
+</head>
+<body>
+<img id="image1">
+<script>
+// This loads a externally specified image with a background color
+// set via CSS, to test transparency effects.
+//
+// Use as "wrapper.html?image.png"
+//
+var imgURL = document.location.search.substr(1);
+document.images[0].src = imgURL;
+</script>
+</body>
+</html>
--- a/modules/libpr0n/test/reftest/pngsuite-corrupted/x00n0g01.png
+++ b/modules/libpr0n/test/reftest/pngsuite-corrupted/x00n0g01.png
--- a/modules/libpr0n/test/reftest/pngsuite-corrupted/xcrn0g04.png
+++ b/modules/libpr0n/test/reftest/pngsuite-corrupted/xcrn0g04.png
--- a/modules/libpr0n/test/reftest/pngsuite-corrupted/xlfn0g04.png
+++ b/modules/libpr0n/test/reftest/pngsuite-corrupted/xlfn0g04.png
@ -0,0 +1,13 @@
+‰PNG
+
+
+
+
+
+IHDR  “בָ)ָIDATx<54>]ֱׁ
+ֲ0P*@נ¡#°
+
+#Tגָ10lPF`״ F=•<02>ִIQג*חֵuם”`%qk<71>
+H<EFBFBD>ס<EFBFBD>ˆ©ס´€mקֽ<08>µא<C2B5><D790>	ׁ<>=,¸fלOK
+
+ח ׀t<D780>ְ(ָןה’׳¦םF;טP÷€¯¾{xpח]9‡/p<>*$(ל*יyלױƒ ׳‏<1E>יחט@קC¼ 	cװq<16>‹N<E280B9>U#„)11·.<2E><>rהנfה0°<30>הgh(¥<>t‎<1E>ֲEר<45>‰kIEND®B`‚
--- a/modules/libpr0n/test/reftest/pngsuite-transparency/reftest.list
+++ b/modules/libpr0n/test/reftest/pngsuite-transparency/reftest.list
@ -0,0 +1,26 @@
+# PngSuite - Transparency
+
+# tbbn1g04 - transparent, black background chunk
+fails-if(MOZ_WIDGET_TOOLKIT=="windows") == wrapper.html?tbbn1g04.png tbbn1g04.html
+# tbbn2c16 - transparent, blue background chunk
+fails-if(MOZ_WIDGET_TOOLKIT=="windows") == wrapper.html?tbbn2c16.png tbbn2c16.html
+# tbbn3p08 - transparent, black background chunk
+fails-if(MOZ_WIDGET_TOOLKIT=="windows") == wrapper.html?tbbn3p08.png tbbn3p08.html
+# tbgn2c16 - transparent, green background chunk
+fails-if(MOZ_WIDGET_TOOLKIT=="windows") == wrapper.html?tbgn2c16.png tbgn2c16.html
+# tbgn3p08 - transparent, light-gray background chunk
+fails-if(MOZ_WIDGET_TOOLKIT=="windows") == wrapper.html?tbgn3p08.png tbgn3p08.html
+# tbrn2c08 - transparent, red background chunk
+fails-if(MOZ_WIDGET_TOOLKIT=="windows") == wrapper.html?tbrn2c08.png tbrn2c08.html
+# tbwn1g16 - transparent, white background chunk
+fails-if(MOZ_WIDGET_TOOLKIT=="windows") == wrapper.html?tbwn1g16.png tbwn1g16.html
+# tbwn3p08 - transparent, white background chunk
+fails-if(MOZ_WIDGET_TOOLKIT=="windows") == wrapper.html?tbwn3p08.png tbwn3p08.html
+# tbyn3p08 - transparent, yellow background chunk
+fails-if(MOZ_WIDGET_TOOLKIT=="windows") == wrapper.html?tbyn3p08.png tbyn3p08.html
+# tp0n1g08 - not transparent for reference (logo on gray)
+# tp0n2c08 - not transparent for reference (logo on gray)
+# tp0n3p08 - not transparent for reference (logo on gray)
+# ...these 3 not tested because they're not transparent.
+# tp1n3p08 - transparent, but no background chunk 
+fails-if(MOZ_WIDGET_TOOLKIT=="windows") == wrapper.html?tp1n3p08.png tp1n3p08.html
--- a/modules/libpr0n/test/reftest/pngsuite-transparency/tbbn1g04.html
+++ b/modules/libpr0n/test/reftest/pngsuite-transparency/tbbn1g04.html
--- a/modules/libpr0n/test/reftest/pngsuite-transparency/tbbn1g04.png
+++ b/modules/libpr0n/test/reftest/pngsuite-transparency/tbbn1g04.png
--- a/modules/libpr0n/test/reftest/pngsuite-transparency/tbbn2c16.html
+++ b/modules/libpr0n/test/reftest/pngsuite-transparency/tbbn2c16.html
--- a/modules/libpr0n/test/reftest/pngsuite-transparency/tbbn2c16.png
+++ b/modules/libpr0n/test/reftest/pngsuite-transparency/tbbn2c16.png
--- a/modules/libpr0n/test/reftest/pngsuite-transparency/tbbn3p08.html
+++ b/modules/libpr0n/test/reftest/pngsuite-transparency/tbbn3p08.html
--- a/modules/libpr0n/test/reftest/pngsuite-transparency/tbbn3p08.png
+++ b/modules/libpr0n/test/reftest/pngsuite-transparency/tbbn3p08.png
--- a/modules/libpr0n/test/reftest/pngsuite-transparency/tbgn2c16.html
+++ b/modules/libpr0n/test/reftest/pngsuite-transparency/tbgn2c16.html
--- a/modules/libpr0n/test/reftest/pngsuite-transparency/tbgn2c16.png
+++ b/modules/libpr0n/test/reftest/pngsuite-transparency/tbgn2c16.png
--- a/modules/libpr0n/test/reftest/pngsuite-transparency/tbgn3p08.html
+++ b/modules/libpr0n/test/reftest/pngsuite-transparency/tbgn3p08.html
--- a/modules/libpr0n/test/reftest/pngsuite-transparency/tbgn3p08.png
+++ b/modules/libpr0n/test/reftest/pngsuite-transparency/tbgn3p08.png
--- a/modules/libpr0n/test/reftest/pngsuite-transparency/tbrn2c08.html
+++ b/modules/libpr0n/test/reftest/pngsuite-transparency/tbrn2c08.html
--- a/modules/libpr0n/test/reftest/pngsuite-transparency/tbrn2c08.png
+++ b/modules/libpr0n/test/reftest/pngsuite-transparency/tbrn2c08.png
--- a/modules/libpr0n/test/reftest/pngsuite-transparency/tbwn1g16.html
+++ b/modules/libpr0n/test/reftest/pngsuite-transparency/tbwn1g16.html
--- a/modules/libpr0n/test/reftest/pngsuite-transparency/tbwn1g16.png
+++ b/modules/libpr0n/test/reftest/pngsuite-transparency/tbwn1g16.png
--- a/modules/libpr0n/test/reftest/pngsuite-transparency/tbwn3p08.html
+++ b/modules/libpr0n/test/reftest/pngsuite-transparency/tbwn3p08.html
--- a/modules/libpr0n/test/reftest/pngsuite-transparency/tbwn3p08.png
+++ b/modules/libpr0n/test/reftest/pngsuite-transparency/tbwn3p08.png
--- a/modules/libpr0n/test/reftest/pngsuite-transparency/tbyn3p08.html
+++ b/modules/libpr0n/test/reftest/pngsuite-transparency/tbyn3p08.html
--- a/modules/libpr0n/test/reftest/pngsuite-transparency/tbyn3p08.png
+++ b/modules/libpr0n/test/reftest/pngsuite-transparency/tbyn3p08.png
--- a/modules/libpr0n/test/reftest/pngsuite-transparency/tp1n3p08.html
+++ b/modules/libpr0n/test/reftest/pngsuite-transparency/tp1n3p08.html
--- a/modules/libpr0n/test/reftest/pngsuite-transparency/tp1n3p08.png
+++ b/modules/libpr0n/test/reftest/pngsuite-transparency/tp1n3p08.png
--- a/modules/libpr0n/test/reftest/pngsuite-transparency/wrapper.html
+++ b/modules/libpr0n/test/reftest/pngsuite-transparency/wrapper.html
@ -0,0 +1,21 @@
+<!DOCTYPE HTML>
+<html>
+<head>
+<title>Image reftest wrapper</title>
+<style type="text/css">
+    #image1 { background-color: rgb(10, 100, 250); }
+</style>
+</head>
+<body>
+<img id="image1">
+<script>
+// This loads a externally specified image with a background color
+// set via CSS, to test transparency effects.
+//
+// Use as "wrapper.html?image.png"
+//
+var imgURL = document.location.search.substr(1);
+document.images[0].src = imgURL;
+</script>
+</body>
+</html>
--- a/modules/libpr0n/test/reftest/reftest.list
+++ b/modules/libpr0n/test/reftest/reftest.list
@ -9,12 +9,12 @@
 include pngsuite-basic-n/reftest.list
 include pngsuite-basic-i/reftest.list
 include pngsuite-ancillary/reftest.list
-#include pngsuite-background/reftest.list
+include pngsuite-background/reftest.list
 include pngsuite-chunkorder/reftest.list
-#include pngsuite-corrupted/reftest.list
+include pngsuite-corrupted/reftest.list
 include pngsuite-filtering/reftest.list
 include pngsuite-gamma/reftest.list
 include pngsuite-oddsizes/reftest.list
 include pngsuite-palettes/reftest.list
-#include pngsuite-transparency/reftest.list
+include pngsuite-transparency/reftest.list
 include pngsuite-zlib/reftest.list