From: Takuo Yasunaga <yasunaga@bio.kyutech.ac.jp>
Date: Thu, 19 Nov 2020 09:30:11 +0000 (+0900)
Subject:  Please enter the commit message for your changes. Lines starting
X-Git-Tag: v2.3.71p0301
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=c96f7a81efe30ac43c6acfddc941d51d6a7f2129;p=eos%2Fbase.git

 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:   src/Objects/DataManip/mrcImage/src/lmrcImageFeatureCalc.c
---

diff --git a/src/Objects/DataManip/mrcImage/src/lmrcImageFeatureCalc.c b/src/Objects/DataManip/mrcImage/src/lmrcImageFeatureCalc.c
index 729a61fd25..8a525bc1b2 100644
--- a/src/Objects/DataManip/mrcImage/src/lmrcImageFeatureCalc.c
+++ b/src/Objects/DataManip/mrcImage/src/lmrcImageFeatureCalc.c
@@ -290,9 +290,9 @@ lmrcImagePerimeterCalc(mrcImage* out, mrcImage* in, lmrcImagePerimeterCalcInfo*
 	double data2;
 	double data3;
 	mrcImage* area;
-	mrcImage* label;	
+	mrcImage* label;
 	mrcImage* chain;
-	double L, dL;
+	double L, dL, labelID;
 	mrcImageParaTypeRealCoord ori, next;
 
 	DEBUGPRINT1("lmrcImagePerimeterCalc Start mode : %d\n", mode);
@@ -323,6 +323,8 @@ lmrcImagePerimeterCalc(mrcImage* out, mrcImage* in, lmrcImagePerimeterCalcInfo*
 	for(x=0; x<in->HeaderN.x; x++) {	
 		DEBUGPRINT2("Loop: %d %d\n", x, y);
 		mrcPixelDataGet(area, x, y, 0, &data0, mrcPixelRePart, mrcPixelHowNearest);
+    mrcPixelDataGet(label, x, y, 0, &labelID, mrcPixelRePart, mrcPixelHowNearest);
+    if(0<labelID) {
 		if(1<data0) {  // in Area
 			switch(mode) { // Edge or Not
 				case 0: 
@@ -427,6 +429,7 @@ lmrcImagePerimeterCalc(mrcImage* out, mrcImage* in, lmrcImagePerimeterCalcInfo*
 			mrcPixelDataSet(out,   x, y, 0, -1, mrcPixelRePart);
 			mrcPixelDataSet(chain, x, y, 0, -1, mrcPixelRePart);
 		}
+    }
 	}
 	}
 }