libs/main/math/pimathmatrix.h

@@ -85,7 +85,6 @@ class PIP_EXPORT PIMathMatrixT {
 	static_assert(Rows > 0, "Row count must be > 0");
 	static_assert(Cols > 0, "Column count must be > 0");
 public:
-<<<<<<< HEAD
 	/**
 	* @brief Constructor that calls the private resize method
 	*
@@ -490,7 +489,6 @@ public:
 	* @return matrix determinant
 	*/
 	Type determinant(bool *ok = 0) const {
-=======
 	PIMathMatrixT() {resize(Rows, Cols);}
 	PIMathMatrixT(const PIVector<Type> & val) {resize(Rows, Cols); int i = 0; PIMM_FOR_I_WB(r, c) m[r][c] = val[i++];}
 
@@ -510,7 +508,8 @@ public:
 	static _CMatrix filled(const Type & v) {_CMatrix tm; PIMM_FOR_WB(r, c) tm.m[r][c] = v; return tm;}
 
     	/**
-     * @brief Rotation the matrix by an "angle". Works only with 2x2 matrix, else return _CMatrix
+     	* @brief Rotation the matrix by an "angle". Works only with 2x2 matrix,
+     	* else return default construction of PIMathMatrixT
 	*
      	* @param angle is the angle of rotation of the matrix
      	* @return rotated matrix
@@ -518,7 +517,8 @@ public:
 	static _CMatrix rotation(double angle) {return _CMatrix();}
 
     	/**
-     * @brief Rotation of the matrix by an "angle" along the X axis. Works only with 3x3 matrix, else return _CMatrix
+     	* @brief Rotation of the matrix by an "angle" along the X axis. Works only with 3x3 matrix,
+     	* else return default construction of PIMathMatrixT
      	*
      	* @param angle is the angle of rotation of the matrix along the X axis
      	* @return rotated matrix
@@ -526,7 +526,8 @@ public:
 	static _CMatrix rotationX(double angle) {return _CMatrix();}
 
     	/**
-     * @brief Rotation of the matrix by an "angle" along the Y axis. Works only with 3x3 matrix, else return _CMatrix
+     	* @brief Rotation of the matrix by an "angle" along the Y axis. Works only with 3x3 matrix,
+     	* else return default construction of PIMathMatrixT
      	*
      	* @param angle is the angle of rotation of the matrix along the Y axis
      	* @return rotated matrix
@@ -534,7 +535,8 @@ public:
 	static _CMatrix rotationY(double angle) {return _CMatrix();}
 
     	/**
-     * @brief Rotation of the matrix by an "angle" along the Z axis. Works only with 3x3 matrix, else return _CMatrix
+     	* @brief Rotation of the matrix by an "angle" along the Z axis. Works only with 3x3 matrix,
+     	* else return default construction of PIMathMatrixT
      	*
      	* @param angle is the angle of rotation of the matrix along the Z axis
      	* @return rotated matrix
@@ -542,7 +544,8 @@ public:
 	static _CMatrix rotationZ(double angle) {return _CMatrix();}
 
     	/**
-     * @brief Scaling the matrix along the X axis by the value "factor". Works only with 3x3 and 2x2 matrix, else return _CMatrix
+     	* @brief Scaling the matrix along the X axis by the value "factor". Works only with 3x3 and 2x2 matrix,
+     	* else return default construction of PIMathMatrixT
      	*
      	* @param factor is the value of scaling by X axis
      	* @return rotated matrix
@@ -550,7 +553,8 @@ public:
 	static _CMatrix scaleX(double factor) {return _CMatrix();}
 
     	/**
-     * @brief Scaling the matrix along the Y axis by the value "factor". Works only with 3x3 and 2x2 matrix, else return _CMatrix
+     	* @brief Scaling the matrix along the Y axis by the value "factor". Works only with 3x3 and 2x2 matrix,
+     	* else return default construction of PIMathMatrixT
      	*
      	* @param factor is the value of scaling by Y axis
      	* @return rotated matrix
@@ -558,7 +562,8 @@ public:
 	static _CMatrix scaleY(double factor) {return _CMatrix();}
 
     	/**
-     * @brief Scaling the matrix along the Z axis by the value "factor". Works only with 3x3 matrix, else return _CMatrix
+     	* @brief Scaling the matrix along the Z axis by the value "factor". Works only with 3x3 matrix,
+     	* else return default construction of PIMathMatrixT
      	*
      	* @param factor is the value of scaling by Z axis
      	* @return rotated matrix
@@ -791,7 +796,6 @@ public:
      	* @return matrix determinant
      	*/
 	Type determinant(bool * ok = 0) const {
->>>>>>> 9544d5e... Rotation remake
 		_CMatrix m(*this);
 		bool k;
 		Type ret = Type(0);