diff options
| author | Matthias Melcher <fltk@matthiasm.com> | 2008-09-10 23:56:49 +0000 |
|---|---|---|
| committer | Matthias Melcher <fltk@matthiasm.com> | 2008-09-10 23:56:49 +0000 |
| commit | b6bde2e4569aa617c8a6af64947c688c624ed7f8 (patch) | |
| tree | 010d15843eb7d4faf7cd1b0cd44d5b9c00462a83 /src/Fl_XPM_Image.cxx | |
| parent | dfb50e85292687561927610e689eb5ab30d0ba26 (diff) | |
Merging the UTF8 patch, consisting of O'ksi'd s original 1.1.6 patch and additions by Ian. PLEASE BE AWARE that the patch in its current incarnation is a regression in many aspects and further work is required before we can announce Unicode support.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@6212 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'src/Fl_XPM_Image.cxx')
| -rw-r--r-- | src/Fl_XPM_Image.cxx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/Fl_XPM_Image.cxx b/src/Fl_XPM_Image.cxx index 31228a32d..09d5c0fbc 100644 --- a/src/Fl_XPM_Image.cxx +++ b/src/Fl_XPM_Image.cxx @@ -36,6 +36,7 @@ #include <FL/Fl_XPM_Image.H> #include <stdio.h> #include <stdlib.h> +#include <FL/fl_utf8.H> #include "flstring.h" @@ -56,7 +57,7 @@ static int hexdigit(int x) { // I - Hex digit... Fl_XPM_Image::Fl_XPM_Image(const char *name) : Fl_Pixmap((char *const*)0) { FILE *f; - if ((f = fopen(name, "rb")) == NULL) return; + if ((f = fl_fopen(name, "rb")) == NULL) return; // read all the c-strings out of the file: char** new_data = new char *[INITIALLINES]; |