Changeset 14803 for branches/1.5

Timestamp:

07/03/08 13:44:52 (5 months ago)

Author:

rouault

Message:

Fix compilation problem in CPLStrtodDelim due to absence of localeconv() on WinCE (#2451)

Files:

• branches/1.5/gdal/port/cpl_strtod.cpp (modified) (3 diffs)

branches/1.5/gdal/port/cpl_strtod.cpp

@@ -146 +146 @@
-/************************************************************************/
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-    {
-        int     i = 0;
-        char    byPoint = poLconv->decimal_point[0];
-
-        while ( pszNumber[i] )
@@ -194 +170 @@
-        }
-    }
+#else
+    struct lconv *poLconv = localeconv();
+    if ( poLconv
+         && poLconv->decimal_point
+         && strlen(poLconv->decimal_point) > 0 )
+    {
+        int     i = 0;
+        char    byPoint = poLconv->decimal_point[0];
+
+        if (point != byPoint)
+        {
+            while ( pszNumber[i] )
+            {
+                if ( pszNumber[i] == point )
+                {
+                    pszNumber[i] = byPoint;
+                    break;
+                }
+                i++;
+            }
+        }
+    }
+#endif
+}
+
+
+/**
+ * Converts ASCII string to floating point number using specified delimiter.
+ *
+ * This function converts the initial portion of the string pointed to
+ * by nptr to double floating point representation. This function does the
+ * same as standard strtod(3), but does not take locale in account. Instead of
+ * locale defined decimal delimiter you can specify your own one. Also see
+ * notes for CPLAtof() function.
+ *
+ * @param nptr Pointer to string to convert.
+ * @param endptr If is not NULL, a pointer to the character after the last
+ * character used in the conversion is stored in the location referenced
+ * by endptr.
+ * @param point Decimal delimiter.
+ *
+ * @return Converted value, if any.
+ */
+double CPLStrtodDelim(const char *nptr, char **endptr, char point)
+{
+/* -------------------------------------------------------------------- */
+/*  We are implementing a simple method here: copy the input string     */
+/*  into the temporary buffer, replace the specified decimal delimiter  */
+/*  with the one, taken from locale settings and use standard strtod()  */
+/*  on that buffer.                                                     */
+/* -------------------------------------------------------------------- */
+    char        *pszNumber = CPLStrdup( nptr );
+    double      dfValue;
+    int         nError;
+
+    CPLReplacePointByLocalePoint(pszNumber, point);
-
-    dfValue = strtod( pszNumber, endptr );
@@ -264 +296 @@
-/* -------------------------------------------------------------------- */
-
-    struct lconv *poLconv = localeconv();
-    char        *pszNumber = CPLStrdup( nptr );
-    double      dfValue;
-    int         nError;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-    dfValue = strtof( pszNumber, endptr );