Changeset 14464

Timestamp:

05/14/08 13:22:31 (2 months ago)

Author:

dron

Message:

Restore back the CPLStrtofDelim() and CPLStrtof() functions.

Files:

• trunk/gdal/port/cpl_conv.h (modified) (1 diff)
• trunk/gdal/port/cpl_strtod.cpp (modified) (2 diffs)

trunk/gdal/port/cpl_conv.h

@@ -82 +82 @@
-double CPL_DLL CPLStrtod(const char *, char **);
-double CPL_DLL CPLStrtodDelim(const char *, char **, char);
+float CPL_DLL CPLStrtof(const char *, char **);
+float CPL_DLL CPLStrtofDelim(const char *, char **, char);
-
-/* -------------------------------------------------------------------- */

trunk/gdal/port/cpl_strtod.cpp

@@ -168 +168 @@
-/*  We are implementing a simple method here: copy the input string     */
-/*  into the temporary buffer, replace the specified decimal delimiter  */
-atof()  
+strtod()
-/*  on that buffer.                                                     */
-/* -------------------------------------------------------------------- */
@@ -233 +233 @@
-}
-
+/************************************************************************/
+/*                          CPLStrtofDelim()                            */
+/************************************************************************/
+
+/**
+ * Converts ASCII string to floating point number using specified delimiter.
+ *
+ * This function converts the initial portion of the string pointed to
+ * by nptr to single floating point representation. This function does the
+ * same as standard strtof(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.
+ */
+float CPLStrtofDelim(const char *nptr, char **endptr, char point)
+{
+#if defined(HAVE_STRTOF)
+/* -------------------------------------------------------------------- */
+/*  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 strtof()  */
+/*  on that buffer.                                                     */
+/* -------------------------------------------------------------------- */
+
+    struct lconv *poLconv = localeconv();
+    char        *pszNumber = CPLStrdup( nptr );
+    double      dfValue;
+    int         nError;
+
+    if ( poLconv
+         && poLconv->decimal_point
+         && strlen(poLconv->decimal_point) > 0 )
+    {
+        int     i = 0;
+        char    byPoint = poLconv->decimal_point[0];
+
+        while ( pszNumber[i] )
+        {
+            if ( pszNumber[i] == point )
+            {
+                pszNumber[i] = byPoint;
+                break;
+            }
+            i++;
+        }
+    }
+
+    dfValue = strtof( pszNumber, endptr );
+    nError = errno;
+
+    if ( endptr )
+        *endptr = (char *)nptr + (*endptr - pszNumber);
+
+    CPLFree( pszNumber );
+
+    errno = nError;
+    return dfValue;
+
+#else
+
+    return (float)CPLStrtodDelim(nptr, endptr, point);
+
+#endif /* HAVE_STRTOF */
+}
+
+/************************************************************************/
+/*                             CPLStrtof()                              */
+/************************************************************************/
+
+/**
+ * Converts ASCII string to floating point number.
+ *
+ * This function converts the initial portion of the string pointed to
+ * by nptr to single floating point representation. This function does the
+ * same as standard strtof(3), but does not take locale in account. That
+ * means, the decimal delimiter is always '.' (decimal point). Use
+ * CPLStrtofDelim() function if you want to specify custom delimiter. 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.
+ *
+ * @return Converted value, if any.
+ */
+float CPLStrtof(const char *nptr, char **endptr)
+{
+    return CPLStrtofDelim(nptr, endptr, '.');
+}
-/* END OF FILE */