mirror of https://github.com/fltk/fltk
Fix: Filechooser preview of XML file shows it as a corrupt image (#926)
This commit is contained in:
parent
ad7d1dc1c6
commit
72840ea2c1
|
@ -36,6 +36,7 @@
|
|||
#include <FL/fl_utf8.h>
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
#include "flstring.h"
|
||||
#if defined(HAVE_LIBZ)
|
||||
#include <zlib.h>
|
||||
|
@ -125,7 +126,7 @@ fl_check_images(const char *name, // I - Filename
|
|||
// SVG or SVGZ (gzip'ed SVG)
|
||||
|
||||
#ifdef FLTK_USE_SVG
|
||||
uchar header2[64]; // buffer for decompression
|
||||
uchar header2[300]; // buffer for decompression
|
||||
uchar *buf = header; // original header data
|
||||
int count = headerlen; // original header data size
|
||||
|
||||
|
@ -158,11 +159,18 @@ fl_check_images(const char *name, // I - Filename
|
|||
}
|
||||
|
||||
// Check svg or xml signature
|
||||
|
||||
if ((count >= 5 &&
|
||||
(memcmp(buf, "<?xml", 5) == 0 ||
|
||||
memcmp(buf, "<svg", 4) == 0)))
|
||||
return new Fl_SVG_Image(name);
|
||||
bool found_svg = false;
|
||||
if (memcmp(buf, "<svg", 4) == 0) found_svg = true;
|
||||
else if (memcmp(buf, "<?xml", 5) == 0) {
|
||||
uchar *p = buf;
|
||||
do {
|
||||
if (memcmp(p, "<svg", 4) == 0) {
|
||||
found_svg = true;
|
||||
break;
|
||||
}
|
||||
} while (++p < buf + count - 4);
|
||||
}
|
||||
if (found_svg) return new Fl_SVG_Image(name);
|
||||
#endif // FLTK_USE_SVG
|
||||
|
||||
// unknown image format
|
||||
|
|
|
@ -14,6 +14,7 @@
|
|||
// https://www.fltk.org/bugs.php
|
||||
//
|
||||
|
||||
#include <config.h>
|
||||
#include <FL/platform.H>
|
||||
#include <FL/Fl.H>
|
||||
#include <FL/Fl_Box.H>
|
||||
|
|
Loading…
Reference in New Issue