about summary refs log tree commit diff
path: root/converter/other
diff options
context:
space:
mode:
Diffstat (limited to 'converter/other')
-rw-r--r--converter/other/Makefile2
-rw-r--r--converter/other/bmptopnm.c8
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",