Please enter the commit message for your changes. Lines starting

 with '#' will be ignored, and an empty message aborts the commit.

 On branch master
 Your branch is up to date with 'origin/master'.

 Changes to be committed:
	modified:   hostdepend/ARM64MAC64
	modified:   src/Objects/DataManip/mrcImage/src/lmrcImageSoftEdge.c
	modified:   src/Tools/mrcImage/mrcImageSoftEdge/src/test/Makefile

 Changes not staged for commit:
	modified:   hostdepend/ARM64MAC64 (new commits)
	modified:   include/eosMATH.h

diff --git a/hostdepend/ARM64MAC64 b/hostdepend/ARM64MAC64
index 3f7dd8c..b8324d9 160000 (submodule)
--- a/hostdepend/ARM64MAC64
+++ b/hostdepend/ARM64MAC64
@@ -1 +1 @@
-Subproject commit 3f7dd8c2ccc4056ad9956e03de20fa4605de3ad4
+Subproject commit b8324d995ef7bb8396599304680be33b59b81c5e

diff --git a/src/Objects/DataManip/mrcImage/src/lmrcImageSoftEdge.c b/src/Objects/DataManip/mrcImage/src/lmrcImageSoftEdge.c
index 2f159a7..4afe3a5 100644 (file)
--- a/src/Objects/DataManip/mrcImage/src/lmrcImageSoftEdge.c
+++ b/src/Objects/DataManip/mrcImage/src/lmrcImageSoftEdge.c
@@ -33,6 +33,8 @@ lmrcImageSoftEdge(mrcImage* out, mrcImage* in, lmrcImageSoftEdgeInfo linfo, int
     mrcImage dilation, tmp; 
     lmrcImageMorphologyInfo minfo;
     int times;
+    int flagNear;
+
     DEBUGPRINT("lmrcImageSoftEdge\n");
     out->Header = in->Header;
     mrcInit(out, NULL);
@@ -65,8 +67,9 @@ lmrcImageSoftEdge(mrcImage* out, mrcImage* in, lmrcImageSoftEdgeInfo linfo, int
     do { 
         lmrcImageDilation(&dilation, &tmp, minfo, 2);
         tmp = dilation;
+        times++;
     } while(times<=width);
-#ifdef DEBUG
+#ifdef DEBUG2
     mrcFileWrite(&dilation, "/tmp/test.dilation", "for test", 0); 
     mrcFileWrite(&minfo.SE, "/tmp/test.se", "for test", 0); 
 #endif
@@ -82,6 +85,7 @@ lmrcImageSoftEdge(mrcImage* out, mrcImage* in, lmrcImageSoftEdgeInfo linfo, int
             //DEBUGPRINT5("%f %f %f: %f %f\n", x, y, z, data0, data);
             near = max;
             dstData = 0;
+            flagNear=1;
             for(tmpWidth=1; tmpWidth<=width; tmpWidth++) { 
                 xmin = MAX(0, x-tmpWidth); xmax = MIN(x+tmpWidth, out->HeaderN.x - 1); 
                 ymin = MAX(0, y-tmpWidth); ymax = MIN(y+tmpWidth, out->HeaderN.y - 1);
@@ -99,22 +103,14 @@ lmrcImageSoftEdge(mrcImage* out, mrcImage* in, lmrcImageSoftEdgeInfo linfo, int
                                 neary = offsety;
                                 nearz = offsetz;
                                 dstData = data;
+                                flagNear+;
                             }
                         }
                     }
-                    if(dstData) {
-                        break;
-                    }
                 }
-                    if(dstData) {
-                        break;
-                    }
                 }
-                    if(dstData) {
-                        break;
-                    }
                 }
-                if(dstData) {
+                if(0<flagNear) {
                     break;
                 }
             }

diff --git a/src/Tools/mrcImage/mrcImageSoftEdge/src/test/Makefile b/src/Tools/mrcImage/mrcImageSoftEdge/src/test/Makefile
index e1c7f61..e72211e 100644 (file)
--- a/src/Tools/mrcImage/mrcImageSoftEdge/src/test/Makefile
+++ b/src/Tools/mrcImage/mrcImageSoftEdge/src/test/Makefile
@@ -13,6 +13,9 @@ exec:
        @echo "----- Execution Check -----"
        ../$(OSTYPE)/$(OBJECTNAME) -i data/test.rect -o data/test.rect.edge0 -w 2 -e 0
        ../$(OSTYPE)/$(OBJECTNAME) -i data/test.rect -o data/test.rect.edge1 -w 2 -e 1
+       @echo "----- Execution Check -----"
+       ../$(OSTYPE)/$(OBJECTNAME) -i data/test.rect -o data/test.rect.edge0-10 -w 10 -e 0
+       ../$(OSTYPE)/$(OBJECTNAME) -i data/test.rect -o data/test.rect.edge1-10 -w 10 -e 1
        @echo "----- Calc check -----"          
 
 init: