Author: spitzak
Date: 2007-11-08 10:10:38 -0800 (Thu, 08 Nov 2007)
New Revision: 5964
Log:
Fixed crash on OS/X
Modified:
trunk/OpenGL/gl_draw.cxx
Modified: trunk/OpenGL/gl_draw.cxx
===================================================================
--- trunk/OpenGL/gl_draw.cxx 2007-10-17 21:07:04 UTC (rev 5963)
+++ trunk/OpenGL/gl_draw.cxx 2007-11-08 18:10:38 UTC (rev 5964)
@@ -104,7 +104,13 @@
int attrib; const char* name = font->name(&attrib);
CFStringRef cfname = CFStringCreateWithCString(0L, name,
kCFStringEncodingASCII);
short cfont;
- GetFNum(CFStringGetPascalStringPtr(cfname,
kCFStringEncodingMacRoman),&cfont);
+ unsigned char buf[BUFSIZ];
+ ConstStringPtr ptr = CFStringGetPascalStringPtr(cfname,
kCFStringEncodingMacRoman);
+ if (!ptr) {
+ CFStringGetPascalString(cfname, buf, BUFSIZ,
kCFStringEncodingMacRoman);
+ ptr = buf;
+ }
+ GetFNum(ptr, &cfont);
CFRelease(cfname);
aglUseFont(aglGetCurrentContext(), cfont,
attrib,(int)current_size_,0,256,listbase);
#else
_______________________________________________
fltk-commit mailing list
[email protected]
http://lists.easysw.com/mailman/listinfo/fltk-commit
