summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorericm <ericm>2000-05-30 17:51:49 (GMT)
committerericm <ericm>2000-05-30 17:51:49 (GMT)
commit7a1986f3d4266151fd85062f3ac8b7559bcb16f5 (patch)
treeb01067940327f0fea37ad6397d21b899a8387a1d
parent428df956c5529659044a98421a2efd1225e4c7ed (diff)
downloadtk-7a1986f3d4266151fd85062f3ac8b7559bcb16f5.zip
tk-7a1986f3d4266151fd85062f3ac8b7559bcb16f5.tar.gz
tk-7a1986f3d4266151fd85062f3ac8b7559bcb16f5.tar.bz2
* generic/tkImgGIF.c: Changed defines for GIF87a/GIF89a to be
static char arrays with integer initialization, to address EBCIDIC vs. ASCII encoding issues and to handle compilers that don't deal with "\xAB" syntax for specifying hex values in strings.
-rw-r--r--ChangeLog7
-rw-r--r--generic/tkImgGIF.c14
2 files changed, 15 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index be58254..ec628f9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2000-05-30 Eric Melski <ericm@scriptics.com>
+
+ * generic/tkImgGIF.c: Changed defines for GIF87a/GIF89a to be
+ static char arrays with integer initialization, to address EBCIDIC
+ vs. ASCII encoding issues and to handle compilers that don't deal
+ with "\xAB" syntax for specifying hex values in strings.
+
2000-05-28 Jeff Hobbs <hobbs@scriptics.com>
* doc/spinbox.n: (new file) docs for spinbox widget
diff --git a/generic/tkImgGIF.c b/generic/tkImgGIF.c
index 4dc466a..6770f06 100644
--- a/generic/tkImgGIF.c
+++ b/generic/tkImgGIF.c
@@ -29,7 +29,7 @@
* | provided "as is" without express or implied warranty. |
* +-------------------------------------------------------------------+
*
- * RCS: @(#) $Id: tkImgGIF.c,v 1.14 2000/03/30 19:44:41 ericm Exp $
+ * RCS: @(#) $Id: tkImgGIF.c,v 1.15 2000/05/30 17:51:50 ericm Exp $
*/
/*
@@ -72,11 +72,13 @@ typedef struct mFile {
* encoding independant.
*/
-# define GIF87a "\x47\x49\x46\x38\x37\x61" /* ASCII GIF87a */
-# define GIF89a "\x47\x49\x46\x38\x39\x61" /* ASCII GIF89a */
-# define GIF_TERMINATOR 0x3b /* ASCII ; */
-# define GIF_EXTENSION 0x21 /* ASCII ! */
-# define GIF_START 0x2c /* ASCII , */
+static CONST char GIF87a[] =
+ { 0x47, 0x49, 0x46, 0x38, 0x37, 0x61, 0x00 }; /* ASCII GIF87a */
+static CONST char GIF89a[] =
+ { 0x47, 0x49, 0x46, 0x38, 0x39, 0x61, 0x00 }; /* ASCII GIF89a */
+# define GIF_TERMINATOR 0x3b /* ASCII ; */
+# define GIF_EXTENSION 0x21 /* ASCII ! */
+# define GIF_START 0x2c /* ASCII , */
/*
* HACK ALERT!! HACK ALERT!! HACK ALERT!!