[mapserver-commits] r7417 - trunk/mapserver

[svn at osgeo.org]

Author: dmorissette
Date: 2008-02-27 15:58:26 -0500 (Wed, 27 Feb 2008)
New Revision: 7417

Modified:
   trunk/mapserver/mapstring.c
Log:
Make msGetEncodedString() work with UTF-8 even without Iconv support (#2529)

Modified: trunk/mapserver/mapstring.c
===================================================================
--- trunk/mapserver/mapstring.c	2008-02-27 20:57:58 UTC (rev 7416)
+++ trunk/mapserver/mapstring.c	2008-02-27 20:58:26 UTC (rev 7417)
@@ -1113,6 +1113,9 @@
 
   return out;
 #else
+  if (*string == '\0' || (encoding && strcasecmp(encoding, "UTF-8")==0))
+      return strdup(string);    /* Nothing to do: string already in UTF-8 */
+
   msSetError(MS_MISCERR, "Not implemeted since Iconv is not enabled.", "msGetEncodedString()");
   return NULL;
 #endif