Index: trunk/psLib/src/math/psMixtureModels.c
===================================================================
--- trunk/psLib/src/math/psMixtureModels.c	(revision 35785)
+++ trunk/psLib/src/math/psMixtureModels.c	(revision 35798)
@@ -116,5 +116,5 @@
 			psVector *offsets) {
   // Allocate offset vector
-  offsets = psVectorRecycle(offsets,in->numRows,PS_TYPE_S32);
+  //  offsets = psVectorRecycle(offsets,in->numRows,PS_TYPE_S32);
 
   *Ncensored = 0;
@@ -169,32 +169,40 @@
   psImage  *Dcensored = psMMCensorData(D,&Ncensored,offsets);
 
-  psVector *tempModes = psVectorAlloc(N - Ncensored,PS_TYPE_F32);
-  bool success = psMMkmeansUncensored(Dcensored,
-				      dim,
-				      N - Ncensored,
-				      tempModes,
-				      means,
-				      m,
-				      iterations,
-				      V);
+
+  bool success;
   if (Ncensored == 0) { // We can directly return the modes and means calculated
-    if (modes) {
-      psFree(modes);
-    }
-    modes = psMemIncrRefCounter(tempModes);
+    success = psMMkmeansUncensored(Dcensored,
+				   dim,
+				   N,
+				   modes,
+				   means,
+				   m,
+				   iterations,
+				   V);
   }
   else {
+    psVector *tempModes = psVectorAlloc(N - Ncensored,PS_TYPE_F32);
+    success = psMMkmeansUncensored(Dcensored,
+				   dim,
+				   N - Ncensored,
+				   tempModes,
+				   means,
+				   m,
+				   iterations,
+				   V);
+    
     if (!modes) {
       modes = psVectorAlloc(N,PS_TYPE_F32);
     }
-
+    
     psVectorInit(modes,NAN);
     for (int i = 0; i < N - Ncensored; i++) {
       modes->data.F32[i - offsets->data.S32[i]] = tempModes->data.F32[i];
     }
+    psFree(tempModes);
   }
   psFree(offsets);
   psFree(Dcensored);
-  psFree(tempModes);
+
   return(success);
 }
@@ -373,31 +381,37 @@
   // We need to scan the input for invalid d
   long Ncensored;
-  psVector *offsets = psVectorAlloc(N,PS_TYPE_F32);
+  psVector *offsets = psVectorAlloc(N,PS_TYPE_S32);
   psImage  *Dcensored = psMMCensorData(D,&Ncensored,offsets);
-
-  psVector *tempModes = psVectorAlloc(N - Ncensored,PS_TYPE_F32);
-  psImage  *tempP     = psImageAlloc(m,N - Ncensored,PS_TYPE_F32);
-  bool success = psMMGMMUncensored(Dcensored,
-				   dim,
-				   N - Ncensored,
-				   tempModes,
-				   means,
-				   sigma,
-				   pi,
-				   tempP,
-				   m,
-				   iterations,
-				   V);
+  bool success;
   if (Ncensored == 0) { // We can directly return the modes and means calculated
-    if (modes) {
-      psFree(modes);
-    }
-    if (P) {
-      psFree(P);
-    }
-    modes = psMemIncrRefCounter(tempModes);
-    P     = psMemIncrRefCounter(tempP);
+    success = psMMGMMUncensored(Dcensored,
+				dim,
+				N,
+				modes,
+				means,
+				sigma,
+				pi,
+				P,
+				m,
+				iterations,
+				V);
   }
   else {
+    psVector *tempModes = psVectorAlloc(N - Ncensored,PS_TYPE_F32);
+    psImage  *tempP     = psImageAlloc(m,N - Ncensored,PS_TYPE_F32);
+
+    success = psMMGMMUncensored(Dcensored,
+				dim,
+				N,
+				tempModes,
+				means,
+				sigma,
+				pi,
+				tempP,
+				m,
+				iterations,
+				V);
+      
+    
     if (!modes) {
       modes = psVectorAlloc(N,PS_TYPE_F32);
@@ -415,9 +429,9 @@
       }
     }
+    psFree(tempModes);
+    psFree(tempP);
   }
   psFree(offsets);
   psFree(Dcensored);
-  psFree(tempModes);
-  psFree(tempP);
   return(success);
 }