Author: AlbrechtS
Date: 2008-12-02 03:10:03 -0800 (Tue, 02 Dec 2008)
New Revision: 6535
Log:
Applying a correction requested by Ian:
"The problem is line 237, the "unsigned len" declaration is potentially
crossed by the preceeding goto (line 234) so some compilers don't like
that..."
Tested okay on cygwin with gcc 3.4.4.
Modified:
branches/branch-1.3/src/fl_font_win32.cxx
Modified: branches/branch-1.3/src/fl_font_win32.cxx
===================================================================
--- branches/branch-1.3/src/fl_font_win32.cxx 2008-12-01 21:01:58 UTC (rev
6534)
+++ branches/branch-1.3/src/fl_font_win32.cxx 2008-12-02 11:10:03 UTC (rev
6535)
@@ -225,6 +225,7 @@
GLYPHMETRICS metrics;
int maxw = 0, maxh = 0, dh;
int minx = 0, miny = -999999;
+ unsigned len = 0;
// Have we loaded the GetGlyphIndicesW function yet?
if (have_loaded_GetGlyphIndices == 0) {
@@ -234,7 +235,7 @@
if(!fl_GetGlyphIndices) goto exit_error; // No GetGlyphIndices function, use
fallback mechanism instead
// now convert the string to WCHAR and measure it
- unsigned len = fl_utf8toUtf16(c, n, ext_buff, wc_len);
+ len = fl_utf8toUtf16(c, n, ext_buff, wc_len);
if(len >= wc_len) {
if(ext_buff) {delete [] ext_buff;}
if(gi) {delete [] gi;}
_______________________________________________
fltk-commit mailing list
[email protected]
http://lists.easysw.com/mailman/listinfo/fltk-commit
