merge with upstream 'd99kris' till change-date 26-Jul-2025

Author: panchaBhuta

include/rapidcsv/rapidcsv.h

@@ -13,9 +13,9 @@
  * ***********************************************************************************
  *
  * URL:      https://github.com/d99kris/rapidcsv
- * Version:  8.84
+ * Version:  8.88
  *
- * Copyright (C) 2017-2024 Kristofer Berggren
+ * Copyright (C) 2017-2025 Kristofer Berggren
  * All rights reserved.
  *
  * rapidcsv is distributed under the BSD 3-Clause license, see LICENSE for details.
@@ -54,7 +54,7 @@ typedef SSIZE_T ssize_t;
 #define RAPIDCSV_VERSION_MINOR 0
 #define RAPIDCSV_VERSION_PATCH 8
 
-#define UPSTREAM___RAPIDCSV__VERSION 8.87
+#define UPSTREAM___RAPIDCSV__VERSION 8.88
 
 //  Project path is removed from the __FILE__
 //  Resulting file-path is relative path from project-root-folder.
@@ -1307,24 +1307,17 @@ namespace rapidcsv
         _mIsUtf16 = true;
         _mIsLE = (bom2b == bomU16le);
 
-        std::wifstream wstream;
-        wstream.exceptions(std::wifstream::failbit | std::wifstream::badbit);
-        wstream.open(_mPath, std::ios::binary);
-        if (_mIsLE)
-        {
-          wstream.imbue(std::locale(wstream.getloc(),
-                                    new std::codecvt_utf16<wchar_t, 0x10ffff,
-                                                           static_cast<std::codecvt_mode>(std::consume_header |
-                                                                                          std::little_endian)>));
-        }
-        else
-        {
-          wstream.imbue(std::locale(wstream.getloc(),
-                                    new std::codecvt_utf16<wchar_t, 0x10ffff,
-                                                           std::consume_header>));
-        }
-        std::wstringstream wss;
-        wss << wstream.rdbuf();
+        std::vector<char> buffer(static_cast<size_t>(length));
+        pStream.read(buffer.data(), length);
+
+        const std::codecvt_mode mode = (
+            (_mIsLE) ?
+            (static_cast<std::codecvt_mode>(std::consume_header | std::little_endian)) :
+            (static_cast<std::codecvt_mode>(std::consume_header));
+        std::wstring_convert<std::codecvt_utf16<wchar_t, 0x10ffff, mode>> utf16conv;
+        const std::wstring& utf16 = utf16conv.from_bytes(buffer.data(), buffer.data() + length);
+
+        std::wstringstream wss(utf16);
         std::string utf8 = _toString(wss.str());
         std::stringstream ss(utf8);
         _parseCsv(ss, static_cast<std::streamsize>(utf8.size()));

tests/CMakeLists.txt

@@ -209,6 +209,9 @@ add_unit_test(test097)
 add_unit_test(test098)
 add_unit_test(test099)
 add_unit_test(test100)
+if(HAS_CODECVT)
+  add_unit_test(test101)
+endif()
 
 
 add_unit_test(testView001)

tests/test101.cpp

@@ -0,0 +1,46 @@
+// test101.cpp - read UTF-16 LE stream
+
+#include <rapidcsv.h>
+#include "unittest.h"
+
+int main()
+{
+  int rv = 0;
+
+  const unsigned char u16le[] =
+  {
+    0xff, 0xfe,
+    0x2d, 0x00, 0x2c, 0x00, 0x41, 0x00, 0x2c, 0x00, 0x42, 0x00, 0x2c, 0x00,
+    0x43, 0x00, 0x0a, 0x00, 0x31, 0x00, 0x2c, 0x00, 0x33, 0x00, 0x2c, 0x00,
+    0x39, 0x00, 0x2c, 0x00, 0x38, 0x00, 0x31, 0x00, 0x0a, 0x00, 0x32, 0x00,
+    0x2c, 0x00, 0x34, 0x00, 0x2c, 0x00, 0x31, 0x00, 0x36, 0x00, 0x2c, 0x00,
+    0x32, 0x00, 0x35, 0x00, 0x36, 0x00, 0x0a, 0x00
+  };
+  const unsigned int u16le_len = 58;
+
+  std::string csv(reinterpret_cast<const char*>(u16le), u16le_len);
+  // "-,A,B,C\n"
+  // "1,3,9,81\n"
+  // "2,4,16,256\n"
+
+  try
+  {
+    // stream from string
+    std::istringstream sstream(csv);
+    rapidcsv::Document doc(sstream, rapidcsv::LabelParams(0, 0));
+    unittest::ExpectEqual(int, doc.GetCell<int>(0, 0), 3);
+    unittest::ExpectEqual(int, doc.GetCell<int>(1, 0), 9);
+    unittest::ExpectEqual(int, doc.GetCell<int>(2, 0), 81);
+
+    unittest::ExpectEqual(std::string, doc.GetCell<std::string>("A", "2"), "4");
+    unittest::ExpectEqual(std::string, doc.GetCell<std::string>("B", "2"), "16");
+    unittest::ExpectEqual(std::string, doc.GetCell<std::string>("C", "2"), "256");
+  }
+  catch (const std::exception& ex)
+  {
+    std::cout << ex.what() << std::endl;
+    rv = 1;
+  }
+
+  return rv;
+}