summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CHANGES5
-rw-r--r--src/Fl_XBM_Image.cxx2
2 files changed, 4 insertions, 3 deletions
diff --git a/CHANGES b/CHANGES
index e9cd766ec..c0071a0bf 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,10 +1,11 @@
CHANGES IN FLTK 1.1.7
- - Fixed cross-compiling (host: *-linux-* , target: *-mingw32)
- problem. Patch provided by Amir Shalem <amir@boom.org.il> in (STR #995) .
- Documentation fixes (STR #571, STR #648, STR #692, STR
#730, STR #744, STR #745, STR #931, STR #942, STR #960,
STR #969)
+ - Fixed signednes of scanf argument (STR #996)
+ - Fixed cross-compiling (host: *-linux-* , target: *-mingw32)
+ problem. Patch provided by Amir Shalem <amir@boom.org.il> in (STR #995) .
- FLUID now knows if a static callback is already declared
in a class and won't declare it 'extern' (STR #776)
- Some actions in FLUID would not set the
diff --git a/src/Fl_XBM_Image.cxx b/src/Fl_XBM_Image.cxx
index cd9e390e6..49773bd82 100644
--- a/src/Fl_XBM_Image.cxx
+++ b/src/Fl_XBM_Image.cxx
@@ -88,7 +88,7 @@ Fl_XBM_Image::Fl_XBM_Image(const char *name) : Fl_Bitmap((const char *)0,0,0) {
}
const char *a = buffer;
while (*a && i<n) {
- int t;
+ unsigned int t;
if (sscanf(a," 0x%x",&t)>0) {
*ptr++ = (uchar)t;
i ++;