kindred/create
1
1
Fork 0
Code Issues 37 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

Change C++ DXF import to ignore type 999 (comment) records

Browse Source
This commit is contained in:
Kevin Martin
2024-09-08 00:22:16 -04:00
committed by Yorik van Havre
parent 8636c8ca20
commit 4bc8cd60e9
2 changed files with 22 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
src/Mod/Import/App/dxf/dxf.cpp
View File

@@ -2357,26 +2357,29 @@ bool CDxfRead::get_next_record()
return m_not_eof;
}
if ((*m_ifs).eof()) {
m_not_eof = false;
return false;
}
do {
if ((*m_ifs).eof()) {
m_not_eof = false;
return false;
}
std::getline(*m_ifs, m_record_data);
++m_line;
int temp = 0;
if (!ParseValue<int>(this, &temp)) {
ImportError("CDxfRead::get_next_record() Failed to get integer record type from '%s'\n",
m_record_data);
return false;
}
m_record_type = (eDXFGroupCode_t)temp;
if ((*m_ifs).eof()) {
return false;
}
std::getline(*m_ifs, m_record_data);
++m_line;
int temp = 0;
if (!ParseValue<int>(this, &temp)) {
ImportError("CDxfRead::get_next_record() Failed to get integer record type from '%s'\n",
m_record_data);
return false;
}
m_record_type = (eDXFGroupCode_t)temp;
if ((*m_ifs).eof()) {
return false;
}
std::getline(*m_ifs, m_record_data);
++m_line;
} while (m_record_type == eComment);
std::getline(*m_ifs, m_record_data);
++m_line;
// Remove any carriage return at the end of m_str which may occur because of inconsistent
// handling of LF vs. CRLF line termination.
auto last = m_record_data.rbegin();