Fix bugs in locale and OT feature entry.

Author: paullinnerud

src/cpp/DWriteShapeInternal.cpp

@@ -58,6 +58,16 @@ namespace DWriteShapeInternal
 
 	Font::~Font()
 	{		
+		 // Clear any previous features
+		for (auto& it : features_)
+		{
+			if(it.features != nullptr)
+			{
+			    delete[] it.features; 
+			}
+		}
+		features_.clear();
+
 		SafeRelease(&fontFaceReference_);
 		SafeRelease(&fontFace_);	
 
@@ -111,7 +121,34 @@ namespace DWriteShapeInternal
 	{
 		fontRealized_ = false; 
 
-		features_ = features;
+        // Clear any previous features
+		for (auto& it : features_)
+		{
+			if(it.features != nullptr)
+			{
+			    delete[] it.features; 
+			}
+		}
+		features_.clear();
+
+        // Copy features from client
+		for (auto& it : features)
+		{	
+			DWRITE_TYPOGRAPHIC_FEATURES localFeatures; 		
+			localFeatures.featureCount = it.featureCount; 
+			DWRITE_FONT_FEATURE* pLocalFeatures = new DWRITE_FONT_FEATURE[it.featureCount];
+
+			localFeatures.featureCount = it.featureCount; 
+			for(UINT32 i = 0; i < localFeatures.featureCount; i++ )
+			{
+				pLocalFeatures[i].nameTag = it.features[i].nameTag;
+				pLocalFeatures[i].parameter = it.features[i].parameter;
+			}
+			localFeatures.features = pLocalFeatures; 
+
+            features_.push_back(localFeatures); 
+		}
+
 		featureRangeLengths_ = featureRangeLengths; 
 
 		return S_OK;

src/cpp/DWriteShapeLib.cpp

@@ -162,11 +162,17 @@ void Buffer_::SetLocale(const char* locale)
 
 	std::string str = reinterpret_cast<const char*>(locale);
 	std::wstring_convert<std::codecvt_utf8_utf16<wchar_t>> converter;
-	std::wstring openTypeLocale = converter.from_bytes(str);
+	std::wstring inputLocale = converter.from_bytes(str);
 
-	std::wstring windowsLocale; 
-	if (localeMap_->GetWindowsLocale(openTypeLocale, windowsLocale))
+	std::wstring windowsLocale; 	
+	if (localeMap_->GetWindowsLocale(inputLocale, windowsLocale))
+	{
 		locale_ = windowsLocale; 
+	}
+	else
+	{
+	    locale_ = inputLocale;
+	}	
 }
 
 const char* Buffer_::GetLocale()
@@ -329,7 +335,7 @@ bool  Font_::SetFeatures(uint32_t textLength, const std::vector<hb_feature_t>& f
 
 	// look though features and determine range boundries
 	for (auto& it : features)
-	{
+	{	
 		if (it.start < featureRangeBounderies.size())
 		{
 			featureRangeBounderies[it.start] = true;
@@ -381,7 +387,7 @@ bool  Font_::SetFeatures(uint32_t textLength, const std::vector<hb_feature_t>& f
 			// allocate an array for DWRITE_FONT_FEATURE
 			DWRITE_FONT_FEATURE* pLocalFeatures = new DWRITE_FONT_FEATURE[localFeatures.size()];
 			for (int j = 0; j < localFeatures.size(); j++)
-			{
+			{				
 				pLocalFeatures[j].nameTag = localFeatures[j].nameTag;
 				pLocalFeatures[j].parameter = localFeatures[j].parameter;
 			}
@@ -394,15 +400,15 @@ bool  Font_::SetFeatures(uint32_t textLength, const std::vector<hb_feature_t>& f
 
 			// Calculate featureRangeLengths
 			if (i > 0)
-			{
+			{	           
 				featureRangeLengths.push_back(featureRangeLength);
 				featureRangeLength = 0;
 			}
 		}
 
 		featureRangeLength++;
 	}
-
+   
 	// Final length
 	featureRangeLengths.push_back(featureRangeLength);
 	featureRangeLength = 0;