Revision: 76005
http://sourceforge.net/p/brlcad/code/76005
Author: starseeker
Date: 2020-06-02 20:11:44 +0000 (Tue, 02 Jun 2020)
Log Message:
-----------
Whenever libicv is doing a stdin read, set O_BINARY
Modified Paths:
--------------
brlcad/branches/dm-fb-merge/src/libicv/bw.c
brlcad/branches/dm-fb-merge/src/libicv/dpix.c
brlcad/branches/dm-fb-merge/src/libicv/icv_private.h
brlcad/branches/dm-fb-merge/src/libicv/pix.c
brlcad/branches/dm-fb-merge/src/libicv/png.c
brlcad/branches/dm-fb-merge/src/libicv/ppm.c
brlcad/branches/dm-fb-merge/src/libicv/rot.c
Modified: brlcad/branches/dm-fb-merge/src/libicv/bw.c
===================================================================
--- brlcad/branches/dm-fb-merge/src/libicv/bw.c 2020-06-02 20:11:09 UTC (rev
76004)
+++ brlcad/branches/dm-fb-merge/src/libicv/bw.c 2020-06-02 20:11:44 UTC (rev
76005)
@@ -81,6 +81,7 @@
if (filename==NULL) {
fp = stdin;
+ setmode(fileno(fp), O_BINARY);
} else if ((fp = fopen(filename, "rb")) == NULL) {
bu_log("bw_read: Cannot open %s for reading\n", filename);
return NULL;
Modified: brlcad/branches/dm-fb-merge/src/libicv/dpix.c
===================================================================
--- brlcad/branches/dm-fb-merge/src/libicv/dpix.c 2020-06-02 20:11:09 UTC
(rev 76004)
+++ brlcad/branches/dm-fb-merge/src/libicv/dpix.c 2020-06-02 20:11:44 UTC
(rev 76005)
@@ -97,9 +97,10 @@
width = 512;
}
- if (filename == NULL)
+ if (filename == NULL) {
fd = fileno(stdin);
- else if ((fd = open(filename, O_RDONLY|O_BINARY, WRMODE)) <0) {
+ setmode(fd, O_BINARY);
+ } else if ((fd = open(filename, O_RDONLY|O_BINARY, WRMODE)) <0) {
bu_log("dpix_read : Cannot open file %s for reading\n, ", filename);
return NULL;
}
Modified: brlcad/branches/dm-fb-merge/src/libicv/icv_private.h
===================================================================
--- brlcad/branches/dm-fb-merge/src/libicv/icv_private.h 2020-06-02
20:11:09 UTC (rev 76004)
+++ brlcad/branches/dm-fb-merge/src/libicv/icv_private.h 2020-06-02
20:11:44 UTC (rev 76005)
@@ -20,6 +20,7 @@
#include "common.h"
#include "bu/mime.h"
+#include "bio.h" /* for O_BINARY */
#include "icv.h"
#ifndef ICV_PRIVATE_H
Modified: brlcad/branches/dm-fb-merge/src/libicv/pix.c
===================================================================
--- brlcad/branches/dm-fb-merge/src/libicv/pix.c 2020-06-02 20:11:09 UTC
(rev 76004)
+++ brlcad/branches/dm-fb-merge/src/libicv/pix.c 2020-06-02 20:11:44 UTC
(rev 76005)
@@ -75,6 +75,7 @@
if (filename == NULL) {
fp = stdin;
+ setmode(fileno(fp), O_BINARY);
} else if ((fp = fopen(filename, "rb")) == NULL) {
bu_log("pix_read: Cannot open file for reading\n");
return NULL;
Modified: brlcad/branches/dm-fb-merge/src/libicv/png.c
===================================================================
--- brlcad/branches/dm-fb-merge/src/libicv/png.c 2020-06-02 20:11:09 UTC
(rev 76004)
+++ brlcad/branches/dm-fb-merge/src/libicv/png.c 2020-06-02 20:11:44 UTC
(rev 76005)
@@ -112,6 +112,7 @@
if (filename == NULL) {
fp = stdin;
+ setmode(fileno(fp), O_BINARY);
} else if ((fp = fopen(filename, "rb")) == NULL) {
bu_log("ERROR: Cannot open file for reading\n");
return NULL;
Modified: brlcad/branches/dm-fb-merge/src/libicv/ppm.c
===================================================================
--- brlcad/branches/dm-fb-merge/src/libicv/ppm.c 2020-06-02 20:11:09 UTC
(rev 76004)
+++ brlcad/branches/dm-fb-merge/src/libicv/ppm.c 2020-06-02 20:11:44 UTC
(rev 76005)
@@ -90,6 +90,7 @@
if (filename == NULL) {
fp = stdin;
+ setmode(fileno(fp), O_BINARY);
} else if ((fp = pm_openr(filename)) == NULL) {
bu_log("ERROR: Cannot open file for reading\n");
return NULL;
Modified: brlcad/branches/dm-fb-merge/src/libicv/rot.c
===================================================================
--- brlcad/branches/dm-fb-merge/src/libicv/rot.c 2020-06-02 20:11:09 UTC
(rev 76004)
+++ brlcad/branches/dm-fb-merge/src/libicv/rot.c 2020-06-02 20:11:44 UTC
(rev 76005)
@@ -137,6 +137,7 @@
if (BU_STR_EQUAL(in_file_name, "-")) {
*ifp = stdin;
+ setmode(fileno(fp), O_BINARY);
} else {
*ifp = fopen(in_file_name, "rb");
if (*ifp == NULL) {
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
