Reverse hb tag axis tags for DWrite

paullinnerud · paullinnerud · commit 8b738ee03ecc · 2021-07-23T16:14:03.000-07:00
diff --git a/setup.py b/setup.py
@@ -35,7 +35,7 @@
 
 setup(
     name="dwriteshapepy", 
-    version= '1.0.3',
+    version= '1.0.4',
     description="Python extension for Windows DirectWrite shaping, modeled after uharfbuzz ",
     long_description=long_description,
     long_description_content_type='text/markdown',
diff --git a/src/cpp/DWriteShapeLib.cpp b/src/cpp/DWriteShapeLib.cpp
@@ -304,7 +304,8 @@ bool Font_::SetVariations(const std::vector<hb_variation_t> &axisValues)
 	for (auto& it : axisValues)
 	{
 		DWRITE_FONT_AXIS_VALUE value;
-		value.axisTag = static_cast<DWRITE_FONT_AXIS_TAG>(it.tag);
+		// DWrite tags are opposite HarfBuzz tags
+		value.axisTag = static_cast<DWRITE_FONT_AXIS_TAG>(SWAPL(it.tag));
 		value.value =  it.value;
 		dWriteAxisValues.push_back(value); 
 	}

Original file line number	Diff line number	Diff line change
`@@ -304,7 +304,8 @@ bool Font_::SetVariations(const std::vector<hb_variation_t> &axisValues)`
`304`	`304`	`for (auto& it : axisValues)`
`305`	`305`	`{`
`306`	`306`	`DWRITE_FONT_AXIS_VALUE value;`
`307`		`- value.axisTag = static_cast<DWRITE_FONT_AXIS_TAG>(it.tag);`
	`307`	`+ // DWrite tags are opposite HarfBuzz tags`
	`308`	`+ value.axisTag = static_cast<DWRITE_FONT_AXIS_TAG>(SWAPL(it.tag));`
`308`	`309`	`value.value = it.value;`
`309`	`310`	`dWriteAxisValues.push_back(value);`
`310`	`311`	`}`