diff options
author | Peter Breitenlohner <peb@mppmu.mpg.de> | 2014-08-12 07:11:29 +0000 |
---|---|---|
committer | Peter Breitenlohner <peb@mppmu.mpg.de> | 2014-08-12 07:11:29 +0000 |
commit | 40a44e77747eedfa5fdd6b601198140a58136428 (patch) | |
tree | 26a15438359635ba538ff5cc6faab2e1c95538d8 /Build | |
parent | 0b5d10f099950773bb6b1b847e2748f076f9d89b (diff) |
texk/dvipdfm-x: Add tests with BMP and JP2 images
git-svn-id: svn://tug.org/texlive/trunk@34912 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build')
-rw-r--r-- | Build/source/texk/dvipdfm-x/ChangeLog | 6 | ||||
-rwxr-xr-x | Build/source/texk/dvipdfm-x/dvipdfm-bb.test | 11 | ||||
-rw-r--r-- | Build/source/texk/dvipdfm-x/tests/image.bmp | bin | 0 -> 4778 bytes | |||
-rw-r--r-- | Build/source/texk/dvipdfm-x/tests/image.dvi | bin | 388 -> 592 bytes | |||
-rw-r--r-- | Build/source/texk/dvipdfm-x/tests/image.jp2 | bin | 0 -> 5515 bytes | |||
-rw-r--r-- | Build/source/texk/dvipdfm-x/tests/image.tex | 22 | ||||
-rw-r--r-- | Build/source/texk/dvipdfm-x/tests/imgbmp.bb | 4 | ||||
-rw-r--r-- | Build/source/texk/dvipdfm-x/tests/imgbmp.xbb | 5 | ||||
-rw-r--r-- | Build/source/texk/dvipdfm-x/tests/imgjp2.bb | 4 | ||||
-rw-r--r-- | Build/source/texk/dvipdfm-x/tests/imgjp2.xbb | 5 | ||||
-rw-r--r-- | Build/source/texk/dvipdfm-x/tests/picbmp.bb | 4 | ||||
-rw-r--r-- | Build/source/texk/dvipdfm-x/tests/picbmp.xbb | 5 | ||||
-rw-r--r-- | Build/source/texk/dvipdfm-x/tests/picjp2.bb | 4 | ||||
-rw-r--r-- | Build/source/texk/dvipdfm-x/tests/picjp2.xbb | 5 | ||||
-rwxr-xr-x | Build/source/texk/dvipdfm-x/xdvipdfm-bb.test | 11 |
15 files changed, 74 insertions, 12 deletions
diff --git a/Build/source/texk/dvipdfm-x/ChangeLog b/Build/source/texk/dvipdfm-x/ChangeLog index fb682717d7f..e3fa69cdea6 100644 --- a/Build/source/texk/dvipdfm-x/ChangeLog +++ b/Build/source/texk/dvipdfm-x/ChangeLog @@ -1,3 +1,9 @@ +2014-08-12 Peter Breitenlohner <peb@mppmu.mpg.de> + + * dvipdfm-bb.test, xdvipdfm-bb.test: Also test .bmp and .jp2. + * tests/image.{bmp,dvi,jp2,tex}: Additional test input. + * tests/{img,pic}{bmp,jp2}.{bb,xbb}: Expected test output. + 2014-08-11 Peter Breitenlohner <peb@mppmu.mpg.de> * jp2image.c: Declare scan_file() as static. Drop variables diff --git a/Build/source/texk/dvipdfm-x/dvipdfm-bb.test b/Build/source/texk/dvipdfm-x/dvipdfm-bb.test index e3cb8e8aa4e..ac9f1608c89 100755 --- a/Build/source/texk/dvipdfm-x/dvipdfm-bb.test +++ b/Build/source/texk/dvipdfm-x/dvipdfm-bb.test @@ -1,6 +1,6 @@ #! /bin/sh -# Copyright (C) 2013 Peter Breitenlohner <tex-live@tug.org> +# Copyright (C) 2013, 2014 Peter Breitenlohner <tex-live@tug.org> # You may freely use, modify and/or distribute this file. TEXMFCNF=$srcdir/../kpathsea @@ -13,7 +13,10 @@ failed= rm -f img*.* -for e in jpeg png pdf; do +# list of file types +ext='bmp jp2 jpeg pdf png' + +for e in $ext; do cp $testsrc/image.$e img$e.$e done @@ -27,7 +30,7 @@ echo "*** dvipdfmx --ebb --help" \ && echo && echo "ebb-help tests OK" && echo \ || failed="$failed ebb-help" -for e in jpeg png pdf; do +for e in $ext; do echo "*** dvipdfmx --ebb img$e.$e" \ && ./dvipdfmx --ebb -O img$e.$e \ | sed '/%%CreationDate/d' >img$e.bb \ @@ -46,7 +49,7 @@ echo "*** dvipdfmx --xbb --help" \ && echo && echo "xbb-help tests OK" && echo \ || failed="$failed xbb-help" -for e in jpeg png pdf; do +for e in $ext; do echo "*** dvipdfmx --xbb img$e.$e" \ && ./dvipdfmx --xbb -O img$e.$e \ | sed '/%%CreationDate/d' >img$e.xbb \ diff --git a/Build/source/texk/dvipdfm-x/tests/image.bmp b/Build/source/texk/dvipdfm-x/tests/image.bmp Binary files differnew file mode 100644 index 00000000000..af3fdcfd7c6 --- /dev/null +++ b/Build/source/texk/dvipdfm-x/tests/image.bmp diff --git a/Build/source/texk/dvipdfm-x/tests/image.dvi b/Build/source/texk/dvipdfm-x/tests/image.dvi Binary files differindex 5fa697608d1..9d0d1ed3aa2 100644 --- a/Build/source/texk/dvipdfm-x/tests/image.dvi +++ b/Build/source/texk/dvipdfm-x/tests/image.dvi diff --git a/Build/source/texk/dvipdfm-x/tests/image.jp2 b/Build/source/texk/dvipdfm-x/tests/image.jp2 Binary files differnew file mode 100644 index 00000000000..06450bec180 --- /dev/null +++ b/Build/source/texk/dvipdfm-x/tests/image.jp2 diff --git a/Build/source/texk/dvipdfm-x/tests/image.tex b/Build/source/texk/dvipdfm-x/tests/image.tex index e0514f46b2b..78014374b14 100644 --- a/Build/source/texk/dvipdfm-x/tests/image.tex +++ b/Build/source/texk/dvipdfm-x/tests/image.tex @@ -1,15 +1,22 @@ % \shipout\vbox{ \vbox to5cm{} -\special{pdf:image @jpegpic (image.jpeg)} -\special{pdf:uxobj @jpegpic} +\special{pdf:image @bmppic (image.bmp)} +\special{pdf:uxobj @bmppic} } \advance\count0 by 1 % \shipout\vbox{ \vbox to5cm{} -\special{pdf:image @pngpic (image.png)} -\special{pdf:uxobj @pngpic} +\special{pdf:image @jp2pic (image.jp2)} +\special{pdf:uxobj @jp2pic} +} +\advance\count0 by 1 +% +\shipout\vbox{ +\vbox to5cm{} +\special{pdf:image @jpegpic (image.jpeg)} +\special{pdf:uxobj @jpegpic} } \advance\count0 by 1 % @@ -19,5 +26,12 @@ \special{pdf:uxobj @pdfpic} } \advance\count0 by 1 +\shipout\vbox{ +\vbox to5cm{} +\special{pdf:image @pngpic (image.png)} +\special{pdf:uxobj @pngpic} +} +\advance\count0 by 1 +% % \bye diff --git a/Build/source/texk/dvipdfm-x/tests/imgbmp.bb b/Build/source/texk/dvipdfm-x/tests/imgbmp.bb new file mode 100644 index 00000000000..7568855f175 --- /dev/null +++ b/Build/source/texk/dvipdfm-x/tests/imgbmp.bb @@ -0,0 +1,4 @@ +%%Title: imgbmp.bmp +%%Creator: extractbb 20140317 +%%BoundingBox: 0 0 124 89 + diff --git a/Build/source/texk/dvipdfm-x/tests/imgbmp.xbb b/Build/source/texk/dvipdfm-x/tests/imgbmp.xbb new file mode 100644 index 00000000000..714259b7658 --- /dev/null +++ b/Build/source/texk/dvipdfm-x/tests/imgbmp.xbb @@ -0,0 +1,5 @@ +%%Title: imgbmp.bmp +%%Creator: extractbb 20140317 +%%BoundingBox: 0 0 172 124 +%%HiResBoundingBox: 0.000000 0.000000 172.000000 124.000000 + diff --git a/Build/source/texk/dvipdfm-x/tests/imgjp2.bb b/Build/source/texk/dvipdfm-x/tests/imgjp2.bb new file mode 100644 index 00000000000..867181e9a93 --- /dev/null +++ b/Build/source/texk/dvipdfm-x/tests/imgjp2.bb @@ -0,0 +1,4 @@ +%%Title: imgjp2.jp2 +%%Creator: extractbb 20140317 +%%BoundingBox: 0 0 172 124 + diff --git a/Build/source/texk/dvipdfm-x/tests/imgjp2.xbb b/Build/source/texk/dvipdfm-x/tests/imgjp2.xbb new file mode 100644 index 00000000000..6d6245d5bd6 --- /dev/null +++ b/Build/source/texk/dvipdfm-x/tests/imgjp2.xbb @@ -0,0 +1,5 @@ +%%Title: imgjp2.jp2 +%%Creator: extractbb 20140317 +%%BoundingBox: 0 0 172 124 +%%HiResBoundingBox: 0.000000 0.000000 172.000000 124.000000 + diff --git a/Build/source/texk/dvipdfm-x/tests/picbmp.bb b/Build/source/texk/dvipdfm-x/tests/picbmp.bb new file mode 100644 index 00000000000..7d07a306b3a --- /dev/null +++ b/Build/source/texk/dvipdfm-x/tests/picbmp.bb @@ -0,0 +1,4 @@ +%%Title: picbmp.bmp +%%Creator: extractbb 20140317 +%%BoundingBox: 0 0 124 89 + diff --git a/Build/source/texk/dvipdfm-x/tests/picbmp.xbb b/Build/source/texk/dvipdfm-x/tests/picbmp.xbb new file mode 100644 index 00000000000..296050fc8d3 --- /dev/null +++ b/Build/source/texk/dvipdfm-x/tests/picbmp.xbb @@ -0,0 +1,5 @@ +%%Title: picbmp.bmp +%%Creator: extractbb 20140317 +%%BoundingBox: 0 0 172 124 +%%HiResBoundingBox: 0.000000 0.000000 172.000000 124.000000 + diff --git a/Build/source/texk/dvipdfm-x/tests/picjp2.bb b/Build/source/texk/dvipdfm-x/tests/picjp2.bb new file mode 100644 index 00000000000..52daf79c726 --- /dev/null +++ b/Build/source/texk/dvipdfm-x/tests/picjp2.bb @@ -0,0 +1,4 @@ +%%Title: picjp2.jp2 +%%Creator: extractbb 20140317 +%%BoundingBox: 0 0 172 124 + diff --git a/Build/source/texk/dvipdfm-x/tests/picjp2.xbb b/Build/source/texk/dvipdfm-x/tests/picjp2.xbb new file mode 100644 index 00000000000..3a90adb16d9 --- /dev/null +++ b/Build/source/texk/dvipdfm-x/tests/picjp2.xbb @@ -0,0 +1,5 @@ +%%Title: picjp2.jp2 +%%Creator: extractbb 20140317 +%%BoundingBox: 0 0 172 124 +%%HiResBoundingBox: 0.000000 0.000000 172.000000 124.000000 + diff --git a/Build/source/texk/dvipdfm-x/xdvipdfm-bb.test b/Build/source/texk/dvipdfm-x/xdvipdfm-bb.test index d4c3c0aa38d..60ba778c4f2 100755 --- a/Build/source/texk/dvipdfm-x/xdvipdfm-bb.test +++ b/Build/source/texk/dvipdfm-x/xdvipdfm-bb.test @@ -1,6 +1,6 @@ #! /bin/sh -# Copyright (C) 2013 Peter Breitenlohner <tex-live@tug.org> +# Copyright (C) 2013, 2014 Peter Breitenlohner <tex-live@tug.org> # You may freely use, modify and/or distribute this file. TEXMFCNF=$srcdir/../kpathsea @@ -13,7 +13,10 @@ failed= rm -f pic*.* -for e in jpeg png pdf; do +# list of file types +ext='bmp jp2 jpeg pdf png' + +for e in $ext; do cp $testsrc/image.$e pic$e.$e done @@ -27,7 +30,7 @@ echo "*** xdvipdfmx --ebb --help" \ && echo && echo "ebb-help tests OK" && echo \ || failed="$failed ebb-help" -for e in jpeg png pdf; do +for e in $ext; do echo "*** xdvipdfmx --ebb pic$e.$e" \ && ./xdvipdfmx --ebb pic$e.$e \ && sed '/%%CreationDate/d' pic$e.bb >pic$e.bbx \ @@ -46,7 +49,7 @@ echo "*** xdvipdfmx --xbb --help" \ && echo && echo "xbb-help tests OK" && echo \ || failed="$failed xbb-help" -for e in jpeg png pdf; do +for e in $ext; do echo "*** xdvipdfmx --xbb img$e.$e" \ && ./xdvipdfmx --xbb pic$e.$e \ && sed '/%%CreationDate/d' pic$e.xbb >pic$e.xbbx \ |