| Revisión | 0ae2c2177ea02987d5a280835994dae395c02ed7 (tree) |
|---|---|
| Tiempo | 2016-03-19 14:27:47 |
| Autor | Takuo Yasunaga <yasunaga@bio....> |
| Commiter | Takuo Yasunaga |
Bug fixed: CharImage did not be added. -> All Image and FT files can be added now.
modified: src/Tools/mrcImage/mrcImageAdd/src/mrcImageAdd.c
src/Tools/mrcImage/mrcImageAdd/src/mrcImageAdd.c (diff)| @@ -106,8 +106,7 @@ void llmrcImageAdd2(mrcImage* in1 ,mrcImage* in2) | ||
| 106 | 106 | |
| 107 | 107 | |
| 108 | 108 | /* begin */ |
| 109 | - if (in1->HeaderMode == mrcFloatImage || | |
| 110 | - in1->HeaderMode == mrcShortImage ){ | |
| 109 | + if (IsImage(in1, "llmrcImageAdd2", 0)) { | |
| 111 | 110 | for (z=0 ;z<in1->HeaderN.z ;z++){ |
| 112 | 111 | for (y=0 ;y<in1->HeaderN.y ;y++){ |
| 113 | 112 | for (x=0 ;x<in1->HeaderN.x ;x++){ |
| @@ -118,8 +117,7 @@ void llmrcImageAdd2(mrcImage* in1 ,mrcImage* in2) | ||
| 118 | 117 | } |
| 119 | 118 | } |
| 120 | 119 | } |
| 121 | - } else if (in1->HeaderMode == mrcComplexFloatFT || | |
| 122 | - in1->HeaderMode == mrcComplexShortFT ){ | |
| 120 | + } else if (IsFT(in1, "llmrcImageAdd2", 0)) { | |
| 123 | 121 | (in1->HeaderN.z == 1)?(Zmax=1):(Zmax=in1->HeaderN.z /2); |
| 124 | 122 | for (Z = - in1->HeaderN.z / 2; Z < Zmax ;Z++){ |
| 125 | 123 | for (Y = - in1->HeaderN.y / 2; Y < in1->HeaderN.y/ 2 ;Y++){ |
Fork