diff options
author | giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8> | 2016-05-09 05:12:04 +0000 |
---|---|---|
committer | giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8> | 2016-05-09 05:12:04 +0000 |
commit | ae38293b8fe84689fb9decc2c1b6e54f32057941 (patch) | |
tree | e547f8661f2bdd36e63bfa7e583271ce9a07c6c8 /converter | |
parent | 8a255b09aea1dcc620670631e41cb593655b18f1 (diff) | |
download | netpbm-mirror-ae38293b8fe84689fb9decc2c1b6e54f32057941.tar.gz netpbm-mirror-ae38293b8fe84689fb9decc2c1b6e54f32057941.tar.xz netpbm-mirror-ae38293b8fe84689fb9decc2c1b6e54f32057941.zip |
Release 10.47.61
git-svn-id: http://svn.code.sf.net/p/netpbm/code/super_stable@2774 9d0c8265-081b-0410-96cb-a4ca84ce46f8
Diffstat (limited to 'converter')
-rw-r--r-- | converter/other/Makefile | 2 | ||||
-rw-r--r-- | converter/other/bmptopnm.c | 8 |
2 files changed, 8 insertions, 2 deletions
diff --git a/converter/other/Makefile b/converter/other/Makefile index df084ceb..077db195 100644 --- a/converter/other/Makefile +++ b/converter/other/Makefile @@ -219,7 +219,7 @@ install.bin.local: $(PKGDIR)/bin # Remember that $(SYMLINK) might just be a copy command. # backward compatibility: program used to be named pnmnoraw cd $(PKGDIR)/bin ; \ - $(SYMLINK) pnmtoplainpnm pnmnoraw + $(SYMLINK) pnmtoplainpnm$(EXE) pnmnoraw$(EXE) # backward compatibility: program used to be gemtopbm cd $(PKGDIR)/bin ; \ $(SYMLINK) gemtopnm$(EXE) gemtopbm$(EXE) diff --git a/converter/other/bmptopnm.c b/converter/other/bmptopnm.c index 9a405d70..577944b0 100644 --- a/converter/other/bmptopnm.c +++ b/converter/other/bmptopnm.c @@ -607,9 +607,15 @@ BMPreadinfoheader(FILE * const ifP, readOs2InfoHeader(ifP, headerP); break; case 40: + readWindowsInfoHeader(ifP, cInfoHeaderSize, headerP); + break; case 108: + pm_error("%s: this is a Version 4 Windows BMP; " + "this program knows only Version 1"); + break; case 124: - readWindowsInfoHeader(ifP, cInfoHeaderSize, headerP); + pm_error("%s: this is a Version 5 Windows BMP; " + "this program knows only Version 1"); break; default: pm_error("%s: unknown Info Header size: %u bytes", |