From b7a579c06c6a15c8dcfe3327bd7f082032d6a753 Mon Sep 17 00:00:00 2001 From: scuri Date: Thu, 29 Jul 2010 23:26:26 +0000 Subject: *** empty log message *** --- html/en/history.html | 5 ++++- src/cd_text.c | 6 +++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/html/en/history.html b/html/en/history.html index 698c416..25c702f 100644 --- a/html/en/history.html +++ b/html/en/history.html @@ -27,11 +27,14 @@

History of Changes

CVS (14/July/2010)

CVS (29/July/2010)

Fixed: CD_GL static library for Visual C++ compilers were incorrectly using FTGL as dynamic library.
+ Fixed: CD_QUERY in + cdCanvasNativeFont.

Version 5.4 (24/June/2010)

diff --git a/src/cd_text.c b/src/cd_text.c index 32b0645..3a9eaa1 100644 --- a/src/cd_text.c +++ b/src/cd_text.c @@ -292,9 +292,6 @@ char* cdCanvasNativeFont(cdCanvas* canvas, const char* font) strcpy(native_font, canvas->native_font); - if (!font || font[0] == 0) - return native_font; - if (font == (char*)CD_QUERY) { char style[200] = " "; @@ -311,6 +308,9 @@ char* cdCanvasNativeFont(cdCanvas* canvas, const char* font) return native_font; } + if (!font || font[0] == 0) + return native_font; + if (canvas->cxNativeFont) { if (canvas->cxNativeFont(canvas->ctxcanvas, font)) -- cgit v1.2.3