Changeset 15767

Timestamp:

Dec 7, 2007, 3:31:58 PM (18 years ago)

Author:

Paul Price

Message:

Determinant should be optional in psMatrixDeterminant.

File:

• trunk/psLib/src/math/psMatrix.c (modified) (4 diffs)

trunk/psLib/src/math/psMatrix.c

@@ -22 +22 @@
  *  @author Andy Becker, University of Washington (SVD).
  *
- *  @version $Revision: 1.49 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2007-03-07 21:12:13 $
+ *  @version $Revision: 1.50 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2007-12-08 01:31:58 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -530 +530 @@
     #define INVERT_CLEANUP { psFree(out); return NULL; }
     // Error checks
-    PS_ASSERT_GENERAL_PTR_NON_NULL(determinant, INVERT_CLEANUP);
     PS_ASSERT_GENERAL_IMAGE_NON_NULL(in, INVERT_CLEANUP);
     PS_CHECK_POINTERS(in, out, INVERT_CLEANUP);
@@ -554 +553 @@
     gsl_linalg_LU_decomp(lu, perm, &signum);
     gsl_linalg_LU_invert(lu, perm, inv);
-    *determinant = (float)gsl_linalg_LU_det(lu, signum);
+    if (determinant) {
+        *determinant = (float)gsl_linalg_LU_det(lu, signum);
+    }
 
     // Copy GSL matrix data to psImage data
@@ -593 +594 @@
 
     // Calculate determinant
-    //    det = psAlloc(sizeof(psF32));
     gsl_linalg_LU_decomp(lu, perm, &signum);
     det = (psF32)gsl_linalg_LU_det(lu, signum);