Correct greyscale PNG scaling factor. Non-interlaced greyscale PNG tests now pass.

diff --git a/basis/images/png/png-tests.factor b/basis/images/png/png-tests.factor
index 858718e63fc5c801abcf77e73078b29f8ec8da8e..25815c7017666df2c6fc53c70549c4a4138e8238 100644 (file)
--- a/basis/images/png/png-tests.factor
+++ b/basis/images/png/png-tests.factor
@@ -7,6 +7,11 @@ IN: images.png.tests
 
 ! The subset of the suite that should work given the current implementation.
 "vocab:images/testing/png" [
+    "basn0g01.png" decode-test
+    "basn0g02.png" decode-test
+    "basn0g04.png" decode-test
+    "basn0g08.png" decode-test
+    "basn0g16.png" decode-test
     "basn2c08.png" decode-test
     "basn6a08.png" decode-test
     "f00n2c08.png" decode-test

diff --git a/basis/images/png/png.factor b/basis/images/png/png.factor
index 6e8d7a6c1e8b887f8613dc06dd97f76f54a1d534..2135d3fc96df5e6b1a39314c63b314556d148daa 100644 (file)
--- a/basis/images/png/png.factor
+++ b/basis/images/png/png.factor
@@ -240,7 +240,7 @@ ERROR: unknown-component-type n ;
 : scale-factor ( n -- n' )
     {
         { 1 [ 255 ] }
-        { 2 [ 127 ] }
+        { 2 [ 85 ] }
         { 4 [ 17 ] }
     } case ;
 

diff --git a/extra/images/testing/png/basn0g01.fig b/extra/images/testing/png/basn0g01.fig
new file mode 100644 (file)
index 0000000..d79f71b
Binary files /dev/null and b/extra/images/testing/png/basn0g01.fig differ

diff --git a/extra/images/testing/png/basn0g01.png b/extra/images/testing/png/basn0g01.png
new file mode 100644 (file)
index 0000000..1d72242
Binary files /dev/null and b/extra/images/testing/png/basn0g01.png differ

diff --git a/extra/images/testing/png/basn0g02.fig b/extra/images/testing/png/basn0g02.fig
new file mode 100644 (file)
index 0000000..3953ef5
Binary files /dev/null and b/extra/images/testing/png/basn0g02.fig differ

diff --git a/extra/images/testing/png/basn0g02.png b/extra/images/testing/png/basn0g02.png
new file mode 100644 (file)
index 0000000..5083324
Binary files /dev/null and b/extra/images/testing/png/basn0g02.png differ

diff --git a/extra/images/testing/png/basn0g04.fig b/extra/images/testing/png/basn0g04.fig
new file mode 100644 (file)
index 0000000..1e45ed1
Binary files /dev/null and b/extra/images/testing/png/basn0g04.fig differ

diff --git a/extra/images/testing/png/basn0g04.png b/extra/images/testing/png/basn0g04.png
new file mode 100644 (file)
index 0000000..0bf3687
Binary files /dev/null and b/extra/images/testing/png/basn0g04.png differ

diff --git a/extra/images/testing/png/basn0g08.fig b/extra/images/testing/png/basn0g08.fig
new file mode 100644 (file)
index 0000000..d185701
Binary files /dev/null and b/extra/images/testing/png/basn0g08.fig differ

diff --git a/extra/images/testing/png/basn0g08.png b/extra/images/testing/png/basn0g08.png
new file mode 100644 (file)
index 0000000..23c8237
Binary files /dev/null and b/extra/images/testing/png/basn0g08.png differ

diff --git a/extra/images/testing/png/basn0g16.fig b/extra/images/testing/png/basn0g16.fig
new file mode 100644 (file)
index 0000000..7218acd
Binary files /dev/null and b/extra/images/testing/png/basn0g16.fig differ

diff --git a/extra/images/testing/png/basn0g16.png b/extra/images/testing/png/basn0g16.png
new file mode 100644 (file)
index 0000000..e7c82f7
Binary files /dev/null and b/extra/images/testing/png/basn0g16.png differ