From e016c39ea6b9d10ad5c8a380356b5070db57b55a Mon Sep 17 00:00:00 2001 From: Ilya Shipitsin Date: Sat, 6 Oct 2018 18:38:38 +0500 Subject: [PATCH] Magick++/lib/Options.cpp: remove redundant assignment (#1328) found by PVS analyzer Magick++/lib/Options.cpp 804 warn V519 The 'affine.tx' variable is assigned values twice successively. Perhaps this is a mistake. Check lines: 801, 804. Magick++/lib/Options.cpp 805 warn V519 The 'affine.ty' variable is assigned values twice successively. Perhaps this is a mistake. Check lines: 802, 805. Magick++/lib/Options.cpp 838 warn V519 The 'affine.sx' variable is assigned values twice successively. Perhaps this is a mistake. Check lines: 831, 838. Magick++/lib/Options.cpp 839 warn V519 The 'affine.rx' variable is assigned values twice successively. Perhaps this is a mistake. Check lines: 832, 839. Magick++/lib/Options.cpp 840 warn V519 The 'affine.ry' variable is assigned values twice successively. Perhaps this is a mistake. Check lines: 833, 840. Magick++/lib/Options.cpp 841 warn V519 The 'affine.sy' variable is assigned values twice successively. Perhaps this is a mistake. Check lines: 834, 841. Magick++/lib/Options.cpp 864 warn V519 The 'affine.sx' variable is assigned values twice successively. Perhaps this is a mistake. Check lines: 857, 864. Magick++/lib/Options.cpp 865 warn V519 The 'affine.sy' variable is assigned values twice successively. Perhaps this is a mistake. Check lines: 860, 865. Magick++/lib/Options.cpp 888 warn V519 The 'affine.sx' variable is assigned values twice successively. Perhaps this is a mistake. Check lines: 881, 888. Magick++/lib/Options.cpp 889 warn V519 The 'affine.ry' variable is assigned values twice successively. Perhaps this is a mistake. Check lines: 883, 889. Magick++/lib/Options.cpp 890 warn V519 The 'affine.sy' variable is assigned values twice successively. Perhaps this is a mistake. Check lines: 884, 890. Magick++/lib/Options.cpp 913 warn V519 The 'affine.sx' variable is assigned values twice successively. Perhaps this is a mistake. Check lines: 906, 913. Magick++/lib/Options.cpp 914 warn V519 The 'affine.rx' variable is assigned values twice successively. Perhaps this is a mistake. Check lines: 907, 914. Magick++/lib/Options.cpp 915 warn V519 The 'affine.sy' variable is assigned values twice successively. Perhaps this is a mistake. Check lines: 909, 915. --- Magick++/lib/Options.cpp | 31 ++++++------------------------- 1 file changed, 6 insertions(+), 25 deletions(-) diff --git a/Magick++/lib/Options.cpp b/Magick++/lib/Options.cpp index 58dc5f1fc..9d2a5904b 100644 --- a/Magick++/lib/Options.cpp +++ b/Magick++/lib/Options.cpp @@ -798,9 +798,6 @@ void Magick::Options::transformOrigin(const double tx_,const double ty_) affine.rx=0.0; affine.ry=0.0; affine.sy=1.0; - affine.tx=0.0; - affine.ty=0.0; - affine.tx=tx_; affine.ty=ty_; @@ -828,17 +825,12 @@ void Magick::Options::transformRotation(const double angle_) affine, current=_drawInfo->affine; - affine.sx=1.0; - affine.rx=0.0; - affine.ry=0.0; - affine.sy=1.0; - affine.tx=0.0; - affine.ty=0.0; - affine.sx=cos(DegreesToRadians(fmod(angle_,360.0))); affine.rx=(-sin(DegreesToRadians(fmod(angle_,360.0)))); affine.ry=sin(DegreesToRadians(fmod(angle_,360.0))); affine.sy=cos(DegreesToRadians(fmod(angle_,360.0))); + affine.tx=0.0; + affine.ty=0.0; _drawInfo->affine.sx=current.sx*affine.sx+current.ry*affine.rx; _drawInfo->affine.rx=current.rx*affine.sx+current.sy*affine.rx; @@ -854,16 +846,13 @@ void Magick::Options::transformScale(const double sx_,const double sy_) affine, current=_drawInfo->affine; - affine.sx=1.0; + affine.sx=sx_; affine.rx=0.0; affine.ry=0.0; - affine.sy=1.0; + affine.sy=sy_; affine.tx=0.0; affine.ty=0.0; - affine.sx=sx_; - affine.sy=sy_; - _drawInfo->affine.sx=current.sx*affine.sx+current.ry*affine.rx; _drawInfo->affine.rx=current.rx*affine.sx+current.sy*affine.rx; _drawInfo->affine.ry=current.sx*affine.ry+current.ry*affine.sy; @@ -880,15 +869,11 @@ void Magick::Options::transformSkewX(const double skewx_) affine.sx=1.0; affine.rx=0.0; - affine.ry=0.0; + affine.ry=tan(DegreesToRadians(fmod(skewx_,360.0))); affine.sy=1.0; affine.tx=0.0; affine.ty=0.0; - affine.sx=1.0; - affine.ry=tan(DegreesToRadians(fmod(skewx_,360.0))); - affine.sy=1.0; - _drawInfo->affine.sx=current.sx*affine.sx+current.ry*affine.rx; _drawInfo->affine.rx=current.rx*affine.sx+current.sy*affine.rx; _drawInfo->affine.ry=current.sx*affine.ry+current.ry*affine.sy; @@ -904,16 +889,12 @@ void Magick::Options::transformSkewY(const double skewy_) current=_drawInfo->affine; affine.sx=1.0; - affine.rx=0.0; + affine.rx=tan(DegreesToRadians(fmod(skewy_,360.0))); affine.ry=0.0; affine.sy=1.0; affine.tx=0.0; affine.ty=0.0; - affine.sx=1.0; - affine.rx=tan(DegreesToRadians(fmod(skewy_,360.0))); - affine.sy=1.0; - _drawInfo->affine.sx=current.sx*affine.sx+current.ry*affine.rx; _drawInfo->affine.rx=current.rx*affine.sx+current.sy*affine.rx; _drawInfo->affine.ry=current.sx*affine.ry+current.ry*affine.sy; -- 2.40.0