fix python tests

Author: EmilDohne

PhotoshopAPI/src/LayeredFile/LayerTypes/MaskDataMixin.h

@@ -302,7 +302,7 @@ struct MaskMixin
 		if (this->has_mask())
 		{
 			m_MaskData.value()->setCenterX(static_cast<float>(position.x));
-			m_MaskData.value()->setCenterX(static_cast<float>(position.y));
+			m_MaskData.value()->setCenterY(static_cast<float>(position.y));
 		}
 	}
 

python/psapi-test/test_mask_mixin.py

@@ -18,7 +18,7 @@ def test_add_mask(self):
 
         self.assertEqual(layer.mask_width(), npy_load[0].shape[1])
         self.assertEqual(layer.mask_height(), npy_load[0].shape[0])
-        self.assertEqual(layer.mask_position, psapi.geometry.Point2D(0, 0))
+        self.assertEqual(layer.mask_position, psapi.geometry.Point2D(layer.mask_width() / 2, layer.mask_height() / 2))
 
     def test_has_mask(self):
         npy_load = np.load(self.bin_data_path)
@@ -67,10 +67,10 @@ def test_mask_default_color(self):
         layer.mask_relative_to_layer = 0
         self.assertEqual(layer.mask_relative_to_layer, 0)
 
-        with self.assertRaises(ValueError):
+        with self.assertRaises(TypeError):
             layer.mask_default_color = 256
 
-        with self.assertRaises(ValueError):
+        with self.assertRaises(TypeError):
             layer.mask_default_color = -1
 
     def test_mask_density(self):
@@ -83,10 +83,10 @@ def test_mask_density(self):
         layer.mask_density = 0
         self.assertEqual(layer.mask_density, 0)
 
-        with self.assertRaises(ValueError):
+        with self.assertRaises(TypeError):
             layer.mask_density = 256
 
-        with self.assertRaises(ValueError):
+        with self.assertRaises(TypeError):
             layer.mask_density = -1
 
     def test_mask_feather(self):

python/psapi-test/test_smartobjectlayer.py

