OSDN Git Service

Add -O : threshold printing v2.3.11p0177
authorTakuo Yasunaga <yasunaga@bio.kyutech.ac.jp>
Sun, 23 Aug 2015 06:40:39 +0000 (15:40 +0900)
committerTakuo Yasunaga <yasunaga@bio.kyutech.ac.jp>
Sun, 23 Aug 2015 06:40:39 +0000 (15:40 +0900)
modified:   include/lmrcImageBinarization.h
modified:   src/Objects/DataManip/mrcImage/src/lmrcImageBinarization.c
modified:   src/Objects/DataManip/mrcImage/src/lmrcImageBinarization.h
modified:   src/Tools/mrcImage/mrcImageBinalization/src/mrcImageBinalization.c

include/lmrcImageBinarization.h
src/Objects/DataManip/mrcImage/src/lmrcImageBinarization.c
src/Objects/DataManip/mrcImage/src/lmrcImageBinarization.h
src/Tools/mrcImage/mrcImageBinalization/src/mrcImageBinalization.c

index ae45900..5f72856 100644 (file)
@@ -36,7 +36,7 @@ typedef struct lmrcImageBinarizationInfo {
 /* prototype begin */
 
 /* Binalization Methods */
-extern void    lmrcImageBinarization(mrcImage* out, mrcImage* in, lmrcImageBinarizationInfo linfo, int mode);
+extern float lmrcImageBinarization(mrcImage* out, mrcImage* in, lmrcImageBinarizationInfo linfo, int mode);
 extern void    lmrcImageBinarization0(mrcImage* out, mrcImage* in, lmrcImageBinarizationInfo linfo, int mode);
 extern void    lmrcImageBinarizationUsage(FILE* fpt);
 extern double  lmrcImageDeterminationOfThresholdForBinarizationByKittlerMethod(mrcImage* mrc, int L, int mode);
index dcf91e7..114c4be 100755 (executable)
@@ -21,7 +21,7 @@ static char __sccs_id[] = "%Z%lmrcImageBinarization ver%I%; Date:%D% %Z%";
 #include "../inc/mrcImage.h"
 #include "lmrcImageBinarization.h"
 
-void 
+float
 lmrcImageBinarization(mrcImage* out, mrcImage*  in, lmrcImageBinarizationInfo linfo, int mode)
 {
        double thres;
@@ -62,6 +62,8 @@ lmrcImageBinarization(mrcImage* out, mrcImage*  in, lmrcImageBinarizationInfo li
                linfo.thresHold += linfo.deltaThreshold;
        }
        lmrcImageBinarization0(out, in, linfo, mode&0x0f); 
+
+       return linfo.thresHold;
 }
 
 void 
index ae45900..5f72856 100755 (executable)
@@ -36,7 +36,7 @@ typedef struct lmrcImageBinarizationInfo {
 /* prototype begin */
 
 /* Binalization Methods */
-extern void    lmrcImageBinarization(mrcImage* out, mrcImage* in, lmrcImageBinarizationInfo linfo, int mode);
+extern float lmrcImageBinarization(mrcImage* out, mrcImage* in, lmrcImageBinarizationInfo linfo, int mode);
 extern void    lmrcImageBinarization0(mrcImage* out, mrcImage* in, lmrcImageBinarizationInfo linfo, int mode);
 extern void    lmrcImageBinarizationUsage(FILE* fpt);
 extern double  lmrcImageDeterminationOfThresholdForBinarizationByKittlerMethod(mrcImage* mrc, int L, int mode);
index 0dcea61..0ccbc58 100755 (executable)
@@ -28,6 +28,7 @@ main(int argc, char* argv[])
 {
        mrcImageBinalizationInfo info;
        lmrcImageBinarizationInfo linfo;
+       float threshold;
 
 /* variables */
        mrcImage in;
@@ -53,9 +54,11 @@ main(int argc, char* argv[])
        linfo.deltaThreshold = info.deltaThreshold;
 
        DEBUGPRINT1("mode: %d\n", info.mode);
-       lmrcImageBinarization(&out, &in, linfo, info.mode);
+       threshold = lmrcImageBinarization(&out, &in, linfo, info.mode);
 
        mrcFileWrite(&out, info.Out ,"in main" ,0);
+
+       fprintf(info.fptOutParam, "Threshold: %f\n", threshold);
 /* end */
        return EXIT_SUCCESS;
 }