fltk
/
fltk
mirror of https://github.com/fltk/fltk.git
1
0
Fork 0
Code Issues Releases Activity
Browse Source

Fix STR #2530 (Mac OS only)-continued. Use 512 blocks of 128 character widths-continued: 

two 256->512 substitutions were missing.


git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@8310 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
pull/49/head
Manolo Gouy 15 years ago
parent
e3a96057c1
commit
37180e08b3
1 changed files with 2 additions and 2 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      src/fl_font_mac.cxx

4
src/fl_font_mac.cxx
Unescape View File

@ -70,7 +70,7 @@ if (fl_mac_os_version >= 0x1050) {//unfortunately, CTFontCreateWithName != NULL
ascent = (short)(CTFontGetAscent(fontref) + 0.5); ascent = (short)(CTFontGetAscent(fontref) + 0.5);
descent = (short)(CTFontGetDescent(fontref) + 0.5); descent = (short)(CTFontGetDescent(fontref) + 0.5);
q_width = w + 0.5; q_width = w + 0.5;
for (int i = 0; i < 256; i++) width[i] = NULL; for (int i = 0; i < 512; i++) width[i] = NULL;
if (!attributes) { if (!attributes) {
static CFNumberRef zero_ref; static CFNumberRef zero_ref;
float zero = 0.; float zero = 0.;
@ -181,7 +181,7 @@ Fl_Font_Descriptor::~Fl_Font_Descriptor() {
#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5 #if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5
if (fl_mac_os_version >= 0x1050) { if (fl_mac_os_version >= 0x1050) {
CFRelease(fontref); CFRelease(fontref);
for (int i = 0; i < 256; i++) { for (int i = 0; i < 512; i++) {
if (width[i]) free(width[i]); if (width[i]) free(width[i]);
} }
} }

Write Preview
Loading…
Cancel
Save