gre-ilya/fltk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Solves issue #117, memcmp -> strncmp

Browse Source 
Closes #117.
This commit is contained in:
Greg Ercolano 2020-07-31 07:00:46 -07:00
parent 889acc7d74
commit 7514a73ba7
1 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/drivers/Quartz/Fl_Quartz_Graphics_Driver_font.cxx
View File

@ -618,15 +618,22 @@ void Fl_Quartz_Graphics_Driver::ADD_SUFFIX(draw, _CoreText)(const char *str, int
CFRelease(ctline);
}
// Skip over bold/italic/oblique qualifiers part of PostScript font names
// Example:
// input: '-Regular_Light-Condensed'
// return: '_Light-Condensed'
//
static char *skip(char *p, int& derived)
{
if (memcmp(p, "-BoldItalic", 11) == 0) { p += 11; derived = 3; }
else if (memcmp(p, "-BoldOblique", 12) == 0) { p += 12; derived = 3; }
else if (memcmp(p, "-Bold", 5) == 0) {p += 5; derived = 1; }
else if (memcmp(p, "-Italic", 7) == 0) {p += 7; derived = 2; }
else if (memcmp(p, "-Oblique", 8) == 0) {p += 8; derived = 2; }
else if (memcmp(p, "-Regular", 8) == 0) {p += 8; }
else if (memcmp(p, "-Roman", 6) == 0) {p += 6; }
// 0 5 10
// | | |
if (strncmp(p, "-BoldItalic", 11) == 0) { p += 11; derived = 3; }
else if (strncmp(p, "-BoldOblique", 12) == 0) { p += 12; derived = 3; }
else if (strncmp(p, "-Bold", 5) == 0) { p += 5; derived = 1; }
else if (strncmp(p, "-Italic", 7) == 0) { p += 7; derived = 2; }
else if (strncmp(p, "-Oblique", 8) == 0) { p += 8; derived = 2; }
else if (strncmp(p, "-Regular", 8) == 0) { p += 8; }
else if (strncmp(p, "-Roman", 6) == 0) { p += 6; }
return p;
}