From 190f47988052d03eb6b79c49cce4404eca4e353b Mon Sep 17 00:00:00 2001 From: cristy Date: Fri, 16 Jan 2015 21:04:23 +0000 Subject: [PATCH] --- MagickCore/composite.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/MagickCore/composite.c b/MagickCore/composite.c index 1c1e9437a..ce13350c9 100644 --- a/MagickCore/composite.c +++ b/MagickCore/composite.c @@ -1004,26 +1004,26 @@ if (0) if (compose == DistortCompositeOp) { if ((flags & XValue) == 0) - if ((flags & AspectValue) == 0) + if ((flags & AspectValue) != 0) + center.x=(MagickRealType) ((image->columns-1)/2.0); + else center.x=(MagickRealType) (x_offset+(source_image->columns-1)/ 2.0); - else - center.x=(MagickRealType) ((image->columns-1)/2.0); else - if ((flags & AspectValue) == 0) - center.x=(MagickRealType) x_offset+geometry_info.xi; - else + if ((flags & AspectValue) != 0) center.x=geometry_info.xi; - if ((flags & YValue) == 0) - if ((flags & AspectValue) == 0) - center.y=(MagickRealType) (y_offset+(source_image->rows-1)/2.0); else + center.x=(MagickRealType) (x_offset+geometry_info.xi); + if ((flags & YValue) == 0) + if ((flags & AspectValue) != 0) center.y=(MagickRealType) ((image->rows-1)/2.0); - else - if ((flags & AspectValue) == 0) - center.y=(MagickRealType) y_offset+geometry_info.psi; else + center.y=(MagickRealType) (y_offset+(source_image->rows-1)/2.0); + else + if ((flags & AspectValue) != 0) center.y=geometry_info.psi; + else + center.y=(MagickRealType) (y_offset+geometry_info.psi); } /* Shift the pixel offset point as defined by the provided, -- 2.50.1