[mapguide-commits] r5174 - trunk/MgDev/Common/Renderers

[svn_mapguide at osgeo.org]

Author: traianstanev
Date: 2010-09-21 18:31:58 +0000 (Tue, 21 Sep 2010)
New Revision: 5174

Modified:
   trunk/MgDev/Common/Renderers/FontManager.cpp
   trunk/MgDev/Common/Renderers/FontManager.h
Log:
Fixes to my previous submission -- hopefully fix for the Linux build, and also set the sm_init variable to true after initialization. Turned out I was merging more than the expected changes to the code...

Modified: trunk/MgDev/Common/Renderers/FontManager.cpp
===================================================================
--- trunk/MgDev/Common/Renderers/FontManager.cpp	2010-09-21 18:04:09 UTC (rev 5173)
+++ trunk/MgDev/Common/Renderers/FontManager.cpp	2010-09-21 18:31:58 UTC (rev 5174)
@@ -1,5 +1,5 @@
 //
-//  Copyright (C) 2004-2008 by Autodesk, Inc.
+//  Copyright (C) 2004-2010 by Autodesk, Inc.
 //
 //  This library is free software; you can redistribute it and/or
 //  modify it under the terms of version 2.1 of the GNU Lesser
@@ -125,6 +125,8 @@
         {
             sm_manager.init_font_list();
         }
+
+        sm_init = true;
     }
 
     return &sm_manager;
@@ -258,7 +260,9 @@
                 //are we searching for a specific font
                 if (!searchString.empty())
                 {
-                    wstring lowerFileName = ToLower(FindFileData.cFileName);
+                    wstring wFilename; 
+                    UnicodeString::MultiByteToWideChar(entryName.c_str(), wFilename);
+                    wstring lowerFileName = ToLower(wFilename);
 
                     if (!wcsstr(lowerFileName.c_str(), searchString.c_str()))
                         continue;

Modified: trunk/MgDev/Common/Renderers/FontManager.h
===================================================================
--- trunk/MgDev/Common/Renderers/FontManager.h	2010-09-21 18:04:09 UTC (rev 5173)
+++ trunk/MgDev/Common/Renderers/FontManager.h	2010-09-21 18:31:58 UTC (rev 5174)
@@ -1,5 +1,5 @@
 //
-//  Copyright (C) 2004-2008 by Autodesk, Inc.
+//  Copyright (C) 2004-2010 by Autodesk, Inc.
 //
 //  This library is free software; you can redistribute it and/or
 //  modify it under the terms of version 2.1 of the GNU Lesser