stdin/stdout has to be binary mode, fixes #341

src/image/image-pam.cpp

@@ -2,6 +2,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <stdint.h>
+#include <unistd.h>
 
 #include "image.hpp"
 #include "image-pam.hpp"
@@ -103,9 +104,8 @@ bool image_save_pam(const char *filename, const Image& image)
 {
     if (image.numPlanes() < 4) return image_save_pnm(filename, image);
     FILE *fp = NULL;
-    if (!strcmp(filename,"-")) fp = stdout;
+    if (!strcmp(filename,"-")) fp = fdopen(dup(fileno(stdout)), "wb"); // make sure it is in binary mode (needed in Windows)
     else fp = fopen(filename,"wb");
-
     if (!fp) {
         return false;
     }
@@ -173,7 +173,7 @@ bool image_save_pam(const char *filename, const Image& image)
             }
         }
 
-    if (fp != stdout) fclose(fp);
+//    if (fp != stdout) fclose(fp);
     if (image.get_metadata("iCCP")) {
         v_printf(1,"Warning: input image has color profile, which cannot be stored in output image format.\n");
     }

src/image/image-pnm.cpp

@@ -2,6 +2,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <stdint.h>
+#include <unistd.h>
 
 #include "image.hpp"
 #include "image-pnm.hpp"
@@ -28,7 +29,7 @@ unsigned int read_pnm_int(FILE *fp, char* buf, char** t) {
 
 bool image_load_pnm(const char *filename, Image& image) {
     FILE *fp = NULL;
-    if (!strcmp(filename,"-")) fp = stdin;
+    if (!strcmp(filename,"-")) fp = fdopen(dup(fileno(stdin)), "rb"); // make sure it is in binary mode (needed in Windows)
     else fp = fopen(filename,"rb");
 
     char buf[PPMREADBUFLEN], *t;
@@ -107,15 +108,15 @@ bool image_load_pnm(const char *filename, Image& image) {
         }
       }
     }
-    if (fp != stdin) fclose(fp);
+//    if (fp != stdin) fclose(fp);
     return true;
 }
 #endif
 
 bool image_save_pnm(const char *filename, const Image& image)
 {
     FILE *fp = NULL;
-    if (!strcmp(filename,"-")) fp = stdout;
+    if (!strcmp(filename,"-")) fp = fdopen(dup(fileno(stdout)), "wb"); // make sure it is in binary mode (needed in Windows)
     else fp = fopen(filename,"wb");
     if (!fp) {
         return false;
@@ -166,7 +167,7 @@ bool image_save_pnm(const char *filename, const Image& image)
         fclose(fp);
         return false;
     }
-    if (fp != stdout) fclose(fp);
+//    if (fp != stdout) fclose(fp);
     if (image.get_metadata("iCCP")) {
         v_printf(1,"Warning: input image has color profile, which cannot be stored in output image format.\n");
     }