diff options
| author | scuri <scuri> | 2010-07-29 23:26:26 +0000 |
|---|---|---|
| committer | scuri <scuri> | 2010-07-29 23:26:26 +0000 |
| commit | b7a579c06c6a15c8dcfe3327bd7f082032d6a753 (patch) | |
| tree | 43040b978ee22b30e4b183e2eca7c5454174d0b7 | |
| parent | b3fee819aa5a7123c43ad37d25c806d9d84e1760 (diff) | |
*** empty log message ***
| -rw-r--r-- | html/en/history.html | 5 | ||||
| -rw-r--r-- | 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 @@ <body> <h2>History of Changes</h2> -<h3>CVS (14/July/2010)</h3> +<h3>CVS (29/July/2010)</h3> <ul> <li> <span class="hist_fixed">Fixed:</span> CD_GL static library for Visual C++ compilers were incorrectly using FTGL as dynamic library.</li> + <li> + <span class="hist_fixed">Fixed:</span> CD_QUERY in <strong> + cdCanvasNativeFont</strong>.</li> </ul> <h3><a href="http://sourceforge.net/projects/canvasdraw/files/5.4/">Version 5.4</a> (24/June/2010)</h3> <ul> 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)) |