Prepare release.

CHANGELOG.txt

@@ -1,5 +1,8 @@
 CHANGE LOG: Zinc Library
 
+v4.1.2
+Fix bug with loading images with that have a depth that are not integrals of a byte.
+
 v4.1.1
 Fix empty classifiers for Python packaging.
 Drop support for OS X Mountain Lion and below (last released 2015).

CMakeLists.txt

@@ -25,7 +25,7 @@ if(POLICY CMP0086)
 endif()
 
 # This is the project name and shows up in IDEs
-project(Zinc VERSION 4.1.1 LANGUAGES C CXX)
+project(Zinc VERSION 4.1.2 LANGUAGES C CXX)
 
 # Set this to the development release or release candidate version.
 set(Zinc_DEVELOPER_VERSION "")

src/general/image_utilities.cpp

@@ -5642,7 +5642,7 @@ Extracts parameters from <magick_image> that matter for a Cmgui_image
 				*number_of_components = 3;
 			}
 		}
-		*number_of_bytes_per_component = magick_image->depth/8;
+        *number_of_bytes_per_component = (magick_image->depth + 7) / 8;
 		DestroyExceptionInfo(magick_exception);
 		return_code = 1;
 	}

tests/image/image.cpp

@@ -73,19 +73,38 @@ TEST(cmzn_fieldmodule_create_image, read_png)
 
 TEST(ZincFieldImage, read_png)
 {
-	ZincTestSetupCpp zinc;
+    ZincTestSetupCpp zinc;
 
-	FieldImage im = zinc.fm.createFieldImage();
-	EXPECT_TRUE(im.isValid());
+    FieldImage im = zinc.fm.createFieldImage();
+    EXPECT_TRUE(im.isValid());
 
-	StreaminformationImage si = im.createStreaminformationImage();
-	EXPECT_TRUE(si.isValid());
+    StreaminformationImage si = im.createStreaminformationImage();
+    EXPECT_TRUE(si.isValid());
 
     std::string resource = resourcePath("image-1.png");
     Streamresource sr = si.createStreamresourceFile(resource.c_str());
-	EXPECT_TRUE(sr.isValid());
+    EXPECT_TRUE(sr.isValid());
+
+    EXPECT_EQ(CMZN_OK, im.read(si));
+}
+
+TEST(ZincFieldImage, read_png_1_bit_depth)
+{
+    ZincTestSetupCpp zinc;
+
+    FieldImage im = zinc.fm.createFieldImage();
+    EXPECT_TRUE(im.isValid());
+
+    StreaminformationImage si = im.createStreaminformationImage();
+    EXPECT_TRUE(si.isValid());
+
+    std::string resource = resourcePath("AWA015_PTA_1_test.png");
+    Streamresource sr = si.createStreamresourceFile(resource.c_str());
+    EXPECT_TRUE(sr.isValid());
+
+    EXPECT_EQ(CMZN_OK, im.read(si));
 
-	EXPECT_EQ(CMZN_OK, im.read(si));
+    EXPECT_EQ(8, im.getNumberOfBitsPerComponent());
 }
 
 TEST(ZincFieldImage, set_get_buffer)
@@ -106,7 +125,7 @@ TEST(ZincFieldImage, set_get_buffer)
 	int myArray[3] = {4,3,2};
 	EXPECT_EQ(CMZN_OK, im.setSizeInPixels(3, myArray));
 
-	unsigned int actualSize = 4 *3 * 2 * 2;
+    unsigned int actualSize = 4 * 3 * 2 * 2;
 	unsigned char *buffer = new unsigned char[actualSize];
 	for (unsigned int i = 0; i < actualSize; i++)
 	{