X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fyoink;a=blobdiff_plain;f=src%2Fstlplus%2Fstrings%2Fstring_float.cpp;h=8ef2a94cf03fe534dfb15b764009fe470c100979;hp=0de056f25a192bcd9ea0f23e98c30fbae91bf64a;hb=5846afb00833cc72fe72422ca896d2387c712cb4;hpb=a97500609dc3c1b11f9786d32bc458eb00de4c36

diff --git a/src/stlplus/strings/string_float.cpp b/src/stlplus/strings/string_float.cpp
index 0de056f..8ef2a94 100644
--- a/src/stlplus/strings/string_float.cpp
+++ b/src/stlplus/strings/string_float.cpp
@@ -1,96 +1,96 @@
-////////////////////////////////////////////////////////////////////////////////
-
-//   Author:    Andy Rushton
-//   Copyright: (c) Southampton University 1999-2004
-//              (c) Andy Rushton           2004-2009
-//   License:   BSD License, see ../docs/license.html
-
-////////////////////////////////////////////////////////////////////////////////
-#include "string_float.hpp"
-#include <stdlib.h>
-#include <ctype.h>
-#include <stdarg.h>
-#include <stdio.h>
-
-namespace stlplus
-{
-
-  // added as a local copy to break the dependency on the portability library
-  static std::string local_dformat(const char* format, ...) throw(std::invalid_argument)
-  {
-    std::string formatted;
-    va_list args;
-    va_start(args, format);
-#ifdef MSWINDOWS
-    int length = 0;
-    char* buffer = 0;
-    for(int buffer_length = 256; ; buffer_length*=2)
-    {
-      buffer = (char*)malloc(buffer_length);
-      if (!buffer) throw std::invalid_argument("string_float");
-      length = _vsnprintf(buffer, buffer_length-1, format, args);
-      if (length >= 0)
-      {
-        buffer[length] = 0;
-        formatted += std::string(buffer);
-        free(buffer);
-        break;
-      }
-      free(buffer);
-    }
-#else
-    char* buffer = 0;
-    int length = vasprintf(&buffer, format, args);
-    if (!buffer) throw std::invalid_argument("string_float");
-    if (length >= 0)
-      formatted += std::string(buffer);
-    free(buffer);
-#endif
-    va_end(args);
-    if (length < 0) throw std::invalid_argument("string_float");
-    return formatted;
-  }
-
-  ////////////////////////////////////////////////////////////////////////////////
-  // floating-point types
-
-  std::string float_to_string(float f, real_display_t display, unsigned width, unsigned precision)
-    throw(std::invalid_argument)
-  {
-    return double_to_string((double)f, display, width, precision);
-  }
-
-  std::string double_to_string(double f, real_display_t display, unsigned width, unsigned precision)
-    throw(std::invalid_argument)
-  {
-    switch(display)
-    {
-    case display_fixed:
-      return local_dformat("%*.*f", width, precision, f);
-    case display_floating:
-      return local_dformat("%*.*e", width, precision, f);
-    case display_mixed:
-      return local_dformat("%*.*g", width, precision, f);
-    default:
-      throw std::invalid_argument("invalid radix display value");
-    }
-  }
-
-  ////////////////////////////////////////////////////////////////////////////////
-
-  float string_to_float(const std::string& value)
-    throw(std::invalid_argument)
-  {
-    return (float)string_to_double(value);
-  }
-
-  double string_to_double(const std::string& value)
-    throw(std::invalid_argument)
-  {
-    // TODO - error checking
-    return strtod(value.c_str(), 0);
-  }
-
-  ////////////////////////////////////////////////////////////////////////////////
-
-} // end namespace stlplus
+////////////////////////////////////////////////////////////////////////////////
+
+//   Author:    Andy Rushton
+//   Copyright: (c) Southampton University 1999-2004
+//              (c) Andy Rushton           2004-2009
+//   License:   BSD License, see ../docs/license.html
+
+////////////////////////////////////////////////////////////////////////////////
+#include "string_float.hpp"
+#include <stdlib.h>
+#include <ctype.h>
+#include <stdarg.h>
+#include <stdio.h>
+
+namespace stlplus
+{
+
+  // added as a local copy to break the dependency on the portability library
+  static std::string local_dformat(const char* format, ...) throw(std::invalid_argument)
+  {
+    std::string formatted;
+    va_list args;
+    va_start(args, format);
+#ifdef MSWINDOWS
+    int length = 0;
+    char* buffer = 0;
+    for(int buffer_length = 256; ; buffer_length*=2)
+    {
+      buffer = (char*)malloc(buffer_length);
+      if (!buffer) throw std::invalid_argument("string_float");
+      length = _vsnprintf(buffer, buffer_length-1, format, args);
+      if (length >= 0)
+      {
+        buffer[length] = 0;
+        formatted += std::string(buffer);
+        free(buffer);
+        break;
+      }
+      free(buffer);
+    }
+#else
+    char* buffer = 0;
+    int length = vasprintf(&buffer, format, args);
+    if (!buffer) throw std::invalid_argument("string_float");
+    if (length >= 0)
+      formatted += std::string(buffer);
+    free(buffer);
+#endif
+    va_end(args);
+    if (length < 0) throw std::invalid_argument("string_float");
+    return formatted;
+  }
+
+  ////////////////////////////////////////////////////////////////////////////////
+  // floating-point types
+
+  std::string float_to_string(float f, real_display_t display, unsigned width, unsigned precision)
+    throw(std::invalid_argument)
+  {
+    return double_to_string((double)f, display, width, precision);
+  }
+
+  std::string double_to_string(double f, real_display_t display, unsigned width, unsigned precision)
+    throw(std::invalid_argument)
+  {
+    switch(display)
+    {
+    case display_fixed:
+      return local_dformat("%*.*f", width, precision, f);
+    case display_floating:
+      return local_dformat("%*.*e", width, precision, f);
+    case display_mixed:
+      return local_dformat("%*.*g", width, precision, f);
+    default:
+      throw std::invalid_argument("invalid radix display value");
+    }
+  }
+
+  ////////////////////////////////////////////////////////////////////////////////
+
+  float string_to_float(const std::string& value)
+    throw(std::invalid_argument)
+  {
+    return (float)string_to_double(value);
+  }
+
+  double string_to_double(const std::string& value)
+    throw(std::invalid_argument)
+  {
+    // TODO - error checking
+    return strtod(value.c_str(), 0);
+  }
+
+  ////////////////////////////////////////////////////////////////////////////////
+
+} // end namespace stlplus