From c3eb16d214383cb1f9bce11f44132e5eb1d3107c Mon Sep 17 00:00:00 2001 From: cristy Date: Sun, 12 Jan 2014 00:03:52 +0000 Subject: [PATCH] --- Magick++/lib/Image.cpp | 3 ++- Magick++/tests/appendImages.cpp | 6 ++---- Magick++/tests/attributes.cpp | 12 +----------- 3 files changed, 5 insertions(+), 16 deletions(-) diff --git a/Magick++/lib/Image.cpp b/Magick++/lib/Image.cpp index e9c628135..f90c89ede 100644 --- a/Magick++/lib/Image.cpp +++ b/Magick++/lib/Image.cpp @@ -33,7 +33,8 @@ using namespace std; #define ClonePPDrawException(wand) \ ExceptionInfo \ *exceptionInfo; \ - exceptionInfo=DrawCloneExceptionInfo(wand) + exceptionInfo=DrawCloneExceptionInfo(wand); \ + exceptionInfo->relinquish=MagickFalse #define RestorePPChannelMask \ SetPixelChannelMask(image(),channel_mask) #define SetPPChannelMask(channel) \ diff --git a/Magick++/tests/appendImages.cpp b/Magick++/tests/appendImages.cpp index 8ad480c8a..6c1ebb279 100644 --- a/Magick++/tests/appendImages.cpp +++ b/Magick++/tests/appendImages.cpp @@ -42,8 +42,7 @@ int main( int /*argc*/, char ** argv) appendImages( &appended, imageList.begin(), imageList.end() ); // appended.display(); if (( appended.signature() != "3a90bb0bb8f69f6788ab99e9e25598a0d6c5cdbbb797f77ad68011e0a8b1689d" ) && - ( appended.signature() != "c15fcd1e739b73638dc4e36837bdb53f7087359544664caf7b1763928129f3c7" ) && - ( appended.signature() != "229ff72f812e5f536245dc3b4502a0bc2ab2363f67c545863a85ab91ebfbfb83" ) && + ( appended.signature() != "493106ee32cdeab9e386fe50aafede73c23c1150af564a4ad71ca1deccc1fa10" ) && ( appended.signature() != "b98c42c55fc4e661cb3684154256809c03c0c6b53da2738b6ce8066e1b6ddef0" )) { ++failures; @@ -56,8 +55,7 @@ int main( int /*argc*/, char ** argv) // Vertical appendImages( &appended, imageList.begin(), imageList.end(), true ); - if (( appended.signature() != "d73d25ccd6011936d08b6d0d89183b7a61790544c2195269aff4db2f782ffc08" ) && - ( appended.signature() != "0909f7ffa7c6ea410fb2ebfdbcb19d61b19c4bd271851ce3bd51662519dc2b58" ) && + if (( appended.signature() != "a22fbe9ca8e3dc3b34f137d175d51841daf56d231bedd8b18ad55415af558265" ) && ( appended.signature() != "11b97ba6ac1664aa1c2faed4c86195472ae9cce2ed75402d975bb4ffcf1de751" ) && ( appended.signature() != "cae4815eeb3cb689e73b94d897a9957d3414d1d4f513e8b5e52579b05d164bfe" )) { diff --git a/Magick++/tests/attributes.cpp b/Magick++/tests/attributes.cpp index b10db4b12..24124b6a1 100644 --- a/Magick++/tests/attributes.cpp +++ b/Magick++/tests/attributes.cpp @@ -1269,17 +1269,7 @@ int main( int /*argc*/, char ** argv) // signature // - if ( image.signature() != "c7ac1ef7b47015c6ea6c1fb1d736eba4f8c3fe81dbfe511fbce104cedfce7588" && - image.signature() != "d9464cd4d0c02f25166909726d6548db51d25fa91bd3cff642813f8a464bcfc7" && - image.signature() != "e073572dfa4ad28f2f8dd3c6d37dfb14585e60c94cfae910149e97eff2fd895f" && - image.signature() != "ed06047a79b5b298515538db3fb8186d79e94758ed07a9b411637ba3a79fb4a0" && - image.signature() != "e12b9781b3a5025628567a4eabf970d16d42560e1b86189caceb03ec358dd8e6" && - image.signature() != "ea9aaf29023c4c1c801e05483423a4a4266918e3a464b6a5155f11a0c581dedb" && - image.signature() != "6a989010d8ea958934ff8be44a42e0848f7c5e7e46cd53e04c4a90452c15d34c" && - image.signature() != "7e5977b8bce5c40b858c84344803dae61feae0ef7a21739b2d068c9cdb72f95b" && - image.signature() != "c8aed4b60d666e449f5c29d0fb32f089e3257422a1f11a4712451c5340362df0" && - image.signature() != "bc272b75794971f4a3ade1bf524c0aee375765e9fb15d65278a8b9452b551ea6" && - image.signature() != "482690062c78a9e78c9f5f3db514197a067028e9f1bec577b787fb9e9b044567" && + if ( image.signature() != "b89bff8473dd6fe2302bcfd365e7d20daf7bd97ad667fe42d1a87469fce0d138" && image.signature() != "8610fd1c5ef905c05bf75438aaab8729d3e1277b8ec1e86927777bd3382702e5" && image.signature() != "b891ddb1d32cd45c6329180e5bd733eebb8dd06c401a9c721841ec43e4a662f8") { -- 2.40.0