@@ -100,7 +100,7 @@ def test_get_original_image_data(self):
         """
         file, layer = self._construct_layer_and_file("ImageStackerImage_lowres.png", psapi.enum.LinkedLayerType.data)
 
-        original_data = layer.original_image_data()
+        original_data = layer.get_original_image_data()
         self.assertIn(0, original_data)
         self.assertIn(1, original_data)
         self.assertIn(2, original_data)

python/src/Implementation/ImageLayer.h

@@ -36,8 +36,8 @@ std::shared_ptr<ImageLayer<T>> createImageLayerFromNpArray(
 	int width,
 	int height,
 	const Enum::BlendMode blend_mode,
-	int pos_x,
-	int pos_y,
+	float pos_x,
+	float pos_y,
 	float opacity,
 	const Enum::Compression compression,
 	const Enum::ColorMode color_mode,
@@ -48,10 +48,6 @@ std::shared_ptr<ImageLayer<T>> createImageLayerFromNpArray(
 	typename Layer<T>::Params params;
 	// Do some preliminary checks since python has no concept of e.g. unsigned integers (without ctypes) 
 	// so we must ensure the range ourselves
-	if (layer_name.size() > 255)
-	{
-		throw py::value_error("layer_name parameter cannot exceed a length of 255");
-	}
 	if (layer_mask.has_value())
 	{
 		if (static_cast<uint64_t>(width) * height != layer_mask.value().size())
@@ -79,8 +75,8 @@ std::shared_ptr<ImageLayer<T>> createImageLayerFromNpArray(
 
 	params.name = layer_name;
 	params.blendmode = blend_mode;
-	params.center_x = pos_x;
-	params.center_y = pos_y;
+	params.center_x = static_cast<int32_t>(pos_x);
+	params.center_y = static_cast<int32_t>(pos_y);
 	params.width = width;
 	params.height = height;
 	params.opacity = static_cast<uint8_t>(opacity * 255);
@@ -104,8 +100,8 @@ std::shared_ptr<ImageLayer<T>> createImageLayerFromIDMapping(
 	int width,
 	int height,
 	const Enum::BlendMode blend_mode,
-	int pos_x,
-	int pos_y,
+	float pos_x,
+	float pos_y,
 	float opacity,
 	const Enum::Compression compression,
 	const Enum::ColorMode color_mode,
@@ -116,10 +112,6 @@ std::shared_ptr<ImageLayer<T>> createImageLayerFromIDMapping(
 	typename Layer<T>::Params params;
 	// Do some preliminary checks since python has no concept of e.g. unsigned integers (without ctypes) 
 	// so we must ensure the range ourselves
-	if (layer_name.size() > 255)
-	{
-		throw py::value_error("layer_name parameter cannot exceed a length of 255");
-	}
 	if (layer_mask.has_value())
 	{
 		if (static_cast<uint64_t>(width) * height != layer_mask.value().size())
@@ -150,8 +142,8 @@ std::shared_ptr<ImageLayer<T>> createImageLayerFromIDMapping(
 
 	params.name = layer_name;
 	params.blendmode = blend_mode;
-	params.center_x = pos_x;
-	params.center_y = pos_y;
+	params.center_x = static_cast<int32_t>(pos_x);
+	params.center_y = static_cast<int32_t>(pos_y);
 	params.width = width;
 	params.height = height;
 	params.opacity = static_cast<uint8_t>(opacity * 255);
@@ -175,8 +167,8 @@ std::shared_ptr<ImageLayer<T>> createImageLayerFromIntMapping(
 	int width,
 	int height,
 	const Enum::BlendMode blend_mode,
-	int pos_x,
-	int pos_y,
+	float pos_x,
+	float pos_y,
 	float opacity,
 	const Enum::Compression compression,
 	const Enum::ColorMode color_mode,
@@ -187,10 +179,6 @@ std::shared_ptr<ImageLayer<T>> createImageLayerFromIntMapping(
 	typename Layer<T>::Params params;
 	// Do some preliminary checks since python has no concept of e.g. unsigned integers (without ctypes) 
 	// so we must ensure the range ourselves
-	if (layer_name.size() > 255)
-	{
-		throw py::value_error("layer_name parameter cannot exceed a length of 255");
-	}
 	if (layer_mask.has_value())
 	{
 		if (static_cast<uint64_t>(width) * height != layer_mask.value().size())
@@ -220,8 +208,8 @@ std::shared_ptr<ImageLayer<T>> createImageLayerFromIntMapping(
 
 	params.name = layer_name;
 	params.blendmode = blend_mode;
-	params.center_x = pos_x;
-	params.center_y = pos_y;
+	params.center_x = static_cast<int32_t>(pos_x);
+	params.center_y = static_cast<int32_t>(pos_y);
 	params.width = width;
 	params.height = height;
 	params.opacity = static_cast<uint8_t>(opacity * 255);

python/src/Layers/DeclareImageLayer.h

@@ -160,12 +160,12 @@ void declare_image_layer(py::module& m, const std::string& extension) {
         :param pos_x: 
             Optional, the relative offset of the layer to the center of the document, 0 indicates the layer is centered.
             For group layers this is only relevant for the layer mask and can be left out otherwise
-        :type pos_x: int
+        :type pos_x: float
 
         :param pos_y: 
             Optional, the relative offset of the layer to the center of the document, 0 indicates the layer is centered.
             For group layers this is only relevant for the layer mask and can be left out otherwise
-        :type pos_y: int
+        :type pos_y: float
 
         :param opacity: The opacity of the layer from 0-1. Defaults to 1.0
         :type opacity: float
@@ -251,12 +251,12 @@ void declare_image_layer(py::module& m, const std::string& extension) {
         :param pos_x: 
             Optional, the relative offset of the layer to the center of the document, 0 indicates the layer is centered.
             For group layers this is only relevant for the layer mask and can be left out otherwise
-        :type pos_x: int
+        :type pos_x: float
 
         :param pos_y: 
             Optional, the relative offset of the layer to the center of the document, 0 indicates the layer is centered.
             For group layers this is only relevant for the layer mask and can be left out otherwise
-        :type pos_y: int
+        :type pos_y: float
 
         :param opacity: The opacity of the layer from 0-1. Defaults to 1.0
         :type opacity: float
@@ -342,12 +342,12 @@ void declare_image_layer(py::module& m, const std::string& extension) {
         :param pos_x: 
             Optional, the relative offset of the layer to the center of the document, 0 indicates the layer is centered.
             For group layers this is only relevant for the layer mask and can be left out otherwise
-        :type pos_x: int
+        :type pos_x: float
 
         :param pos_y: 
             Optional, the relative offset of the layer to the center of the document, 0 indicates the layer is centered.
             For group layers this is only relevant for the layer mask and can be left out otherwise
-        :type pos_y: int
+        :type pos_y: float
 
         :param opacity: The opacity of the layer from 0-1. Defaults to 1.0
         :type opacity: float