cheng/libtiff
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'bug_2844' into 'master'

Browse Source 
tiff2ps.c: PSDataColorContig(): avoid heap buffer overrun

See merge request libtiff/libtiff!69
This commit is contained in:
Even Rouault 2019-04-25 09:39:01 +00:00
commit 3c0becb4aa
13 changed files with 462 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitlab-ci.yml
View File

@ -10,6 +10,8 @@ autoconf:
stage: build
script:
- sh build/gitlab-ci autoconf
after_script:
- 'cat autoconf-build/test/test-suite.log'
cmake-makefiles:
stage: build

2
build/gitlab-ci
View File

@ -20,7 +20,7 @@ autoconf_build()
make distcheck
}
# Test autoconf build
# Test cmake build
cmake_build()
{
PATH="$(pwd)/tools/bin:$PATH"

9
test/Makefile.am
View File

@ -34,6 +34,7 @@ TESTS_ENVIRONMENT = \
MEMCHECK="$(MEMCHECK)"
EXTRA_DIST = \
$(REFFILES) \
$(TESTSCRIPTS) \
$(IMAGES_EXTRA_DIST) \
CMakeLists.txt \
@ -144,6 +145,14 @@ TESTSCRIPTS = \
tiff2rgba-rgb-3c-8b.sh \
$(JPEG_DEPENDENT_TESTSCRIPTS)
# This list should contain the references files
# from the 'refs' subdirectory
REFFILES = \
refs/o-tiff2ps-EPS1.ps \
refs/o-tiff2ps-PS1.ps \
refs/o-tiff2ps-PS2.ps \
refs/o-tiff2ps-PS3.ps
# This list should contain all of the TIFF files in the 'images'
# subdirectory which are intended to be used as input images for
# tests. All of these files should use the extension ".tiff".

1
test/common.sh
View File

@ -7,6 +7,7 @@ SRCDIR=`cd $SRCDIR && pwd`
TOPSRCDIR=`cd $srcdir/.. && pwd`
TOOLS=`cd ../tools && pwd`
IMAGES="${SRCDIR}/images"
REFS="${SRCDIR}/refs"
# Aliases for built tools
FAX2PS=${TOOLS}/fax2ps

112
test/refs/o-tiff2ps-EPS1.ps Normal file
View File

@ -0,0 +1,112 @@
%!PS-Adobe-3.0 EPSF-3.0
%%Creator: tiff2ps
%%Title: miniswhite-1c-1b.tiff
%%CreationDate: Tue Apr 2 16:33:00 2019
%%DocumentData: Clean7Bit
%%Origin: 0 0
%%BoundingBox: 0 0 157 151
%%LanguageLevel: 1
%%Pages: 1 1
%%EndComments
%%Page: 1 1
gsave
100 dict begin
157.000000 151.000000 scale
%ImageData: 157 151 1 1 0 1 2 "image"
/scanLine 20 string def
157 151 1
[157 0 0 -151 0 151]
{currentfile scanLine readhexstring pop} bind
image
0204153c0bfffffffff1ffffc7e01017ff8057ff5aa2803e1ffffffe0697ffffc7e485
dfffd77fff48aca4dfd7fffff80003ffffcffe017fffe0c7ff1101250ffbfffff0241b
ffffffff80fffff37fff29fa48abf7ffffe41221ffffafffe3fffff19fff7ff82200f7
fdff0040803fff5ffff5ffffe17ffffffe00088bc0070008259fff7ffffdfffff0ffff
7ffe040003c0001222001fff3ffffffffff15fdfffff084003004104809493fc1dffff
ffffc1badfffff0fd000010020140009e337ffffffffc3efffffff1abc040400000502
04c6bfffffefffc36b7ffffe1ffe0c808804009490061bffffffff82fafffffc3dff08
080000020042a78fffffffff87f7fffffc1fff0c0010428049080c27ffffffff87feff
fffc7ffd108000e0611090103ffffffffe077dfffffdbffc340003e808020203cfffff
fffc0bd77fffe0fffc000003e10022008877fffffffc06fdff3fe35ffc780217c02808
28000ffffffff80f5fff6bc27ff040000fc00100a20103ffffffc007f5ff5ec2ffe082
200bc480420454a1ffffffe0065fff7fc5ff0010005f1000205a4929ffffffe003d7ff
5fe7b80008202f029804000000ffffffc003efff37e5fe0010001e0401020240917fff
ffc004effffffbf80022001f018888a429087fffff8007b7ff5ff3e00080009c002122
2544015ffff9c01fb7ff7ef7c0100400fc8408000020981ffff0783fe97f77fbc00800
017e009006560a4547ffd2bffbffff5fd780020000f801041000a00033fccdbb9ffeff
1ba000500003fa1024a249125025f033effffeffffc000c00042f002860800880540d0
47ffffffff574001c80003f9803e405054411400a9bfffffff7e0003804003f00a0302
090114800005efffffff6f0003880007fc0203a040a3522a4017ffffffff5f00034000
1af980a884120f1f8c000adffffffffff80fc0000ff82810420a27ffa800067fffffff
fff80f400033fc010a44508fff8e000bfffffffffffc0fc0003ff9809842404fff9e20
07ffffdff7fffe0d400003ff200220291fff9b401afffffffffffc1fe01359ff089620
015fffaa001bffffff1ffffa3d703eeeff810b22480fff905006fffffd6ffff81fb078
adffe40e00412fff85400d7ffff9fffff01d787fedffe08ba8185fff501007ffff925f
fff03af8e7f7fff13f81401ffe054005ffffc1fffff03ffcf5effff00fa0094754d310
05fffb07bfff803ffdddfffff00fe0145ea503d00fffff2f5fff003abfdffffff23fd2
000151a7d81afffe3f7f7f803bbffffffff88fe081a02a23d006fffe7fbf39403ffebf
fffff23fe408068007d00bfffeffff6bf83f7f7ffffffd1fe01004aa2ff005fffff55f
46581afde7fffff087f00151008fd0027fffe2ff75f83fdc7bfffff05ff04004600fc0
097fffc7ff79503677fffffff90ffa0495069f9002b7ffc9bf1e403edb7bfffff94ff0
0420005f000127f7c3ff1e201764dffffff811440106963f80001ddffc5f0000296bbf
fffff842920b0200fe0000007fffbf00003681ebfffff8096cffc094fc20001fffff5f
000001015ffffff88064dfc001f980003ffffff700000200f9fffff0130a0fc29af400
007fffffff00000003affffff8041403c2297d1800ffffffcf00000003fdfffff000a9
87e402d01800fffffff720300002bfbffff8299407f005a09800fffffff764000003da
fffff80001aff020040000ffffffef78c00001fbfffff0002107f020880000ffffffc7
db000003dffffff0024c87f042100000ffffffd759000003f6fffff0100895f801400d
00ffffffc7f3000007fffffff0024137f81e781fe0dfffff8f6c000007effffff00001
fbfc29fc37b0ffffff8748000003feffffe000017efc11de5fe06fffff07d0000007df
fffff000037bfc13ff9ff07fffff8700000007fffffff0000ffcfe227ffff837ffff1f
2000000fbbfffff0003dfffe41fffffc1fffffe75000000fffffffe00205fdff647fff
f816ffffc7a0000007dfffffe06f843dff635fffff03fdff074000000fffffffe1b3e0
1affe9ff67ff0522ce074000000fffffffc0bfb003ffc9f27ffe0398290700000007f7
ffff81fff00fffce4077ff04a020470000000fffffff86fff8057ffcc05fff0000000f
0000000fffffff837ffa0ffff780ffff0000000700000017bfffff0fffff0ffff601ff
ff000000470000000fffffff09dfc78bffffc22fff0000000700000007ffffff0d5bf0
eeffff89ffff0000000f0000000fffffff0bfff87eff8f12bfff000000270000000fff
ffff0feffc27fffd055fff000004070000001f7fffff3fb6d7ffff7907fffe0000000f
0000001ffffffc3e5d476fc0dd7fffff0000200f0000000ffffffc1ffdbdf5f12bffff
ff0000015f0000001ffffffc1f97edfff05fffefff0000003f0000000ffffff839febb
5ffcabbffffe000008bf0000002ffffffc3d56bfb7ff5fffffff000084ff0000001fff
fff85bdde5fffe29ffffff000000ff0000003fffffe066baaffffebbffffff000012ff
0000001ffffff02aebf66ffe5dffffff000001ff0000001fffffd057757bffff257fff
ff00000bff0000002fffffe0ad575f5fffd5ffffff000240ff0000003fffffc05bbcfe
bfff0a7fffff000003f70000006fffffc02aeb95ffffa5ffffff000093f70000003bff
ffc0aff99df77f0a7bfffe000423f70000003fffffb0112e733ffe95ddfefe000047c7
0000007fffffe01bf7eeedff0ab3defe00000b970000005fffff804415a9b775a54fff
ee000027c70000007fffff8036db4a3fb685ba7ffe00008787000050bffffff0080455
e6dd5867df6c000015870000007fffff801051a06eba9abfdffe000003070000605fff
ffc006082bb7ed954976f800000c07000000ffffffc004022a757a252bf7fc00002507
0000a07effff700568591fe55ada2e9c00000007000000bffffe400a3a24a55a656fff
bc00000587000000fffffbe000845a5df81ad59af8000020070000009fffffe0004c24
93c85556edf400000007000000ffffbf8000b25b2dbd1aa57bbc00000007000001ffff
ffa000491466e0035c5ffc00001407000001bfffffc000248b0bb86497db7000000007
000000ffffff4000122a35390a26effc000000070000007fffff8000498782e454d579
7c00000007000001bfffffc000210953ba89495ff400000007000001fbffffc0002892
a968256ebde800000007000001ffffffc000858581f914dbfb7c00000007000003bfff
ff00002142649887699dfc00000007000001bfffff00004a80a961296dffe802000007
000002dfffff00001191489822b757f800000007400001bfffff00001004a9a85576fb
d8000000077e2007ffffff0000038141500a97afb8000000077658077bffff00000611
aca951ee79d000000007ffa207effffe0000008a51500c556ff000000007ffc907ffff
fe0000028141c80467e77000000007ff74065ffffe00000126ac50005cbfe000000007
ffe80dfffffc0000008155a00017efc000000007fffe075ffffc000002a4aa58012937
4000000007fffc0efffffc00000003ad50002acd8500000007fffd19dffffc000000a0
62a000077f8058000007fffa0dfffffc00000084d9a800157501f0000007fffe06bfff
fc000000216450006dce023f000007fffc06bffff0000000601a400015d801ff500007
fff009e7fff000000000418000057001ffb28007ffe0037fffe0000000c0a000000240
07fffe8007fff0011bffe000000010010000007b21ffffe007ffffffffffe000000000
000000007f82fffffc07ffffffffffc000000000000000007fc1ffffff07ffffffffff
c900000000000000006c04fffffb07ffffffffffffa0000000000000000c027ffff847
ffffffffffffffc00000000000000001affffa27fffffffffffffff000000000000000
04005ffc07fffffffffffffffd0000000000000000000000075fffffffffffffffc000
000000000000220180ef1ffffffffffffffffe00000000000002000883ff1fffffffff
ffffffff00001800000000000009ff3fffffffffffffffff0000000001418000003bff
2fffffffffffffffff00010000027000901207ff7fffffffffffffffff7e00010037f8
0018000fff7fffffffffffffffffff00a44007fc0030423fff7fffffffffffffffffff
c043002ffc003000afff
end
grestore
showpage
%%Trailer
%%EOF

115
test/refs/o-tiff2ps-PS1.ps Normal file
View File

@ -0,0 +1,115 @@
%!PS-Adobe-3.0
%%Creator: tiff2ps
%%Title: miniswhite-1c-1b.tiff
%%CreationDate: Tue Apr 2 16:33:00 2019
%%DocumentData: Clean7Bit
%%Origin: 0 0
%%BoundingBox: 0 0 157 151
%%LanguageLevel: 1
%%Pages: (atend)
%%EndComments
%%BeginSetup
%%EndSetup
%%Page: 1 1
gsave
100 dict begin
157.000000 151.000000 scale
%ImageData: 157 151 1 1 0 1 2 "image"
/scanLine 20 string def
157 151 1
[157 0 0 -151 0 151]
{currentfile scanLine readhexstring pop} bind
image
0204153c0bfffffffff1ffffc7e01017ff8057ff5aa2803e1ffffffe0697ffffc7e485
dfffd77fff48aca4dfd7fffff80003ffffcffe017fffe0c7ff1101250ffbfffff0241b
ffffffff80fffff37fff29fa48abf7ffffe41221ffffafffe3fffff19fff7ff82200f7
fdff0040803fff5ffff5ffffe17ffffffe00088bc0070008259fff7ffffdfffff0ffff
7ffe040003c0001222001fff3ffffffffff15fdfffff084003004104809493fc1dffff
ffffc1badfffff0fd000010020140009e337ffffffffc3efffffff1abc040400000502
04c6bfffffefffc36b7ffffe1ffe0c808804009490061bffffffff82fafffffc3dff08
080000020042a78fffffffff87f7fffffc1fff0c0010428049080c27ffffffff87feff
fffc7ffd108000e0611090103ffffffffe077dfffffdbffc340003e808020203cfffff
fffc0bd77fffe0fffc000003e10022008877fffffffc06fdff3fe35ffc780217c02808
28000ffffffff80f5fff6bc27ff040000fc00100a20103ffffffc007f5ff5ec2ffe082
200bc480420454a1ffffffe0065fff7fc5ff0010005f1000205a4929ffffffe003d7ff
5fe7b80008202f029804000000ffffffc003efff37e5fe0010001e0401020240917fff
ffc004effffffbf80022001f018888a429087fffff8007b7ff5ff3e00080009c002122
2544015ffff9c01fb7ff7ef7c0100400fc8408000020981ffff0783fe97f77fbc00800
017e009006560a4547ffd2bffbffff5fd780020000f801041000a00033fccdbb9ffeff
1ba000500003fa1024a249125025f033effffeffffc000c00042f002860800880540d0
47ffffffff574001c80003f9803e405054411400a9bfffffff7e0003804003f00a0302
090114800005efffffff6f0003880007fc0203a040a3522a4017ffffffff5f00034000
1af980a884120f1f8c000adffffffffff80fc0000ff82810420a27ffa800067fffffff
fff80f400033fc010a44508fff8e000bfffffffffffc0fc0003ff9809842404fff9e20
07ffffdff7fffe0d400003ff200220291fff9b401afffffffffffc1fe01359ff089620
015fffaa001bffffff1ffffa3d703eeeff810b22480fff905006fffffd6ffff81fb078
adffe40e00412fff85400d7ffff9fffff01d787fedffe08ba8185fff501007ffff925f
fff03af8e7f7fff13f81401ffe054005ffffc1fffff03ffcf5effff00fa0094754d310
05fffb07bfff803ffdddfffff00fe0145ea503d00fffff2f5fff003abfdffffff23fd2
000151a7d81afffe3f7f7f803bbffffffff88fe081a02a23d006fffe7fbf39403ffebf
fffff23fe408068007d00bfffeffff6bf83f7f7ffffffd1fe01004aa2ff005fffff55f
46581afde7fffff087f00151008fd0027fffe2ff75f83fdc7bfffff05ff04004600fc0
097fffc7ff79503677fffffff90ffa0495069f9002b7ffc9bf1e403edb7bfffff94ff0
0420005f000127f7c3ff1e201764dffffff811440106963f80001ddffc5f0000296bbf
fffff842920b0200fe0000007fffbf00003681ebfffff8096cffc094fc20001fffff5f
000001015ffffff88064dfc001f980003ffffff700000200f9fffff0130a0fc29af400
007fffffff00000003affffff8041403c2297d1800ffffffcf00000003fdfffff000a9
87e402d01800fffffff720300002bfbffff8299407f005a09800fffffff764000003da
fffff80001aff020040000ffffffef78c00001fbfffff0002107f020880000ffffffc7
db000003dffffff0024c87f042100000ffffffd759000003f6fffff0100895f801400d
00ffffffc7f3000007fffffff0024137f81e781fe0dfffff8f6c000007effffff00001
fbfc29fc37b0ffffff8748000003feffffe000017efc11de5fe06fffff07d0000007df
fffff000037bfc13ff9ff07fffff8700000007fffffff0000ffcfe227ffff837ffff1f
2000000fbbfffff0003dfffe41fffffc1fffffe75000000fffffffe00205fdff647fff
f816ffffc7a0000007dfffffe06f843dff635fffff03fdff074000000fffffffe1b3e0
1affe9ff67ff0522ce074000000fffffffc0bfb003ffc9f27ffe0398290700000007f7
ffff81fff00fffce4077ff04a020470000000fffffff86fff8057ffcc05fff0000000f
0000000fffffff837ffa0ffff780ffff0000000700000017bfffff0fffff0ffff601ff
ff000000470000000fffffff09dfc78bffffc22fff0000000700000007ffffff0d5bf0
eeffff89ffff0000000f0000000fffffff0bfff87eff8f12bfff000000270000000fff
ffff0feffc27fffd055fff000004070000001f7fffff3fb6d7ffff7907fffe0000000f
0000001ffffffc3e5d476fc0dd7fffff0000200f0000000ffffffc1ffdbdf5f12bffff
ff0000015f0000001ffffffc1f97edfff05fffefff0000003f0000000ffffff839febb
5ffcabbffffe000008bf0000002ffffffc3d56bfb7ff5fffffff000084ff0000001fff
fff85bdde5fffe29ffffff000000ff0000003fffffe066baaffffebbffffff000012ff
0000001ffffff02aebf66ffe5dffffff000001ff0000001fffffd057757bffff257fff
ff00000bff0000002fffffe0ad575f5fffd5ffffff000240ff0000003fffffc05bbcfe
bfff0a7fffff000003f70000006fffffc02aeb95ffffa5ffffff000093f70000003bff
ffc0aff99df77f0a7bfffe000423f70000003fffffb0112e733ffe95ddfefe000047c7
0000007fffffe01bf7eeedff0ab3defe00000b970000005fffff804415a9b775a54fff
ee000027c70000007fffff8036db4a3fb685ba7ffe00008787000050bffffff0080455
e6dd5867df6c000015870000007fffff801051a06eba9abfdffe000003070000605fff
ffc006082bb7ed954976f800000c07000000ffffffc004022a757a252bf7fc00002507
0000a07effff700568591fe55ada2e9c00000007000000bffffe400a3a24a55a656fff
bc00000587000000fffffbe000845a5df81ad59af8000020070000009fffffe0004c24
93c85556edf400000007000000ffffbf8000b25b2dbd1aa57bbc00000007000001ffff
ffa000491466e0035c5ffc00001407000001bfffffc000248b0bb86497db7000000007
000000ffffff4000122a35390a26effc000000070000007fffff8000498782e454d579
7c00000007000001bfffffc000210953ba89495ff400000007000001fbffffc0002892
a968256ebde800000007000001ffffffc000858581f914dbfb7c00000007000003bfff
ff00002142649887699dfc00000007000001bfffff00004a80a961296dffe802000007
000002dfffff00001191489822b757f800000007400001bfffff00001004a9a85576fb
d8000000077e2007ffffff0000038141500a97afb8000000077658077bffff00000611
aca951ee79d000000007ffa207effffe0000008a51500c556ff000000007ffc907ffff
fe0000028141c80467e77000000007ff74065ffffe00000126ac50005cbfe000000007
ffe80dfffffc0000008155a00017efc000000007fffe075ffffc000002a4aa58012937
4000000007fffc0efffffc00000003ad50002acd8500000007fffd19dffffc000000a0
62a000077f8058000007fffa0dfffffc00000084d9a800157501f0000007fffe06bfff
fc000000216450006dce023f000007fffc06bffff0000000601a400015d801ff500007
fff009e7fff000000000418000057001ffb28007ffe0037fffe0000000c0a000000240
07fffe8007fff0011bffe000000010010000007b21ffffe007ffffffffffe000000000
000000007f82fffffc07ffffffffffc000000000000000007fc1ffffff07ffffffffff
c900000000000000006c04fffffb07ffffffffffffa0000000000000000c027ffff847
ffffffffffffffc00000000000000001affffa27fffffffffffffff000000000000000
04005ffc07fffffffffffffffd0000000000000000000000075fffffffffffffffc000
000000000000220180ef1ffffffffffffffffe00000000000002000883ff1fffffffff
ffffffff00001800000000000009ff3fffffffffffffffff0000000001418000003bff
2fffffffffffffffff00010000027000901207ff7fffffffffffffffff7e00010037f8
0018000fff7fffffffffffffffffff00a44007fc0030423fff7fffffffffffffffffff
c043002ffc003000afff
end
grestore
showpage
%%Trailer
%%Pages: 1
%%EOF

104
test/refs/o-tiff2ps-PS2.ps Normal file
View File

@ -0,0 +1,104 @@
%!PS-Adobe-3.0
%%Creator: tiff2ps
%%Title: miniswhite-1c-1b.tiff
%%CreationDate: Tue Apr 2 16:33:00 2019
%%DocumentData: Clean7Bit
%%Origin: 0 0
%%BoundingBox: 0 0 157 151
%%LanguageLevel: 2
%%Pages: (atend)
%%EndComments
%%BeginSetup
gsave newpath clippath pathbbox grestore
4 2 roll 2 copy translate
exch 3 1 roll sub 3 1 roll sub exch
currentpagedevice /PageSize get aload pop
exch 3 1 roll div 3 1 roll div abs exch abs
2 copy gt { exch } if pop
dup 1 lt { dup scale } { pop } ifelse
%%EndSetup
%%Page: 1 1
%%PageOrientation: Landscape
%%PageBoundingBox: 0 0 157 151
1 dict begin /PageSize [ 157.000000 151.000000 ] def currentdict end setpagedevice
<<
/Policies <<
/PageSize 3
>>
>> setpagedevice
gsave
100 dict begin
157.000000 151.000000 scale
% PostScript Level 2 only.
/DeviceGray setcolorspace
{ % exec
/im_stream currentfile /ASCII85Decode filter def
<<
/ImageType 1
/Width 157
/Height 151
/ImageMatrix [ 157 0 0 -151 0 151 ]
/BitsPerComponent 1
/Interpolate true
/Decode [1 0]
/DataSource im_stream
>> image
im_stream status { im_stream flushfile } if
}
exec
rVPltoDejk!"Ju/3$7VQ!.UpIV-SSehuE`Xq.Ka.3#d/d!%<?t[o6KR-ia5Ps82is0EM0'!$=0#
mf(r0"98E4gZ/>7!!%KK!"=AXeciN^#QOiDmG7gC:]MI8!"NB:J-Xp1#Qb#+^OO$!TE#<!!$6Xj
!!3,oF?fR#pY'!TJ,fWN!"T&0J-#QIr'15Kh>cC5^]4?7!"PYE!!)c.r;XM.Iqrj&iW&rY!'Wgo
!!)LAs8N&Uli6Yua8c2?!'Cem!!)+JqtpEnqYg:O5QCcq!'HKr!!2!Yo7(u]s(cQKj8]/[!.>"N
!!C(<p\4^frVsQ5Du]k<!-ebL!!D-ZoDe9mJ%#+CfDkmO!-eME!!@`Qmsk?ZT'pUd^]4?7!Vh6H
!!5CfbQ%JVp\k'g0E;(Q"8"!l!$;1Cs8W!<s5!^!L]@DT"8Muu^`9!LL]-F$fD!nsn,NFg#OnAd
PWaO-^]3dfrr6:'qu?]s5PPQcTfiAtIGaZYJ%b`[?2ss*+8MQ0J3!]1n,K'Ls50Z]ec5[M+8dMe
TGU3!pYX?rBD_`/rr<$!5Pu&ma;P*Zn,MADrr)f1DL_]e5Pkul!!EQ,h>cF4GB[9BpOE5DJ+uP7
TF;qBJ,a$YhVHntrh'5q5N#'4JI"L/qu6bFp](9NBA`b#LVO[UL]fs:s8ITLDu$C*]!q_l5Qh&e
TI><gs8N?'qsXPls3(R#6sp#qjBqqjs83&hgKh8TYM'N2&-)_2!'gKJs1JsAH2%>_qS+\nzW5&<j
s83(N_8!1S^?bf"5QCcaJcGXt^\eW8r;H?gl[Ss2&-)\1OT56&s7c]pr*R3DXjt2MzT`=r)s5aH7
=*s?(i,eqk+92BA!!i!Xs6p9Fn%JDH!*B3rJ,fQL!!i#.s3(TEot.DH!-/&2z!!D^Ts1ehgB>)'a
!+Fd[!!",I!!2Z*s82lSrSQ2a!+`k+z!!D.$m%sdWC#Ao_!*0'[!!!#W!!U6#_%?Zro\I"G!,o(:
!!!(^!!hFXLJe*knc->M!.)ENJ,fcR!"\(EJ._i(FB@Xu!3bkd!!$l/!"[$R(^L*O^ja&V!W'S-
!!#1_!"ZjI$4m1Jn6bn!X"<`9!!N'^!.Vcc+ohTRn/pti>5U&C!!(B=!<:#'+92BN^b,TcY#m(5
!!0lcJ:GL&!!!!(E$'O9e_DhR!!.U8`kT:i5QCcn^`3%DJ+t\h!!*'"PR#!SJ,fQNi#hFb<R;9Q
!!!A!\YnNj(]XOHGRseVs)9XiJ,gSiM?gpAKE(u_TF\g7TC>)=J,hP/L9J^T!!!!'n-/](q-\.>
8,tP5iP32SKE(uVYRgWgs.KDkfEaS>iSWjg+92BHm^rJoBu#5uiZJ>rs8UZ75QCch]l!E?rrN0"
s*t)7s8U2i'EA+<p6,J@CBNJohuEbMs8W)tTE"rsJ"%QFrW[lP^]4??s8W&t"onW6m.Kj2AIJP<
J,fQLs8W,s:]LJ#qs4/Ceq3)b!!!!Qs8W,s!WW32s&O@`r@d@6!!!!)hp;?$5X5;Senb$kqHmn8
!!!!)S,`Nd,ldoMs8Gh*hu!HR!!!!1LHkh<"98E4s5*M]hfo,#!!!!Y,ldoB+92BPrNg_Z^$l"$
!!!!IVZ6\o#ljr9n+UQ%rkJ%(!!!!Y%0-A&!!!!0rP$>XiJ6>5+92C\PQ1[X&-)\@s8E-'ecWuh
!!!"D\,ZL+!<<*As8IQOmNJ5FO8o:U0E;(I+92BPs87NPli:E(J,fRos8W,o!!!!0s6p*kh1,J1
a8c4uhuE`G6i[2ts2"a:^&S-8huE`oYQ+Xl!!!!@rV?QqRt(JDkl:]C?iU0$+92B`OF+hES=fi^
quQln^]4?'!!!!?9HW?r(''^%qV<n$^]4?'!!!!`5Yq:X2@Y0;r+FUUs8W,o#QOjR!"\Q!0u&ME
qd86js8W,g!!!"E!!i@N"$`FYs8W,gs8W,g!!!"HJ-GEB#_)gSs8W,os8W,_5QCfR!!)Kg$2so)
s8W,/s8W,g!!!#m+?4HC!'S[/s8W,os8W,o!!!#iU^n%;!-S>Bs8W,gs8W,g!!!#k!!e&TE:#mj
s8W,Os8W,g!!!#g&-LPb!rAPis8Vuks8W,WJ,fSb8LOQ=LA1`Ls8W,gs8W,W!!!,;U:?:L,(KXn
s8V!Gs8W,g!!!,Z!^[5(e,TIKs8W(ks8W,W!!!,ZBG(:UTE#N's8W,7s8W,g!!!8D!CWR_<'UEa
s8VgYs8W,G!!!,<WB`uSTE"rls8REGs8W,W!!!8"+rUF^ec5[Ms8W*!s8W,7!!"+/78Nsb6i[2e
s8VHds8W,W!!!P['FBj%U&Y/ns8W&us8W,W!!"[NMM(s0g40/'s8V]ks8W,G!!"*=W1]d`.KBGK
s8B\4s8W,7!!#6Z6NKFPomd#Bs8W!&s8W+\!!#76'P[UJ=o\O&s8Qm@s8W,;!!#5[#%@jgon3;G
s81RWs8W,7!!#g_d>YjAC*EZZs8TSgs8W+L!!",%#S@[Loh6M0s8V_)s8W+l!!%M\l;gH5>-Iu=
s8U_2s8W+L!!%Mj,dkEZH:<>bs8R=gs8T8f!!!Q(ql1MXVjJTjs8VA/s8W+L!!%N;Y$[;[AO%@=
s8W#ls8S^a!!#7ZpXD_HC:8s(s8V]cs8W*!!!#7\rRHdZg=-B1s8UgJs8QGW!!&)VQ_r[ZV'XN!
s8W,os8W*a!!0k-`S4RmRZIM:s8Vq?s8W*!!!FDDH_mGAjXOgHs8V!Os8W+,!!",@ZeK:TWi6U=
s8W,os8W*!!'l&69r-3(j][=)s8W,os8W&u!!$C+[d0>'r1fnes8VE[s8W'`!!#7`gN<'XRqO(.
s8W,os8W*!!!'e6mFBA!p"9lYs8W,os8W+L!!%NK[Wm3>X"&jVs8W,os8W'`!!#7`hY+$>G.+%O
s8W,os8W'$!!#7`f54QTg6"]<s8W,os8W&u!!#7`H?t#ElQcUcs8W,os8W!^!!*'!hS#CkGa;e@
s8W,os8W'`!!*'![=;5Kerg"LrVuoms8W$?!!*'!mV]LHh+4ILs8W,o^]49u!!*'!n,$-eWegj+
s8W,oJ`$5&!!*'!r-lA`ok7/ls8W,oM5U-%!!*'!q<h0^Xq?CAs8W,o!+#@2!!3-"s)kKJo;[l_
s8W,o!&jTP!!3-"rI2I>qj84]s8W,o!/pZG!!3-"rn15Rs._h$s8W,o!#P2+!!E9$s*gtTs6("Y
s8W,o!!2kf!!E9$rEE:"rmo0*s8W,o!!D`k!!E9$s85cus4&lNs8W,o!!;:*!!E9$s'M=(s7h+o
VuQel!!Von!!E9$s*H(os6>L@&-)\)!!2m\!!E9$s5'6Ks,o,8_#OH0!!E$^!"],0s.ADfs6;!2
!3cFt!"\c?!"],0s8Tf_s8%fU!)7t<!$D,h!$D7@s$'ljs8B_-!!.TE!"](i!$D7@s6oses8Rc/
!!",9z!$D7@s8W-!s8RUt!!!,rz!'gM`s8W-!s8RU5!!!#oz!&jlWs8W-!s8S;[!!!/sz!!$C+
s8W-!s8V]hJ,fhaz!!!!`s8W-!s8W,u:]L[Oz!!!!0s8W-!s8W,rs.BJhz!!!!#s8W-!s8W-!
s8W,oTE"rlz5QCc`s8W-!h>Vm8huE`Wz!WW3"s8W,ts7^m@huE`Wz!<<)^s8W-!s8Vcm^]4?7
z!<<*!s8K`^s8U";ci=%Gz!<<&us8A#YDsd<"J,fQLz!.k1Ls2YHFkPt#OJ,fQLz!!*%'^\@p2
cb7*oJ,fQLz!!#6rs3LlJci6fA~>
end
grestore
showpage
%%Trailer
%%Pages: 1
%%EOF

104
test/refs/o-tiff2ps-PS3.ps Normal file
View File

@ -0,0 +1,104 @@
%!PS-Adobe-3.0
%%Creator: tiff2ps
%%Title: miniswhite-1c-1b.tiff
%%CreationDate: Tue Apr 2 16:33:00 2019
%%DocumentData: Clean7Bit
%%Origin: 0 0
%%BoundingBox: 0 0 157 151
%%LanguageLevel: 3
%%Pages: (atend)
%%EndComments
%%BeginSetup
gsave newpath clippath pathbbox grestore
4 2 roll 2 copy translate
exch 3 1 roll sub 3 1 roll sub exch
currentpagedevice /PageSize get aload pop
exch 3 1 roll div 3 1 roll div abs exch abs
2 copy gt { exch } if pop
dup 1 lt { dup scale } { pop } ifelse
%%EndSetup
%%Page: 1 1
%%PageOrientation: Landscape
%%PageBoundingBox: 0 0 157 151
1 dict begin /PageSize [ 157.000000 151.000000 ] def currentdict end setpagedevice
<<
/Policies <<
/PageSize 3
>>
>> setpagedevice
gsave
100 dict begin
157.000000 151.000000 scale
% PostScript Level 2 only.
/DeviceGray setcolorspace
{ % exec
/im_stream currentfile /ASCII85Decode filter def
<<
/ImageType 1
/Width 157
/Height 151
/ImageMatrix [ 157 0 0 -151 0 151 ]
/BitsPerComponent 1
/Interpolate true
/Decode [1 0]
/DataSource im_stream
>> image
im_stream status { im_stream flushfile } if
}
exec
rVPltoDejk!"Ju/3$7VQ!.UpIV-SSehuE`Xq.Ka.3#d/d!%<?t[o6KR-ia5Ps82is0EM0'!$=0#
mf(r0"98E4gZ/>7!!%KK!"=AXeciN^#QOiDmG7gC:]MI8!"NB:J-Xp1#Qb#+^OO$!TE#<!!$6Xj
!!3,oF?fR#pY'!TJ,fWN!"T&0J-#QIr'15Kh>cC5^]4?7!"PYE!!)c.r;XM.Iqrj&iW&rY!'Wgo
!!)LAs8N&Uli6Yua8c2?!'Cem!!)+JqtpEnqYg:O5QCcq!'HKr!!2!Yo7(u]s(cQKj8]/[!.>"N
!!C(<p\4^frVsQ5Du]k<!-ebL!!D-ZoDe9mJ%#+CfDkmO!-eME!!@`Qmsk?ZT'pUd^]4?7!Vh6H
!!5CfbQ%JVp\k'g0E;(Q"8"!l!$;1Cs8W!<s5!^!L]@DT"8Muu^`9!LL]-F$fD!nsn,NFg#OnAd
PWaO-^]3dfrr6:'qu?]s5PPQcTfiAtIGaZYJ%b`[?2ss*+8MQ0J3!]1n,K'Ls50Z]ec5[M+8dMe
TGU3!pYX?rBD_`/rr<$!5Pu&ma;P*Zn,MADrr)f1DL_]e5Pkul!!EQ,h>cF4GB[9BpOE5DJ+uP7
TF;qBJ,a$YhVHntrh'5q5N#'4JI"L/qu6bFp](9NBA`b#LVO[UL]fs:s8ITLDu$C*]!q_l5Qh&e
TI><gs8N?'qsXPls3(R#6sp#qjBqqjs83&hgKh8TYM'N2&-)_2!'gKJs1JsAH2%>_qS+\nzW5&<j
s83(N_8!1S^?bf"5QCcaJcGXt^\eW8r;H?gl[Ss2&-)\1OT56&s7c]pr*R3DXjt2MzT`=r)s5aH7
=*s?(i,eqk+92BA!!i!Xs6p9Fn%JDH!*B3rJ,fQL!!i#.s3(TEot.DH!-/&2z!!D^Ts1ehgB>)'a
!+Fd[!!",I!!2Z*s82lSrSQ2a!+`k+z!!D.$m%sdWC#Ao_!*0'[!!!#W!!U6#_%?Zro\I"G!,o(:
!!!(^!!hFXLJe*knc->M!.)ENJ,fcR!"\(EJ._i(FB@Xu!3bkd!!$l/!"[$R(^L*O^ja&V!W'S-
!!#1_!"ZjI$4m1Jn6bn!X"<`9!!N'^!.Vcc+ohTRn/pti>5U&C!!(B=!<:#'+92BN^b,TcY#m(5
!!0lcJ:GL&!!!!(E$'O9e_DhR!!.U8`kT:i5QCcn^`3%DJ+t\h!!*'"PR#!SJ,fQNi#hFb<R;9Q
!!!A!\YnNj(]XOHGRseVs)9XiJ,gSiM?gpAKE(u_TF\g7TC>)=J,hP/L9J^T!!!!'n-/](q-\.>
8,tP5iP32SKE(uVYRgWgs.KDkfEaS>iSWjg+92BHm^rJoBu#5uiZJ>rs8UZ75QCch]l!E?rrN0"
s*t)7s8U2i'EA+<p6,J@CBNJohuEbMs8W)tTE"rsJ"%QFrW[lP^]4??s8W&t"onW6m.Kj2AIJP<
J,fQLs8W,s:]LJ#qs4/Ceq3)b!!!!Qs8W,s!WW32s&O@`r@d@6!!!!)hp;?$5X5;Senb$kqHmn8
!!!!)S,`Nd,ldoMs8Gh*hu!HR!!!!1LHkh<"98E4s5*M]hfo,#!!!!Y,ldoB+92BPrNg_Z^$l"$
!!!!IVZ6\o#ljr9n+UQ%rkJ%(!!!!Y%0-A&!!!!0rP$>XiJ6>5+92C\PQ1[X&-)\@s8E-'ecWuh
!!!"D\,ZL+!<<*As8IQOmNJ5FO8o:U0E;(I+92BPs87NPli:E(J,fRos8W,o!!!!0s6p*kh1,J1
a8c4uhuE`G6i[2ts2"a:^&S-8huE`oYQ+Xl!!!!@rV?QqRt(JDkl:]C?iU0$+92B`OF+hES=fi^
quQln^]4?'!!!!?9HW?r(''^%qV<n$^]4?'!!!!`5Yq:X2@Y0;r+FUUs8W,o#QOjR!"\Q!0u&ME
qd86js8W,g!!!"E!!i@N"$`FYs8W,gs8W,g!!!"HJ-GEB#_)gSs8W,os8W,_5QCfR!!)Kg$2so)
s8W,/s8W,g!!!#m+?4HC!'S[/s8W,os8W,o!!!#iU^n%;!-S>Bs8W,gs8W,g!!!#k!!e&TE:#mj
s8W,Os8W,g!!!#g&-LPb!rAPis8Vuks8W,WJ,fSb8LOQ=LA1`Ls8W,gs8W,W!!!,;U:?:L,(KXn
s8V!Gs8W,g!!!,Z!^[5(e,TIKs8W(ks8W,W!!!,ZBG(:UTE#N's8W,7s8W,g!!!8D!CWR_<'UEa
s8VgYs8W,G!!!,<WB`uSTE"rls8REGs8W,W!!!8"+rUF^ec5[Ms8W*!s8W,7!!"+/78Nsb6i[2e
s8VHds8W,W!!!P['FBj%U&Y/ns8W&us8W,W!!"[NMM(s0g40/'s8V]ks8W,G!!"*=W1]d`.KBGK
s8B\4s8W,7!!#6Z6NKFPomd#Bs8W!&s8W+\!!#76'P[UJ=o\O&s8Qm@s8W,;!!#5[#%@jgon3;G
s81RWs8W,7!!#g_d>YjAC*EZZs8TSgs8W+L!!",%#S@[Loh6M0s8V_)s8W+l!!%M\l;gH5>-Iu=
s8U_2s8W+L!!%Mj,dkEZH:<>bs8R=gs8T8f!!!Q(ql1MXVjJTjs8VA/s8W+L!!%N;Y$[;[AO%@=
s8W#ls8S^a!!#7ZpXD_HC:8s(s8V]cs8W*!!!#7\rRHdZg=-B1s8UgJs8QGW!!&)VQ_r[ZV'XN!
s8W,os8W*a!!0k-`S4RmRZIM:s8Vq?s8W*!!!FDDH_mGAjXOgHs8V!Os8W+,!!",@ZeK:TWi6U=
s8W,os8W*!!'l&69r-3(j][=)s8W,os8W&u!!$C+[d0>'r1fnes8VE[s8W'`!!#7`gN<'XRqO(.
s8W,os8W*!!!'e6mFBA!p"9lYs8W,os8W+L!!%NK[Wm3>X"&jVs8W,os8W'`!!#7`hY+$>G.+%O
s8W,os8W'$!!#7`f54QTg6"]<s8W,os8W&u!!#7`H?t#ElQcUcs8W,os8W!^!!*'!hS#CkGa;e@
s8W,os8W'`!!*'![=;5Kerg"LrVuoms8W$?!!*'!mV]LHh+4ILs8W,o^]49u!!*'!n,$-eWegj+
s8W,oJ`$5&!!*'!r-lA`ok7/ls8W,oM5U-%!!*'!q<h0^Xq?CAs8W,o!+#@2!!3-"s)kKJo;[l_
s8W,o!&jTP!!3-"rI2I>qj84]s8W,o!/pZG!!3-"rn15Rs._h$s8W,o!#P2+!!E9$s*gtTs6("Y
s8W,o!!2kf!!E9$rEE:"rmo0*s8W,o!!D`k!!E9$s85cus4&lNs8W,o!!;:*!!E9$s'M=(s7h+o
VuQel!!Von!!E9$s*H(os6>L@&-)\)!!2m\!!E9$s5'6Ks,o,8_#OH0!!E$^!"],0s.ADfs6;!2
!3cFt!"\c?!"],0s8Tf_s8%fU!)7t<!$D,h!$D7@s$'ljs8B_-!!.TE!"](i!$D7@s6oses8Rc/
!!",9z!$D7@s8W-!s8RUt!!!,rz!'gM`s8W-!s8RU5!!!#oz!&jlWs8W-!s8S;[!!!/sz!!$C+
s8W-!s8V]hJ,fhaz!!!!`s8W-!s8W,u:]L[Oz!!!!0s8W-!s8W,rs.BJhz!!!!#s8W-!s8W-!
s8W,oTE"rlz5QCc`s8W-!h>Vm8huE`Wz!WW3"s8W,ts7^m@huE`Wz!<<)^s8W-!s8Vcm^]4?7
z!<<*!s8K`^s8U";ci=%Gz!<<&us8A#YDsd<"J,fQLz!.k1Ls2YHFkPt#OJ,fQLz!!*%'^\@p2
cb7*oJ,fQLz!!#6rs3LlJci6fA~>
end
grestore
showpage
%%Trailer
%%Pages: 1
%%EOF

4
test/tiff2ps-EPS1.sh
View File

@ -2,5 +2,7 @@
#
# Basic sanity check for tiffps with PostScript Level 1 encapsulated output
#
PSFILE=o-tiff2ps-EPS1.ps
. ${srcdir:-.}/common.sh
f_test_stdout "${TIFF2PS} -e -1" "${IMG_MINISWHITE_1C_1B}" "o-tiff2ps-EPS1.ps"
f_test_stdout "${TIFF2PS} -e -1" "${IMG_MINISWHITE_1C_1B}" "${PSFILE}"
diff -I '%%\(CreationDate\|Title\):*' -u "${REFS}/${PSFILE}" "${PSFILE}" || exit 1

4
test/tiff2ps-PS1.sh
View File

@ -2,5 +2,7 @@
#
# Basic sanity check for tiffps with PostScript Level 1 output
#
PSFILE="o-tiff2ps-PS1.ps"
. ${srcdir:-.}/common.sh
f_test_stdout "${TIFF2PS} -a -p -1" "${IMG_MINISWHITE_1C_1B}" "o-tiff2ps-PS1.ps"
f_test_stdout "${TIFF2PS} -a -p -1" "${IMG_MINISWHITE_1C_1B}" "${PSFILE}"
diff -I '%%\(CreationDate\|Title\):*' -u "${REFS}/${PSFILE}" "${PSFILE}" || exit 1

4
test/tiff2ps-PS2.sh
View File

@ -2,5 +2,7 @@
#
# Basic sanity check for tiffps with PostScript Level 2 output
#
PSFILE=o-tiff2ps-PS2.ps
. ${srcdir:-.}/common.sh
f_test_stdout "${TIFF2PS} -a -p -2" "${IMG_MINISWHITE_1C_1B}" "o-tiff2ps-PS2.ps"
f_test_stdout "${TIFF2PS} -a -p -2" "${IMG_MINISWHITE_1C_1B}" "${PSFILE}"
diff -I '%%\(CreationDate\|Title\):*' -u "${REFS}/${PSFILE}" "${PSFILE}" || exit 1

4
test/tiff2ps-PS3.sh
View File

@ -2,5 +2,7 @@
#
# Basic sanity check for tiffps with PostScript Level 3 output
#
PSFILE=o-tiff2ps-PS3.ps
. ${srcdir:-.}/common.sh
f_test_stdout "${TIFF2PS} -a -p -3" "${IMG_MINISWHITE_1C_1B}" "o-tiff2ps-PS3.ps"
f_test_stdout "${TIFF2PS} -a -p -3" "${IMG_MINISWHITE_1C_1B}" "${PSFILE}"
diff -I '%%\(CreationDate\|Title\):*' -u "${REFS}/${PSFILE}" "${PSFILE}" || exit 1

4
tools/tiff2ps.c
View File

@ -2468,7 +2468,7 @@ PSDataColorContig(FILE* fd, TIFF* tif, uint32 w, uint32 h, int nc)
if (alpha) {
int adjust;
cc = 0;
for (; cc < tf_bytesperrow; cc += samplesperpixel) {
for (; (cc + nc) <= tf_bytesperrow; cc += samplesperpixel) {
DOBREAK(breaklen, nc, fd);
/*
* For images with alpha, matte against
@ -2487,7 +2487,7 @@ PSDataColorContig(FILE* fd, TIFF* tif, uint32 w, uint32 h, int nc)
}
} else {
cc = 0;
for (; cc < tf_bytesperrow; cc += samplesperpixel) {
for (; (cc + nc) <= tf_bytesperrow; cc += samplesperpixel) {
DOBREAK(breaklen, nc, fd);
switch (nc) {
case 4: c = *cp++; PUTHEX(c,fd);