update to 10.26.64 (miscellaneous bug fixes) and prepare for jpeg7

This commit is contained in:
naddy 2009-10-11 19:36:15 +00:00
parent e5e7bc4b69
commit 5bf84ad0e2
4 changed files with 290 additions and 275 deletions

View File

@ -1,8 +1,8 @@
# $OpenBSD: Makefile,v 1.49 2008/10/25 11:25:10 naddy Exp $ # $OpenBSD: Makefile,v 1.50 2009/10/11 19:36:15 naddy Exp $
COMMENT= toolkit for converting images between different formats COMMENT= toolkit for converting images between different formats
DISTNAME= netpbm-10.26.57 DISTNAME= netpbm-10.26.64
SHARED_LIBS= netpbm 1.0 SHARED_LIBS= netpbm 1.0
CATEGORIES= graphics CATEGORIES= graphics
HOMEPAGE= http://netpbm.sourceforge.net/ HOMEPAGE= http://netpbm.sourceforge.net/

View File

@ -1,5 +1,5 @@
MD5 (netpbm-10.26.57.tgz) = KXXpxKkM0W7v92PDjJqnPw== MD5 (netpbm-10.26.64.tgz) = qJXwAtjiC8aNAD7nctt28Q==
RMD160 (netpbm-10.26.57.tgz) = afWkTleyHYpF+T6PmC7xbA13Xk4= RMD160 (netpbm-10.26.64.tgz) = w+kiquwyClaS+w1xteNDA9ncL58=
SHA1 (netpbm-10.26.57.tgz) = FZ0peQL6y7rkYh4ZREiwGiS682U= SHA1 (netpbm-10.26.64.tgz) = FRjWJoo1ogix31V9bhkyNtLsVvg=
SHA256 (netpbm-10.26.57.tgz) = WduQMkbYzP9T62wuChcRuOv0ubrTKVPiAHWWgNP1A+Q= SHA256 (netpbm-10.26.64.tgz) = HPiRc/FB4uj0bFS5U380TIdPjj/9HUGpXUHeAtknJXs=
SIZE (netpbm-10.26.57.tgz) = 2544590 SIZE (netpbm-10.26.64.tgz) = 2545993

View File

