Bug fixed:#

	matrix3DInverse
	vectorImageNearestNeighborMethod

diff --git a/hostdepend/X86LINUX64/bin/X86LINUX64/matrix3DInverse b/hostdepend/X86LINUX64/bin/X86LINUX64/matrix3DInverse
index 4314b1e..f5a8480 100755 (executable)
Binary files a/hostdepend/X86LINUX64/bin/X86LINUX64/matrix3DInverse and b/hostdepend/X86LINUX64/bin/X86LINUX64/matrix3DInverse differ

diff --git a/hostdepend/X86LINUX64/bin/X86LINUX64/vectorImageNearestNeighborMethod b/hostdepend/X86LINUX64/bin/X86LINUX64/vectorImageNearestNeighborMethod
index 8bb0f5e..7b68bd3 100755 (executable)
Binary files a/hostdepend/X86LINUX64/bin/X86LINUX64/vectorImageNearestNeighborMethod and b/hostdepend/X86LINUX64/bin/X86LINUX64/vectorImageNearestNeighborMethod differ

diff --git a/hostdepend/X86LINUX64/src/Tools/matrix3D/matrix3DInverse/src/X86LINUX64/matrix3DInverse b/hostdepend/X86LINUX64/src/Tools/matrix3D/matrix3DInverse/src/X86LINUX64/matrix3DInverse
index 4314b1e..f5a8480 100755 (executable)
Binary files a/hostdepend/X86LINUX64/src/Tools/matrix3D/matrix3DInverse/src/X86LINUX64/matrix3DInverse and b/hostdepend/X86LINUX64/src/Tools/matrix3D/matrix3DInverse/src/X86LINUX64/matrix3DInverse differ

diff --git a/hostdepend/X86LINUX64/src/Tools/vectorImage/vectorImageNearestNeighborMethod/src/X86LINUX64/vectorImageNearestNeighborMethod b/hostdepend/X86LINUX64/src/Tools/vectorImage/vectorImageNearestNeighborMethod/src/X86LINUX64/vectorImageNearestNeighborMethod
index 8bb0f5e..7b68bd3 100755 (executable)
Binary files a/hostdepend/X86LINUX64/src/Tools/vectorImage/vectorImageNearestNeighborMethod/src/X86LINUX64/vectorImageNearestNeighborMethod and b/hostdepend/X86LINUX64/src/Tools/vectorImage/vectorImageNearestNeighborMethod/src/X86LINUX64/vectorImageNearestNeighborMethod differ

diff --git a/src/Tools/matrix3D/matrix3DInverse/src/matrix3DInverse.c b/src/Tools/matrix3D/matrix3DInverse/src/matrix3DInverse.c
index e48573a..32ee9ad 100755 (executable)
--- a/src/Tools/matrix3D/matrix3DInverse/src/matrix3DInverse.c
+++ b/src/Tools/matrix3D/matrix3DInverse/src/matrix3DInverse.c
@@ -59,6 +59,11 @@ main(int argc, char* argv[])
        }
 
        FileRead(info.fptIn, inMatrix);
+
+       outMatrix  = (double **)memoryAllocate(sizeof(double*)*4, "in lmatrix3DInverse");
+       for(i=0; i<4; i++){
+               outMatrix[i]  = (double *)memoryAllocate(sizeof(double)*4, "in lmatrix3DInverse");
+       }
        lmatrix3DInverse(outMatrix, inMatrix, info.mode);
        FileWrite(info.fptOut, outMatrix);
        
@@ -79,12 +84,13 @@ lmatrix3DInverse(double** outMatrix, double** inMatrix, int mode)
 {
        int    i, j, k;
        double workMatrix[4][4];
-       
+
+/*
        outMatrix  = (double **)memoryAllocate(sizeof(double*)*4, "in lmatrix3DInverse");
        for(i=0; i<4; i++){
                outMatrix[i]  = (double *)memoryAllocate(sizeof(double)*4, "in lmatrix3DInverse");
        }
-
+*/
        for(i=0; i<4; i++){
        for(j=0; j<4; j++){
                workMatrix[i][j] = inMatrix[i][j];

diff --git a/src/Tools/vectorImage/vectorImageNearestNeighborMethod/src/vectorImageNearestNeighborMethod.c b/src/Tools/vectorImage/vectorImageNearestNeighborMethod/src/vectorImageNearestNeighborMethod.c
index 83a864d..33b7b16 100755 (executable)
--- a/src/Tools/vectorImage/vectorImageNearestNeighborMethod/src/vectorImageNearestNeighborMethod.c
+++ b/src/Tools/vectorImage/vectorImageNearestNeighborMethod/src/vectorImageNearestNeighborMethod.c
@@ -214,7 +214,7 @@ void  lvectorImageNearestNeighborMethod(mrcImage* In, int nIn, lvectorImageNeare
        upperClassNumber= (int**)memoryAllocate(sizeof(int*)*nIn, "in ");
        for(i=0; i<nIn; i++){
                //upperClassNumber[i]=new int[LIMIT];
-               upperClassNumber[i]=(int*)memoryAllocate(sizeof(LIMIT), "in");
+               upperClassNumber[i]=(int*)memoryAllocate(sizeof(int)*LIMIT, "in");
        }
 
        int** lowCorrelationClassNumber ;