From: Kevin M. Rosenberg Date: Mon, 4 Dec 2000 04:44:03 +0000 (+0000) Subject: r243: *** empty log message *** X-Git-Tag: debian-4.5.3-3~774 X-Git-Url: http://git.kpe.io/?p=ctsim.git;a=commitdiff_plain;h=65d830e8c9dc6cc158159ff722d63bd3d88863e6;ds=sidebyside r243: *** empty log message *** --- diff --git a/libctgraphics/transformmatrix.cpp b/libctgraphics/transformmatrix.cpp index 12c5192..7e3c73d 100644 --- a/libctgraphics/transformmatrix.cpp +++ b/libctgraphics/transformmatrix.cpp @@ -9,7 +9,7 @@ ** This is part of the CTSim program ** Copyright (C) 1983-2000 Kevin Rosenberg ** -** $Id: transformmatrix.cpp,v 1.1 2000/07/28 08:28:08 kevin Exp $ +** $Id: transformmatrix.cpp,v 1.2 2000/12/04 04:44:02 kevin Exp $ ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License (version 2) as @@ -25,10 +25,10 @@ ** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ******************************************************************************/ +#include #include "ctsupport.h" #include "transformmatrix.h" -#include - + TransformationMatrix2D::TransformationMatrix2D (double m[3][3]) { @@ -92,9 +92,9 @@ TransformationMatrix2D::invert () const double determ = determinant (); if (fabs(determ) < 1E-6) { - sys_error (ERR_WARNING, "Determinant = %g [TransformationMatrix2D::invert]", determ); - print (cout); - cout << endl; + sys_error (ERR_WARNING, "Determinant = %g [TransformationMatrix2D::invert]", determ); + print (cout); + cout << endl; } b[0][0] = (mtx[1][1] * mtx[2][2] - mtx[2][1] * mtx[1][2]) / determ; diff --git a/libctsupport/xform.cpp b/libctsupport/xform.cpp index 9836e26..219eb9b 100644 --- a/libctsupport/xform.cpp +++ b/libctsupport/xform.cpp @@ -2,7 +2,7 @@ ** This is part of the CTSim program ** Copyright (C) 1983-2000 Kevin Rosenberg ** -** $Id: xform.cpp,v 1.3 2000/06/19 19:10:08 kevin Exp $ +** $Id: xform.cpp,v 1.4 2000/12/04 04:44:03 kevin Exp $ ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License (version 2) as @@ -126,16 +126,17 @@ mult_mtx2 (const GRFMTX_2D m1, const GRFMTX_2D m2, GRFMTX_2D result) { GRFMTX_2D temp; - for (int row = 0; row < 3; row++) + for (int row = 0; row < 3; row++) { for (int col = 0; col < 3; col++) { temp[row][col] = 0; for (int calc = 0; calc < 3; calc++) - temp[row][col] += m1[row][calc] * m2[calc][col]; - } - - for (int row = 0; row < 3; row++) + temp[row][col] += m1[row][calc] * m2[calc][col]; + } + } + + for (int r = 0; r < 3; r++) for (int col = 0; col < 3; col++) - result[row][col] = temp[row][col]; + result[r][col] = temp[r][col]; } void