| Revisión | 34d2f2c8ae647331a781fbef29e7ff411cebcc88 (tree) |
|---|---|
| Tiempo | 2014-03-23 09:55:11 |
| Autor | Takuo Yasunaga <yasunaga@bio....> |
| Commiter | Takuo Yasunaga |
modified: mrc2fld
modified: llDataResolutionCheck.c
hostdepend/X86LINUX64/bin/X86LINUX64/llDataResolutionCheck (diff) hostdepend/X86LINUX64/bin/X86LINUX64/mrc2fld (diff) hostdepend/X86LINUX64/src/Tools/filter/mrc2fld/src/X86LINUX64/mrc2fld (diff) hostdepend/X86LINUX64/src/Tools/llData/llDataResolutionCheck/src/X86LINUX64/llDataResolutionCheck (diff)
src/Tools/filter/mrc2fld/src/mrc2fld.c (diff) src/Tools/llData/llDataResolutionCheck/src/llDataResolutionCheck.c (diff)| @@ -218,10 +218,14 @@ lmrc2fld (avsFileField* avs, mrcImage* mrc, lmrc2fldInfo* info, long mode) | ||
| 218 | 218 | for(i=0; i<mrc->HeaderN.x; i++) { |
| 219 | 219 | avs->Coord[0][i] = (i+mrc->HeaderStartN.x)*mrc->HeaderLength.x + info->shiftx; |
| 220 | 220 | } |
| 221 | - for(i=0; i<mrc->HeaderN.y; i++) { | |
| 222 | - avs->Coord[1][i] = (i+mrc->HeaderStartN.y)*mrc->HeaderLength.y + info->shifty; | |
| 221 | + if(2<=avs->ndim) { | |
| 222 | + for(i=0; i<mrc->HeaderN.y; i++) { | |
| 223 | + avs->Coord[1][i] = (i+mrc->HeaderStartN.y)*mrc->HeaderLength.y + info->shifty; | |
| 224 | + } | |
| 223 | 225 | } |
| 224 | - for(i=0; i<mrc->HeaderN.z; i++) { | |
| 225 | - avs->Coord[2][i] = (i+mrc->HeaderStartN.z)*mrc->HeaderLength.z + info->shiftz; | |
| 226 | + if(3<=avs->ndim) { | |
| 227 | + for(i=0; i<mrc->HeaderN.z; i++) { | |
| 228 | + avs->Coord[2][i] = (i+mrc->HeaderStartN.z)*mrc->HeaderLength.z + info->shiftz; | |
| 229 | + } | |
| 226 | 230 | } |
| 227 | 231 | } |
| @@ -50,7 +50,7 @@ main(int argc, char* argv[]) | ||
| 50 | 50 | |
| 51 | 51 | In = (llData*)memoryAllocate(sizeof(llData)*info.flagIn, "in main"); |
| 52 | 52 | for(i=0; i<info.flagIn; i++) { |
| 53 | - llDataFileRead(info.In[i], &(In[i]), 0); | |
| 53 | + llDataFileRead(info.fptIn[i], &(In[i]), 0); | |
| 54 | 54 | } |
| 55 | 55 | exit(EXIT_SUCCESS); |
| 56 | 56 | } |
Fork