X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fimage_test.cc;h=44d15a8cb2ab18427f79e0d72ab1991548b7e4ca;hb=937b96045830a2326daff83b70b892f2d25244ff;hp=ee4819d6b13998135faf7fd2322874077bd147c6;hpb=d2137ac5db409e686b4d9b3fa567935a5e416d41;p=dcpomatic.git

diff --git a/test/image_test.cc b/test/image_test.cc
index ee4819d6b..44d15a8cb 100644
--- a/test/image_test.cc
+++ b/test/image_test.cc
@@ -181,16 +181,24 @@ read_file (string file)
 
 	boost::shared_ptr<Image> image (new Image (PIX_FMT_RGB24, size, true));
 
+#ifdef DCPOMATIC_IMAGE_MAGICK	
 	using namespace MagickCore;
+#endif	
 	
 	uint8_t* p = image->data()[0];
 	for (int y = 0; y < size.height; ++y) {
 		uint8_t* q = p;
 		for (int x = 0; x < size.width; ++x) {
 			Magick::Color c = magick_image.pixelColor (x, y);
+#ifdef DCPOMATIC_IMAGE_MAGICK			
 			*q++ = c.redQuantum() * 255 / QuantumRange;
 			*q++ = c.greenQuantum() * 255 / QuantumRange;
 			*q++ = c.blueQuantum() * 255 / QuantumRange;
+#else			
+			*q++ = c.redQuantum() * 255 / MaxRGB;
+			*q++ = c.greenQuantum() * 255 / MaxRGB;
+			*q++ = c.blueQuantum() * 255 / MaxRGB;
+#endif			
 		}
 		p += image->stride()[0];
 	}
@@ -202,14 +210,20 @@ static
 void
 write_file (shared_ptr<Image> image, string file)
 {
+#ifdef DCPOMATIC_IMAGE_MAGICK	
 	using namespace MagickCore;
+#endif	
 	
 	Magick::Image magick_image (Magick::Geometry (image->size().width, image->size().height), Magick::Color (0, 0, 0));
 	uint8_t*p = image->data()[0];
 	for (int y = 0; y < image->size().height; ++y) {
 		uint8_t* q = p;
 		for (int x = 0; x < image->size().width; ++x) {
+#ifdef DCPOMATIC_IMAGE_MAGICK
 			Magick::Color c (q[0] * QuantumRange / 256, q[1] * QuantumRange / 256, q[2] * QuantumRange / 256);
+#else			
+			Magick::Color c (q[0] * MaxRGB / 256, q[1] * MaxRGB / 256, q[2] * MaxRGB / 256);
+#endif			
 			magick_image.pixelColor (x, y, c);
 			q += 3;
 		}