summaryrefslogtreecommitdiffstats
path: root/generic/tkImgBmap.c
diff options
context:
space:
mode:
authorstanton <stanton>1999-04-24 01:50:46 (GMT)
committerstanton <stanton>1999-04-24 01:50:46 (GMT)
commit33b9462f0016ef41b6c303739ad7f53bc697430f (patch)
tree51fa2de010b339d9d837978fb86ce589f42a3d01 /generic/tkImgBmap.c
parent561def0a476b2905df665d317583408e48cb8ff2 (diff)
downloadtk-33b9462f0016ef41b6c303739ad7f53bc697430f.zip
tk-33b9462f0016ef41b6c303739ad7f53bc697430f.tar.gz
tk-33b9462f0016ef41b6c303739ad7f53bc697430f.tar.bz2
merged 8.1.0 changes into mainline
Diffstat (limited to 'generic/tkImgBmap.c')
-rw-r--r--generic/tkImgBmap.c11
1 files changed, 10 insertions, 1 deletions
diff --git a/generic/tkImgBmap.c b/generic/tkImgBmap.c
index 0f23407..514e9f2 100644
--- a/generic/tkImgBmap.c
+++ b/generic/tkImgBmap.c
@@ -10,7 +10,7 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tkImgBmap.c,v 1.8 1999/04/21 21:53:26 rjohnson Exp $
+ * RCS: @(#) $Id: tkImgBmap.c,v 1.9 1999/04/24 01:50:47 stanton Exp $
*/
#include "tkInt.h"
@@ -512,6 +512,15 @@ TkGetBitmapData(interp, string, fileName, widthPtr, heightPtr,
}
return NULL;
}
+
+ if (Tcl_SetChannelOption(interp, pi.chan, "-translation", "binary")
+ != TCL_OK) {
+ return NULL;
+ }
+ if (Tcl_SetChannelOption(interp, pi.chan, "-encoding", "binary")
+ != TCL_OK) {
+ return NULL;
+ }
} else {
pi.chan = NULL;
}