mirrors/fltk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove duplicate BOM check (#247)

Browse Source 
Sorry for the noise, this was a "merge error".

Also, fix a typo.
This commit is contained in:
Albrecht Schlosser 2021-07-04 16:13:09 +02:00
parent 2e9d13c1a2
commit 1008cdfab2
1 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/fl_images_core.cxx
View File

@ -138,16 +138,10 @@ fl_check_images(const char *name, // I - Filename
}
} // gzip'ed data
# endif // HAVE_LIBZ
// check for presence of Byte Order Mark (BOM)
char utf8[4];
int lutf8 = fl_utf8encode(0xFEFF /* BOM in Unicode */, utf8);
if (memcmp(buf, utf8, lutf8) == 0) {
buf += lutf8; count -= lutf8;
}
// Check if we have a UTF-8 BOM in the first three bytes (issue #247).
// If yes we need at least 5 more bytes to recognize the signature.
// Note: BOM (Byte Order Marker) in UTF-8 is not recommended but allowed.
// Note: BOM (Byte Order Mark) in UTF-8 is not recommended but allowed.
if (count >= 8) {
const uchar bom[3] = { 0xef, 0xbb, 0xbf };