From 96c789cb7ca676abf6caa8f1b9daf504eb871f5b Mon Sep 17 00:00:00 2001 From: Takuo Yasunaga Date: Wed, 27 Oct 2021 08:46:20 +0900 Subject: [PATCH] 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/Tools/filter/tiff2mrc/src/tiff2mrc.c Changes not staged for commit: modified: include/eosMATH.h --- src/Tools/filter/tiff2mrc/src/tiff2mrc.c | 25 +++++++++++-------------- 1 file changed, 11 insertions(+), 14 deletions(-) diff --git a/src/Tools/filter/tiff2mrc/src/tiff2mrc.c b/src/Tools/filter/tiff2mrc/src/tiff2mrc.c index bdb70746f8..43db863897 100755 --- a/src/Tools/filter/tiff2mrc/src/tiff2mrc.c +++ b/src/Tools/filter/tiff2mrc/src/tiff2mrc.c @@ -197,6 +197,17 @@ main(int argc, char* argv[]) fprintf(stderr, "Cannot open tiff file (%s).\n", info.inFile); exit(EXIT_FAILURE); } + + if(linfo.flagShrink) { + mrcImage shrink; + mrcImageParaTypeIntegerCoord S; + + S.z = S.x = S.y = linfo.Shrink; + //S.z = 1; + lmrcImageShrink(&shrink, &mrc, S, 0); + + mrc = shrink; + } mrcFileWrite(&mrc, info.outFile, "in main routine", 0); return 0; } @@ -677,20 +688,6 @@ ltiff2mrc(mrcImage* mrc, TIFF* tiff, ltiff2mrcInfo* linfo, long mode) break; } } - - if(linfo->flagShrink) { - mrcImage shrink; - mrcImageParaTypeIntegerCoord S; - - S.z = S.x = S.y = linfo->Shrink; - if(mrc->HeaderN.z==1) { - linfo->Shrink = 1; - } - //S.z = 1; - lmrcImageShrink(&shrink, mrc, S, 0); - - *mrc = shrink; - } if(1nz && linfo->currentznz-1) { linfo->currentz++; } -- 2.11.0