@ -0,0 +1,15 @@
$OpenBSD: patch-converter_ppm_ppmtompeg_jpeg_c,v 1.1 2009/10/11 19:36:15 naddy Exp $
--- converter/ppm/ppmtompeg/jpeg.c.orig Sun Oct 11 21:08:27 2009
+++ converter/ppm/ppmtompeg/jpeg.c Sun Oct 11 21:14:24 2009
@@ -481,7 +481,11 @@ ReadJPEG(mf, fp)
#ifdef JPEG4
buffer_height = 8; /* could be 2, 4,8 rows high */
#else
+#if JPEG_LIB_VERSION < 70
buffer_height = cinfo.max_v_samp_factor * cinfo.min_DCT_scaled_size;
+#else
+ buffer_height = cinfo.max_v_samp_factor * cinfo.min_DCT_v_scaled_size;
+#endif
#endif
for(cp=0,compptr = cinfo.comp_info;cp<cinfo.num_components;

View File

@ -1,302 +1,302 @@
@comment $OpenBSD: PLIST,v 1.7 2006/06/11 18:22:06 naddy Exp $ @comment $OpenBSD: PLIST,v 1.8 2009/10/11 19:36:15 naddy Exp $
%%SHARED%% %%SHARED%%
bin/411toppm @bin bin/411toppm
bin/anytopnm bin/anytopnm
bin/asciitopgm @bin bin/asciitopgm
bin/atktopbm @bin bin/atktopbm
bin/bioradtopgm @bin bin/bioradtopgm
bin/bmptopnm @bin bin/bmptopnm
bin/bmptoppm bin/bmptoppm
bin/brushtopbm @bin bin/brushtopbm
bin/cmuwmtopbm @bin bin/cmuwmtopbm
bin/ddbugtopbm @bin bin/ddbugtopbm
bin/escp2topbm @bin bin/escp2topbm
bin/eyuvtoppm @bin bin/eyuvtoppm
bin/fiascotopnm @bin bin/fiascotopnm
bin/fitstopnm @bin bin/fitstopnm
bin/fstopgm @bin bin/fstopgm
bin/g3topbm @bin bin/g3topbm
bin/gemtopbm bin/gemtopbm
bin/gemtopnm @bin bin/gemtopnm
bin/giftopnm @bin bin/giftopnm
bin/gouldtoppm @bin bin/gouldtoppm
bin/hdifftopam @bin bin/hdifftopam
bin/hipstopgm @bin bin/hipstopgm
@comment bin/hpcdtoppm @comment bin/hpcdtoppm
bin/icontopbm @bin bin/icontopbm
bin/ilbmtoppm @bin bin/ilbmtoppm
bin/imgtoppm @bin bin/imgtoppm
bin/infotopam @bin bin/infotopam
bin/jbigtopnm @bin bin/jbigtopnm
bin/jpeg2ktopam @bin bin/jpeg2ktopam
bin/jpegtopnm @bin bin/jpegtopnm
bin/leaftoppm @bin bin/leaftoppm
bin/lispmtopgm @bin bin/lispmtopgm
bin/macptopbm @bin bin/macptopbm
bin/manweb bin/manweb
bin/mdatopbm @bin bin/mdatopbm
bin/mgrtopbm @bin bin/mgrtopbm
bin/mrftopbm @bin bin/mrftopbm
bin/mtvtoppm @bin bin/mtvtoppm
bin/neotoppm @bin bin/neotoppm
bin/palmtopnm @bin bin/palmtopnm
bin/pamarith @bin bin/pamarith
bin/pamchannel @bin bin/pamchannel
bin/pamcomp @bin bin/pamcomp
bin/pamcut @bin bin/pamcut
bin/pamdeinterlace @bin bin/pamdeinterlace
bin/pamdice @bin bin/pamdice
bin/pamditherbw @bin bin/pamditherbw
bin/pamedge @bin bin/pamedge
bin/pamendian @bin bin/pamendian
bin/pamenlarge @bin bin/pamenlarge
bin/pamfile @bin bin/pamfile
bin/pamflip @bin bin/pamflip
bin/pamfunc @bin bin/pamfunc
bin/pamgauss @bin bin/pamgauss
bin/pamlookup @bin bin/pamlookup
bin/pammasksharpen @bin bin/pammasksharpen
bin/pamoil @bin bin/pamoil
bin/pamperspective @bin bin/pamperspective
bin/pampop9 @bin bin/pampop9
bin/pamscale @bin bin/pamscale
bin/pamseq @bin bin/pamseq
bin/pamsharpmap @bin bin/pamsharpmap
bin/pamsharpness @bin bin/pamsharpness
bin/pamslice @bin bin/pamslice
bin/pamstack @bin bin/pamstack
bin/pamstereogram @bin bin/pamstereogram
bin/pamstretch @bin bin/pamstretch
bin/pamstretch-gen bin/pamstretch-gen
bin/pamsumm @bin bin/pamsumm
bin/pamsummcol @bin bin/pamsummcol
bin/pamtodjvurle @bin bin/pamtodjvurle
bin/pamtohdiff @bin bin/pamtohdiff
bin/pamtohtmltbl @bin bin/pamtohtmltbl
bin/pamtojpeg2k @bin bin/pamtojpeg2k
bin/pamtopfm @bin bin/pamtopfm
bin/pamtopnm @bin bin/pamtopnm
bin/pamtotga @bin bin/pamtotga
bin/pamtouil @bin bin/pamtouil
bin/pbmclean @bin bin/pbmclean
bin/pbmlife @bin bin/pbmlife
bin/pbmmake @bin bin/pbmmake
bin/pbmmask @bin bin/pbmmask
bin/pbmpage @bin bin/pbmpage
bin/pbmpscale @bin bin/pbmpscale
bin/pbmreduce @bin bin/pbmreduce
bin/pbmtext @bin bin/pbmtext
bin/pbmtextps @bin bin/pbmtextps
bin/pbmto10x @bin bin/pbmto10x
bin/pbmto4425 @bin bin/pbmto4425
bin/pbmtoascii @bin bin/pbmtoascii
bin/pbmtoatk @bin bin/pbmtoatk
bin/pbmtobbnbg @bin bin/pbmtobbnbg
bin/pbmtocmuwm @bin bin/pbmtocmuwm
bin/pbmtodjvurle @bin bin/pbmtodjvurle
bin/pbmtoepsi @bin bin/pbmtoepsi
bin/pbmtoepson @bin bin/pbmtoepson
bin/pbmtoescp2 @bin bin/pbmtoescp2
bin/pbmtog3 @bin bin/pbmtog3
bin/pbmtogem @bin bin/pbmtogem
bin/pbmtogo @bin bin/pbmtogo
bin/pbmtoibm23xx @bin bin/pbmtoibm23xx
bin/pbmtoicon @bin bin/pbmtoicon
bin/pbmtolj @bin bin/pbmtolj
bin/pbmtoln03 @bin bin/pbmtoln03
bin/pbmtolps @bin bin/pbmtolps
bin/pbmtomacp @bin bin/pbmtomacp
bin/pbmtomatrixorbital @bin bin/pbmtomatrixorbital
bin/pbmtomda @bin bin/pbmtomda
bin/pbmtomgr @bin bin/pbmtomgr
bin/pbmtomrf @bin bin/pbmtomrf
bin/pbmtonokia @bin bin/pbmtonokia
bin/pbmtopgm @bin bin/pbmtopgm
bin/pbmtopi3 @bin bin/pbmtopi3
bin/pbmtopk @bin bin/pbmtopk
bin/pbmtoplot @bin bin/pbmtoplot
bin/pbmtoppa @bin bin/pbmtoppa
bin/pbmtopsg3 @bin bin/pbmtopsg3
bin/pbmtoptx @bin bin/pbmtoptx
bin/pbmtowbmp @bin bin/pbmtowbmp
bin/pbmtox10bm @bin bin/pbmtox10bm
bin/pbmtoxbm @bin bin/pbmtoxbm
bin/pbmtoybm @bin bin/pbmtoybm
bin/pbmtozinc @bin bin/pbmtozinc
bin/pbmupc @bin bin/pbmupc
bin/pc1toppm @bin bin/pc1toppm
bin/pcdovtoppm bin/pcdovtoppm
bin/pcxtoppm @bin bin/pcxtoppm
bin/pfmtopam @bin bin/pfmtopam
bin/pgmabel @bin bin/pgmabel
bin/pgmbentley @bin bin/pgmbentley
bin/pgmcrater @bin bin/pgmcrater
bin/pgmedge bin/pgmedge
bin/pgmenhance @bin bin/pgmenhance
bin/pgmhist @bin bin/pgmhist
bin/pgmkernel @bin bin/pgmkernel
bin/pgmminkowski @bin bin/pgmminkowski
bin/pgmmorphconv @bin bin/pgmmorphconv
bin/pgmnoise @bin bin/pgmnoise
bin/pgmnorm bin/pgmnorm
bin/pgmoil bin/pgmoil
bin/pgmramp @bin bin/pgmramp
bin/pgmslice bin/pgmslice
bin/pgmtexture @bin bin/pgmtexture
bin/pgmtofs @bin bin/pgmtofs
bin/pgmtolispm @bin bin/pgmtolispm
bin/pgmtopbm @bin bin/pgmtopbm
bin/pgmtopgm @bin bin/pgmtopgm
bin/pgmtoppm @bin bin/pgmtoppm
bin/pi1toppm @bin bin/pi1toppm
bin/pi3topbm @bin bin/pi3topbm
bin/picttoppm @bin bin/picttoppm
bin/pjtoppm @bin bin/pjtoppm
bin/pktopbm @bin bin/pktopbm
bin/pngtopnm @bin bin/pngtopnm
bin/pnmalias @bin bin/pnmalias
bin/pnmarith bin/pnmarith
bin/pnmcat @bin bin/pnmcat
bin/pnmcolormap @bin bin/pnmcolormap
bin/pnmcomp @bin bin/pnmcomp
bin/pnmconvol @bin bin/pnmconvol
bin/pnmcrop @bin bin/pnmcrop
bin/pnmcut @bin bin/pnmcut
bin/pnmdepth @bin bin/pnmdepth
bin/pnmenlarge bin/pnmenlarge
bin/pnmfile bin/pnmfile
bin/pnmflip bin/pnmflip
bin/pnmgamma @bin bin/pnmgamma
bin/pnmhisteq @bin bin/pnmhisteq
bin/pnmhistmap @bin bin/pnmhistmap
bin/pnmindex bin/pnmindex
bin/pnminterp bin/pnminterp
bin/pnminvert @bin bin/pnminvert
bin/pnmmargin bin/pnmmargin
bin/pnmmontage @bin bin/pnmmontage
bin/pnmnlfilt @bin bin/pnmnlfilt
bin/pnmnoraw bin/pnmnoraw
bin/pnmnorm @bin bin/pnmnorm
bin/pnmpad @bin bin/pnmpad
bin/pnmpaste @bin bin/pnmpaste
bin/pnmpsnr @bin bin/pnmpsnr
bin/pnmquant bin/pnmquant
bin/pnmremap @bin bin/pnmremap
bin/pnmrotate @bin bin/pnmrotate
bin/pnmscale @bin bin/pnmscale
bin/pnmscalefixed @bin bin/pnmscalefixed
bin/pnmshear @bin bin/pnmshear
bin/pnmsmooth @bin bin/pnmsmooth
bin/pnmsplit @bin bin/pnmsplit
bin/pnmstitch @bin bin/pnmstitch
bin/pnmtile @bin bin/pnmtile
bin/pnmtoddif @bin bin/pnmtoddif
bin/pnmtofiasco @bin bin/pnmtofiasco
bin/pnmtofits @bin bin/pnmtofits
bin/pnmtojbig @bin bin/pnmtojbig
bin/pnmtojpeg @bin bin/pnmtojpeg
bin/pnmtopalm @bin bin/pnmtopalm
bin/pnmtopclxl @bin bin/pnmtopclxl
bin/pnmtoplainpnm bin/pnmtoplainpnm
bin/pnmtopng @bin bin/pnmtopng
bin/pnmtopnm @bin bin/pnmtopnm
bin/pnmtops @bin bin/pnmtops
bin/pnmtorast @bin bin/pnmtorast
bin/pnmtorle @bin bin/pnmtorle
bin/pnmtosgi @bin bin/pnmtosgi
bin/pnmtosir @bin bin/pnmtosir
bin/pnmtotiff @bin bin/pnmtotiff
bin/pnmtotiffcmyk @bin bin/pnmtotiffcmyk
bin/pnmtoxwd @bin bin/pnmtoxwd
bin/ppm3d @bin bin/ppm3d
bin/ppmbrighten @bin bin/ppmbrighten
bin/ppmchange @bin bin/ppmchange
bin/ppmcie @bin bin/ppmcie
bin/ppmcolormask @bin bin/ppmcolormask
bin/ppmcolors @bin bin/ppmcolors
bin/ppmdim @bin bin/ppmdim
bin/ppmdist @bin bin/ppmdist
bin/ppmdither @bin bin/ppmdither
bin/ppmfade bin/ppmfade
bin/ppmflash @bin bin/ppmflash
bin/ppmforge @bin bin/ppmforge
bin/ppmglobe @bin bin/ppmglobe
bin/ppmhist @bin bin/ppmhist
bin/ppmlabel @bin bin/ppmlabel
bin/ppmmake @bin bin/ppmmake
bin/ppmmix @bin bin/ppmmix
bin/ppmnorm bin/ppmnorm
bin/ppmntsc @bin bin/ppmntsc
bin/ppmpat @bin bin/ppmpat
bin/ppmquant bin/ppmquant
bin/ppmquantall bin/ppmquantall
bin/ppmrainbow bin/ppmrainbow
bin/ppmrelief @bin bin/ppmrelief
bin/ppmrough @bin bin/ppmrough
bin/ppmshadow bin/ppmshadow
bin/ppmshift @bin bin/ppmshift
bin/ppmspread @bin bin/ppmspread
bin/ppmtoacad @bin bin/ppmtoacad
bin/ppmtoarbtxt @bin bin/ppmtoarbtxt
bin/ppmtobmp @bin bin/ppmtobmp
bin/ppmtoeyuv @bin bin/ppmtoeyuv
bin/ppmtogif @bin bin/ppmtogif
bin/ppmtoicr @bin bin/ppmtoicr
bin/ppmtoilbm @bin bin/ppmtoilbm
bin/ppmtojpeg bin/ppmtojpeg
bin/ppmtoleaf @bin bin/ppmtoleaf
bin/ppmtolj @bin bin/ppmtolj
bin/ppmtomap bin/ppmtomap
bin/ppmtomitsu @bin bin/ppmtomitsu
bin/ppmtompeg @bin bin/ppmtompeg
bin/ppmtoneo @bin bin/ppmtoneo
bin/ppmtopcx @bin bin/ppmtopcx
bin/ppmtopgm @bin bin/ppmtopgm
bin/ppmtopi1 @bin bin/ppmtopi1
bin/ppmtopict @bin bin/ppmtopict
bin/ppmtopj @bin bin/ppmtopj
bin/ppmtopjxl @bin bin/ppmtopjxl
bin/ppmtoppm @bin bin/ppmtoppm
bin/ppmtopuzz @bin bin/ppmtopuzz
bin/ppmtorgb3 @bin bin/ppmtorgb3
bin/ppmtosixel @bin bin/ppmtosixel
bin/ppmtoterm @bin bin/ppmtoterm
bin/ppmtouil bin/ppmtouil
bin/ppmtowinicon @bin bin/ppmtowinicon
bin/ppmtoxpm @bin bin/ppmtoxpm
bin/ppmtoyuv @bin bin/ppmtoyuv
bin/ppmtoyuvsplit @bin bin/ppmtoyuvsplit
bin/ppmtv @bin bin/ppmtv
bin/ppmwheel @bin bin/ppmwheel
bin/psidtopgm @bin bin/psidtopgm
bin/pstopnm @bin bin/pstopnm
bin/qrttoppm @bin bin/qrttoppm
bin/rasttopnm @bin bin/rasttopnm
bin/rawtopgm @bin bin/rawtopgm
bin/rawtoppm @bin bin/rawtoppm
bin/rgb3toppm @bin bin/rgb3toppm
bin/rletopnm @bin bin/rletopnm
bin/sbigtopgm @bin bin/sbigtopgm
bin/sgitopnm @bin bin/sgitopnm
bin/sirtopnm @bin bin/sirtopnm
bin/sldtoppm @bin bin/sldtoppm
bin/spctoppm @bin bin/spctoppm
bin/spottopgm @bin bin/spottopgm
bin/sputoppm @bin bin/sputoppm
bin/tgatoppm @bin bin/tgatoppm
bin/thinkjettopbm @bin bin/thinkjettopbm
bin/tifftopnm @bin bin/tifftopnm
bin/wbmptopbm @bin bin/wbmptopbm
bin/winicontoppm @bin bin/winicontoppm
bin/xbmtopbm @bin bin/xbmtopbm
bin/ximtoppm @bin bin/ximtoppm
bin/xpmtoppm @bin bin/xpmtoppm
bin/xvminitoppm @bin bin/xvminitoppm
bin/xwdtopnm @bin bin/xwdtopnm
bin/ybmtopbm @bin bin/ybmtopbm
bin/yuvsplittoppm @bin bin/yuvsplittoppm
bin/yuvtoppm @bin bin/yuvtoppm
bin/zeisstopnm @bin bin/zeisstopnm
include/bitio.h include/bitio.h
include/colorname.h include/colorname.h
include/mallocvar.h include/mallocvar.h