diff options
| author | giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8> | 2016-05-09 05:10:44 +0000 |
|---|---|---|
| committer | giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8> | 2016-05-09 05:10:44 +0000 |
| commit | 8b7a3351ed7e6c1784e59a65790b7e7ec1e9a5bc (patch) | |
| tree | 1006893768e34cd79077fa74e576c346f963515c /converter | |
| parent | 3bb2edc4c1563f23e5e2922095eb8d6705e499d1 (diff) | |
| download | netpbm-mirror-8b7a3351ed7e6c1784e59a65790b7e7ec1e9a5bc.tar.gz netpbm-mirror-8b7a3351ed7e6c1784e59a65790b7e7ec1e9a5bc.tar.xz netpbm-mirror-8b7a3351ed7e6c1784e59a65790b7e7ec1e9a5bc.zip | |
Release 10.74.03
git-svn-id: http://svn.code.sf.net/p/netpbm/code/advanced@2772 9d0c8265-081b-0410-96cb-a4ca84ce46f8
Diffstat (limited to 'converter')
| -rw-r--r-- | converter/other/Makefile | 2 | ||||
| -rw-r--r-- | converter/other/bmptopnm.c | 8 | ||||
| -rw-r--r-- | converter/other/cameratopam/identify.c | 2 |
3 files changed, 9 insertions, 3 deletions
diff --git a/converter/other/Makefile b/converter/other/Makefile index f51a780b..6a3d14ed 100644 --- a/converter/other/Makefile +++ b/converter/other/Makefile @@ -254,7 +254,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 a069092f..bb49f4a4 100644 --- a/converter/other/bmptopnm.c +++ b/converter/other/bmptopnm.c @@ -623,9 +623,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", diff --git a/converter/other/cameratopam/identify.c b/converter/other/cameratopam/identify.c index 394ba0a7..02208be6 100644 --- a/converter/other/cameratopam/identify.c +++ b/converter/other/cameratopam/identify.c @@ -250,7 +250,7 @@ adobeCoeff(const char * const make, if (strneq(name, entryP->prefix, strlen(entryP->prefix))) { unsigned int j; for (j = 0; j < 12; ++j) - cm[j/4][j%4] = entryP->trans[j]; + cm[j/3][j%3] = entryP->trans[j]; dng_coeff(cc, cm, xyz); break; |