realAscot/kicad-source
1
0
Fork 0
mirror of https://gitlab.com/kicad/code/kicad.git synced 2025-09-14 02:03:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

CSV_WRITER(wxOutputStream& aStream) fix issue with non ASCII7 chars.

Browse Source 
When writing non ASCII7 chars (using UTF8 encoding), the number of bytes to
write is bigger than the number of "chars", so the written lines were
truncated.
This commit is contained in:
jean-pierre charras 2025-05-05 15:55:55 +02:00
parent 8a4496f458
commit 9ede0ef25b
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
common/io/csv.cpp
View File

@ -4,12 +4,12 @@
#include <wx/txtstrm.h>
#include <rapidcsv/rapidcsv.h>
CSV_WRITER::CSV_WRITER( wxOutputStream& aStream ) :
m_stream( aStream ), m_delimiter( wxT( "," ) ), m_quote( wxT( "\"" ) ), m_lineTerminator( wxT( "\n" ) ),
m_stream( aStream ), m_delimiter( wxT( "," ) ),
m_quote( wxT( "\"" ) ), m_lineTerminator( wxT( "\n" ) ),
m_escape( wxEmptyString )
{
}
@ -27,6 +27,7 @@ void CSV_WRITER::WriteLines( const std::vector<std::vector<wxString>>& aRows )
void CSV_WRITER::WriteLine( const std::vector<wxString>& cols )
{
wxString line;
for( size_t i = 0; i < cols.size(); ++i )
{
wxString colVal = cols[i];
@ -35,6 +36,7 @@ void CSV_WRITER::WriteLine( const std::vector<wxString>& cols )
line += m_delimiter;
double test;
if( !colVal.ToDouble( &test ) )
{
bool useEscape = m_escape.size();
@ -53,9 +55,12 @@ void CSV_WRITER::WriteLine( const std::vector<wxString>& cols )
line += colVal;
}
line += m_lineTerminator;
m_stream.Write( line.c_str(), line.length() );
// Always write text on file using UTF8 encoding
std::string utf8str( line.utf8_string() );
m_stream.Write( utf8str.data(), utf8str.length() );
}