From: cristy Date: Sun, 19 Sep 2010 15:13:42 +0000 (+0000) Subject: (no commit message) X-Git-Tag: 7.0.1-0~8874 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ba9f8fa0b8f35fae924010903d2c92e7d80069ff;p=imagemagick --- diff --git a/Magick++/tests/attributes.cpp b/Magick++/tests/attributes.cpp index 5c6ff95ab..3b9213966 100644 --- a/Magick++/tests/attributes.cpp +++ b/Magick++/tests/attributes.cpp @@ -1290,6 +1290,7 @@ int main( int /*argc*/, char ** argv) image.signature() != "7e5977b8bce5c40b858c84344803dae61feae0ef7a21739b2d068c9cdb72f95b" && image.signature() != "c8aed4b60d666e449f5c29d0fb32f089e3257422a1f11a4712451c5340362df0" && image.signature() != "bc272b75794971f4a3ade1bf524c0aee375765e9fb15d65278a8b9452b551ea6" && + image.signature() != "482690062c78a9e78c9f5f3db514197a067028e9f1bec577b787fb9e9b044567" && image.signature() != "8610fd1c5ef905c05bf75438aaab8729d3e1277b8ec1e86927777bd3382702e5" && image.signature() != "b891ddb1d32cd45c6329180e5bd733eebb8dd06c401a9c721841ec43e4a662f8") { diff --git a/Magick++/tests/color.cpp b/Magick++/tests/color.cpp index 577d5a90c..0ce2ebc00 100644 --- a/Magick++/tests/color.cpp +++ b/Magick++/tests/color.cpp @@ -111,14 +111,11 @@ int main( int /*argc*/, char **argv) // Test ColorGray { -#undef MagickEpsilon -#define MagickEpsilon 1.0e-12 double resolution = 1.0/QuantumRange; + if ( resolution < 0.0000001 ) + resolution = 0.0000001; double max_error = resolution + MagickEpsilon; - if ( resolution < 0.0001 ) - resolution = 0.0001; - for( double value = 0; value < 1.0 + MagickEpsilon; value += resolution ) { ColorGray gray(value); @@ -128,7 +125,7 @@ int main( int /*argc*/, char **argv) cout << "Line: " << __LINE__ << " shade is " << gray.shade() - << " rather than nominal" + << " rather than nominal " << value << endl; }