Skip to content

Commit d14bf1a

Browse files
committed
BUG: Fix CPR reading EDX data bug
Signed-off-by: Michael Jackson <mike.jackson@bluequartz.net>
1 parent c61a730 commit d14bf1a

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ set(CMAKE_CXX_EXTENSIONS OFF)
1515
set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
1616

1717
# set project's name
18-
project(EbsdLibProj VERSION 1.0.34)
18+
project(EbsdLibProj VERSION 1.0.35)
1919

2020
# ---------- Setup output Directories -------------------------
2121
set(CMAKE_LIBRARY_OUTPUT_DIRECTORY

Source/EbsdLib/IO/HKL/CprReader.cpp

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -618,9 +618,11 @@ std::vector<CrcDataParser> CprReader::createFieldParsers(const std::string& file
618618
auto elementName = getFieldValue<std::string>(ini, "EDX Windows", fieldNameStrm.str());
619619
if(elementName.empty())
620620
{
621-
elementName = "Unknown Field";
621+
fieldNameStrm.str(""); // Clear the stringstream buffer
622+
fieldNameStrm << "Field" << i;
623+
elementName = fieldNameStrm.str();
622624
}
623-
fieldOrder[i].FieldDefinition = {4, elementName, EbsdLib::NumericTypes::Type::Int32};
625+
fieldOrder[i].FieldDefinition = {4, elementName, EbsdLib::NumericTypes::Type::Float};
624626
fieldOrder[i].destinationPtr = nullptr;
625627
fieldOrder[i].readOffset = currentOffset;
626628
currentOffset += 4;

0 commit comments

Comments
 (0)