From 6e56499341fd38a007e7483e06f432f05e7f9bdf Mon Sep 17 00:00:00 2001
From: cristy <urban-warrior@git.imagemagick.org>
Date: Fri, 24 May 2013 01:21:04 +0000
Subject: [PATCH]
---
Magick++/tests/appendImages.cpp | 4 ++--
Magick++/tests/attributes.cpp | 2 +-
Magick++/tests/averageImages.cpp | 2 +-
MagickCore/fx.c | 10 +++++-----
4 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/Magick++/tests/appendImages.cpp b/Magick++/tests/appendImages.cpp
index dbe9c963a..a61cfa08e 100644
--- a/Magick++/tests/appendImages.cpp
+++ b/Magick++/tests/appendImages.cpp
@@ -41,7 +41,7 @@ int main( int /*argc*/, char ** argv)
// Horizontal
appendImages( &appended, imageList.begin(), imageList.end() );
// appended.display();
- if ( appended.signature() != "a251c7b271e711604c800658cf80ad17ef32328ab9b24fca54438b214224c3d9" )
+ if ( appended.signature() != "493106ee32cdeab9e386fe50aafede73c23c1150af564a4ad71ca1deccc1fa10" )
{
++failures;
cout << "Line: " << __LINE__
@@ -53,7 +53,7 @@ int main( int /*argc*/, char ** argv)
// Vertical
appendImages( &appended, imageList.begin(), imageList.end(), true );
- if ( appended.signature() != "a251c7b271e711604c800658cf80ad17ef32328ab9b24fca54438b214224c3d9" )
+ if ( appended.signature() != "a22fbe9ca8e3dc3b34f137d175d51841daf56d231bedd8b18ad55415af558265" )
{
++failures;
cout << "Line: " << __LINE__
diff --git a/Magick++/tests/attributes.cpp b/Magick++/tests/attributes.cpp
index e5f88e31c..a086b96a8 100644
--- a/Magick++/tests/attributes.cpp
+++ b/Magick++/tests/attributes.cpp
@@ -1282,7 +1282,7 @@ int main( int /*argc*/, char ** argv)
// signature
//
- if ( image.signature() != "a81c2719f3a1fda387f86cc103340bb121f87c33f91ba130b774d8ad582b30ea")
+ if ( image.signature() != "b89bff8473dd6fe2302bcfd365e7d20daf7bd97ad667fe42d1a87469fce0d138")
{
++failures;
cout << "Line: " << __LINE__ << ", signature ("
diff --git a/Magick++/tests/averageImages.cpp b/Magick++/tests/averageImages.cpp
index e2e0edf8c..dd9f78707 100644
--- a/Magick++/tests/averageImages.cpp
+++ b/Magick++/tests/averageImages.cpp
@@ -39,7 +39,7 @@ int main( int /*argc*/, char ** argv)
Image averaged;
averageImages( &averaged, imageList.begin(), imageList.end() );
// averaged.display();
- if ( averaged.signature() != "35295da1d5eca0b6db3168c0a64a2d61ed3ae8ca283dd4aa6116aa04703dcb60" )
+ if ( averaged.signature() != "1e994c26d7c55e2da5a3ede207cd113a63d3e3d6bacbeacfc9605d20e70b4a93" )
{
cout << "Line: " << __LINE__
<< " Averaging image failed, signature = "
diff --git a/MagickCore/fx.c b/MagickCore/fx.c
index 529ec822d..ce918687a 100644
--- a/MagickCore/fx.c
+++ b/MagickCore/fx.c
@@ -3716,7 +3716,7 @@ static MagickBooleanType PlasmaImageProxy(Image *image,CacheView *image_view,
PixelTrait traits=GetPixelChannelTraits(image,channel);
if (traits == UndefinedPixelTrait)
continue;
- q[i]=PlasmaPixel(random_info,(u[channel]+v[channel])/2.0,plasma);
+ q[i]=PlasmaPixel(random_info,(u[i]+v[i])/2.0,plasma);
}
(void) SyncCacheViewAuthenticPixels(image_view,exception);
if (segment->x1 != segment->x2)
@@ -3739,7 +3739,7 @@ static MagickBooleanType PlasmaImageProxy(Image *image,CacheView *image_view,
PixelTrait traits=GetPixelChannelTraits(image,channel);
if (traits == UndefinedPixelTrait)
continue;
- q[i]=PlasmaPixel(random_info,(u[channel]+v[channel])/2.0,plasma);
+ q[i]=PlasmaPixel(random_info,(u[i]+v[i])/2.0,plasma);
}
(void) SyncCacheViewAuthenticPixels(image_view,exception);
}
@@ -3766,7 +3766,7 @@ static MagickBooleanType PlasmaImageProxy(Image *image,CacheView *image_view,
PixelTrait traits=GetPixelChannelTraits(image,channel);
if (traits == UndefinedPixelTrait)
continue;
- q[i]=PlasmaPixel(random_info,(u[channel]+v[channel])/2.0,plasma);
+ q[i]=PlasmaPixel(random_info,(u[i]+v[i])/2.0,plasma);
}
(void) SyncCacheViewAuthenticPixels(image_view,exception);
}
@@ -3790,7 +3790,7 @@ static MagickBooleanType PlasmaImageProxy(Image *image,CacheView *image_view,
PixelTrait traits=GetPixelChannelTraits(image,channel);
if (traits == UndefinedPixelTrait)
continue;
- q[i]=PlasmaPixel(random_info,(u[channel]+v[channel])/2.0,plasma);
+ q[i]=PlasmaPixel(random_info,(u[i]+v[i])/2.0,plasma);
}
(void) SyncCacheViewAuthenticPixels(image_view,exception);
}
@@ -3816,7 +3816,7 @@ static MagickBooleanType PlasmaImageProxy(Image *image,CacheView *image_view,
PixelTrait traits=GetPixelChannelTraits(image,channel);
if (traits == UndefinedPixelTrait)
continue;
- q[i]=PlasmaPixel(random_info,(u[channel]+v[channel])/2.0,plasma);
+ q[i]=PlasmaPixel(random_info,(u[i]+v[i])/2.0,plasma);
}
(void) SyncCacheViewAuthenticPixels(image_view,exception);
}
--
2.40.0