Fix issues with text strings in binary format

Author: aacuevas

Source/Plugins/BinaryWriter/NpyFile.cpp

@@ -105,7 +105,7 @@ String NpyType::getTypeString() const
 	switch (type)
 	{
 	case BaseType::CHAR:
-		return "U" + String(length);
+		return "S" + String(length + 1); //account for the null separator
 	case BaseType::INT8:
 		return "<i1";
 	case BaseType::UINT8:

Source/Processors/Channel/MetaData.cpp

@@ -71,7 +71,13 @@ MetaDataDescriptor& MetaDataDescriptor::operator=(const MetaDataDescriptor& othe
 
 MetaDataDescriptor::MetaDataTypes MetaDataDescriptor::getType() const { return m_type; }
 unsigned int MetaDataDescriptor::getLength() const { return m_length; }
-size_t MetaDataDescriptor::getDataSize() const { return m_length*getTypeSize(m_type); }
+size_t MetaDataDescriptor::getDataSize() const 
+{ 
+	if (m_type == CHAR)
+		return m_length*getTypeSize(m_type) + 1; //account for the null-rerminator
+	else
+		return m_length*getTypeSize(m_type);
+}
 String MetaDataDescriptor::getName() const { return m_name; }
 String MetaDataDescriptor::getDescription() const { return m_description; }
 String MetaDataDescriptor::getIdentifier() const { return m_identifier; }
@@ -120,14 +126,14 @@ size_t MetaDataDescriptor::getTypeSize(MetaDataDescriptor::MetaDataTypes type)
 
 //This would be so much easier if VS2012 supported delegating constructors...
 MetaDataValue::MetaDataValue(MetaDataDescriptor::MetaDataTypes t, unsigned int length, const void* d)
-	: m_type(t), m_length(length), m_size(length*MetaDataDescriptor::getTypeSize(t))
+	: m_type(t), m_length(length), m_size(getSize(t, length))
 {	
 	allocSpace();
 	setValue(d);
 }
 
 MetaDataValue::MetaDataValue(MetaDataDescriptor::MetaDataTypes t, unsigned int length) 
-	: m_type(t), m_length(length), m_size(length*MetaDataDescriptor::getTypeSize(t))
+	: m_type(t), m_length(length), m_size(getSize(t, length))
 {
 	allocSpace();
 }
@@ -175,6 +181,14 @@ void MetaDataValue::allocSpace()
 	m_data.calloc(m_size);
 }
 
+size_t MetaDataValue::getSize(MetaDataDescriptor::MetaDataTypes type, unsigned int length)
+{
+	if (type == MetaDataDescriptor::CHAR)
+		return length*MetaDataDescriptor::getTypeSize(type) + 1; //account for the null-rerminator
+	else
+		return length*MetaDataDescriptor::getTypeSize(type);
+}
+
 MetaDataValue::MetaDataValue(const MetaDataValue& v)
 	: ReferenceCountedObject(),
 	m_type(v.m_type), m_length(v.m_length), m_size(v.m_size)

Source/Processors/Channel/MetaData.h

@@ -162,6 +162,7 @@ class PLUGIN_API MetaDataValue
 	MetaDataValue() = delete;
 	void setValue(const void* data);
 	void allocSpace();
+	static size_t getSize(MetaDataDescriptor::MetaDataTypes type, unsigned int length);
 	HeapBlock<char> m_data;
 	MetaDataDescriptor::MetaDataTypes m_type;
 	unsigned int m_length;