summaryrefslogtreecommitdiff
path: root/Magick++
diff options
context:
space:
mode:
authorCristy <urban-warrior@imagemagick.org>2019-08-03 09:53:02 -0400
committerCristy <urban-warrior@imagemagick.org>2019-08-03 09:54:17 -0400
commit68039eac626096da72869f1744e49db40ae929ec (patch)
tree7d2638f9bad8fc39ce23f61d9a21711c663e7e2d /Magick++
parent2dde12fb5e4dc928f87e7962d1f5a4ab0d0cf542 (diff)
downloadImageMagick-68039eac626096da72869f1744e49db40ae929ec.tar.gz
Unit tests pass again for a quantum depth of 64
Diffstat (limited to 'Magick++')
-rw-r--r--Magick++/tests/attributes.cpp14
1 files changed, 9 insertions, 5 deletions
diff --git a/Magick++/tests/attributes.cpp b/Magick++/tests/attributes.cpp
index 0b9e9d7f1..42abdc793 100644
--- a/Magick++/tests/attributes.cpp
+++ b/Magick++/tests/attributes.cpp
@@ -154,7 +154,7 @@ int main( int /*argc*/, char ** argv)
//
// Test default value.
- if ( image.backgroundColor() != string(ColorRGB("white")) )
+ if ( string(image.backgroundColor()) != string(ColorRGB("white")) )
{
++failures;
cout << "Line: " << __LINE__ << ", backgroundColor default ("
@@ -174,7 +174,8 @@ int main( int /*argc*/, char ** argv)
else
if ( string(image.backgroundColor()) != "#0000FF" &&
string(image.backgroundColor()) != "#00000000FFFF" &&
- string(image.backgroundColor()) != "#0000000000000000FFFFFFFF" )
+ string(image.backgroundColor()) != "#0000000000000000FFFFFFFF" &&
+ string(image.backgroundColor()) != "#00000000000000000000000000000000FFFFFFFFFFFFFFFF" )
{
++failures;
cout << "Line: " << __LINE__ << ", backgroundColor ("
@@ -194,7 +195,8 @@ int main( int /*argc*/, char ** argv)
else
if ( string(image.backgroundColor()) != "#00AAFF" &&
string(image.backgroundColor()) != "#0000AAAAFFFF" &&
- string(image.backgroundColor()) != "#00000000AAAAAAAAFFFFFFFF" )
+ string(image.backgroundColor()) != "#00000000AAAAAAAAFFFFFFFF" &&
+ string(image.backgroundColor()) != "#0000000000000000AAAAAAAAAAAAAAAAFFFFFFFFFFFFFFFF" )
{
++failures;
cout << "Line: " << __LINE__
@@ -260,7 +262,8 @@ int main( int /*argc*/, char ** argv)
// Base filename is color for xc images
if ( image.baseFilename() != "xc:#FF0000" &&
image.baseFilename() != "xc:#FFFF00000000" &&
- image.baseFilename() != "xc:#FFFFFFFF0000000000000000")
+ image.baseFilename() != "xc:#FFFFFFFF0000000000000000" &&
+ image.baseFilename() != "xc:#FFFFFFFFFFFFFFFF00000000000000000000000000000000")
{
++failures;
cout << "Line: " << __LINE__
@@ -1271,7 +1274,8 @@ int main( int /*argc*/, char ** argv)
if (( image.signature() != "a0747a8a5a0e6a1ec960ab8994986ba087d518db97db6f17e7bb4da3bbc3c91d") &&
( image.signature() != "373ba105dfe1c3e35a0ad70c18534db5c253911b32f1ef5b94b564b5fbd3f87d") &&
- ( image.signature() != "eccb7a8ac230b0deb76c8dd10ddeeb76a0918cbe6e3469d2d9f223d35c66498b"))
+ ( image.signature() != "eccb7a8ac230b0deb76c8dd10ddeeb76a0918cbe6e3469d2d9f223d35c66498b") &&
+ ( image.signature() != "6857675cd7d967e1e3ff094e1b3e5f4bb3fb9ba2557eb6d083d37881db0a2039"))
{
++failures;
cout << "Line: " << __LINE__ << ", signature ("