diff options
| author | Matthias Melcher <fltk@matthiasm.com> | 2010-11-18 20:00:01 +0000 |
|---|---|---|
| committer | Matthias Melcher <fltk@matthiasm.com> | 2010-11-18 20:00:01 +0000 |
| commit | 1e77c19688a76f96813d76b68323a6030aed8230 (patch) | |
| tree | d0c9c7b2099059a5846ce49a61dec3fcb524e764 /src | |
| parent | 983a0d8ce4f835c5714052171307ca29c402b015 (diff) | |
Fixed file access code to use UTF-8 strings (STR #2440)
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@7874 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'src')
| -rw-r--r-- | src/Fl_BMP_Image.cxx | 3 | ||||
| -rw-r--r-- | src/Fl_File_Icon2.cxx | 2 | ||||
| -rw-r--r-- | src/Fl_JPEG_Image.cxx | 3 |
3 files changed, 5 insertions, 3 deletions
diff --git a/src/Fl_BMP_Image.cxx b/src/Fl_BMP_Image.cxx index 2b8693264..845f489b9 100644 --- a/src/Fl_BMP_Image.cxx +++ b/src/Fl_BMP_Image.cxx @@ -35,6 +35,7 @@ // #include <FL/Fl_BMP_Image.H> +#include <FL/fl_utf8.h> #include <config.h> #include <stdio.h> #include <stdlib.h> @@ -93,7 +94,7 @@ Fl_BMP_Image::Fl_BMP_Image(const char *bmp) // I - File to read // Open the file... - if ((fp = fopen(bmp, "rb")) == NULL) return; + if ((fp = fl_fopen(bmp, "rb")) == NULL) return; // Get the header... byte = (uchar)getc(fp); // Check "BM" sync chars diff --git a/src/Fl_File_Icon2.cxx b/src/Fl_File_Icon2.cxx index 410d8b91f..b5288a6b2 100644 --- a/src/Fl_File_Icon2.cxx +++ b/src/Fl_File_Icon2.cxx @@ -853,7 +853,7 @@ load_kde_mimelnk(const char *filename, // I - mimelnk filename pattern[0] = '\0'; iconfilename[0] = '\0'; - if ((fp = fopen(filename, "rb")) != NULL) { + if ((fp = fl_fopen(filename, "rb")) != NULL) { while (fgets(tmp, sizeof(tmp), fp)) { if ((val = get_kde_val(tmp, "Icon")) != NULL) strlcpy(iconfilename, val, sizeof(iconfilename)); diff --git a/src/Fl_JPEG_Image.cxx b/src/Fl_JPEG_Image.cxx index 054027b81..be5c23159 100644 --- a/src/Fl_JPEG_Image.cxx +++ b/src/Fl_JPEG_Image.cxx @@ -35,6 +35,7 @@ // #include <FL/Fl_JPEG_Image.H> +#include <FL/fl_utf8.h> #include <config.h> #include <stdio.h> #include <stdlib.h> @@ -117,7 +118,7 @@ Fl_JPEG_Image::Fl_JPEG_Image(const char *filename) // I - File to load array = (uchar *)0; // Open the image file... - if ((fp = fopen(filename, "rb")) == NULL) return; + if ((fp = fl_fopen(filename, "rb")) == NULL) return; // Setup the decompressor info and read the header... dinfo.err = jpeg_std_error((jpeg_error_mgr *)&jerr); |