Commit caf2572e authored by Marc Modat's avatar Marc Modat

Some mac warning have been removed

parent fe6c0078
......@@ -387,8 +387,6 @@ int main(int argc, char **argv)
/* ********************** */
/* START THE REGISTRATION */
/* ********************** */
bool downsampleAxis[8]={false,false,false,false,false,false,false,false};
for(int level=0; level<param->level2Perform; level++){
/* Read the target and source image */
......@@ -558,11 +556,11 @@ int main(int argc, char **argv)
blockMatchingParams.blockNumber[1], blockMatchingParams.blockNumber[2]);
#ifdef _VERBOSE
if(targetImage->sform_code>0)
reg_mat44_disp(&targetImage->sto_xyz, "[VERBOSE] Target image matrix (sform sto_xyz)");
else reg_mat44_disp(&targetImage->qto_xyz, "[VERBOSE] Target image matrix (qform qto_xyz)");
reg_mat44_disp(&targetImage->sto_xyz, (char *)"[VERBOSE] Target image matrix (sform sto_xyz)");
else reg_mat44_disp(&targetImage->qto_xyz, (char *)"[VERBOSE] Target image matrix (qform qto_xyz)");
if(sourceImage->sform_code>0)
reg_mat44_disp(&sourceImage->sto_xyz, "[VERBOSE] Source image matrix (sform sto_xyz)");
else reg_mat44_disp(&sourceImage->qto_xyz, "[VERBOSE] Source image matrix (qform qto_xyz)");
reg_mat44_disp(&sourceImage->sto_xyz, (char *)"[VERBOSE] Source image matrix (sform sto_xyz)");
else reg_mat44_disp(&sourceImage->qto_xyz, (char *)"[VERBOSE] Source image matrix (qform qto_xyz)");
#endif
printf("* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *\n");
reg_mat44_disp(affineTransformation, (char *)"Initial affine transformation:");
......@@ -633,8 +631,8 @@ int main(int argc, char **argv)
*affineTransformation = reg_mat44_mul( affineTransformation, &(updateAffineMatrix));
#ifdef _VERBOSE
printf("[VERBOSE] -Rigid- iteration %i - ",iteration);
reg_mat44_disp(&updateAffineMatrix, "[VERBOSE] updateMatrix");
reg_mat44_disp(affineTransformation, "[VERBOSE] updated affine");
reg_mat44_disp(&updateAffineMatrix, (char *)"[VERBOSE] updateMatrix");
reg_mat44_disp(affineTransformation, (char *)"[VERBOSE] updated affine");
#endif
if(reg_test_convergence(&updateAffineMatrix)) break;
......@@ -710,8 +708,8 @@ int main(int argc, char **argv)
*affineTransformation = reg_mat44_mul( affineTransformation, &(updateAffineMatrix));
#ifdef _VERBOSE
printf("[VERBOSE] iteration %i - ",iteration);
reg_mat44_disp(&updateAffineMatrix, "[VERBOSE] updateMatrix");
reg_mat44_disp(affineTransformation, "[VERBOSE] updated affine");
reg_mat44_disp(&updateAffineMatrix, (char *)"[VERBOSE] updateMatrix");
reg_mat44_disp(affineTransformation, (char *)"[VERBOSE] updated affine");
#endif
if(reg_test_convergence(&updateAffineMatrix)) break;
iteration++;
......
......@@ -397,7 +397,7 @@ int main(int argc, char **argv)
return 1;
}
if(sourceHeader->nz=1) flag->twoDimRegistration=1;
if(sourceHeader->nz==1) flag->twoDimRegistration=1;
/* Check the source background index */
if(!flag->backgroundIndexFlag) param->sourceBGValue = 0.0;
......@@ -460,7 +460,7 @@ int main(int argc, char **argv)
flag->affineFlirtFlag);
}
#ifdef _VERBOSE
reg_mat44_disp(affineTransformation, "[VERBOSE] Affine transformation matrix");
reg_mat44_disp(affineTransformation, (char *)"[VERBOSE] Affine transformation matrix");
#endif
}
......@@ -621,7 +621,7 @@ int main(int argc, char **argv)
nifti_image_free(tempMaskImage);
}
else{
for(int i=0; i<targetImage->nvox; i++)
for(unsigned int i=0; i<targetImage->nvox; i++)
targetMask[i]=i;
activeVoxelNumber=targetImage->nvox;
}
......@@ -792,10 +792,10 @@ int main(int argc, char **argv)
printf("\t%gx%gx%g mm\n",controlPointImage->dx,controlPointImage->dy,controlPointImage->dz);
#ifdef _VERBOSE
if(targetImage->sform_code>0)
reg_mat44_disp(&targetImage->sto_xyz, "[VERBOSE] Target image matrix");
else reg_mat44_disp(&targetImage->qto_xyz, "[VERBOSE] Target image matrix");
reg_mat44_disp(sourceMatrix_xyz, "[VERBOSE] Source image matrix");
reg_mat44_disp(cppMatrix_xyz, "[VERBOSE] Control point image matrix");
reg_mat44_disp(&targetImage->sto_xyz, (char *)"[VERBOSE] Target image matrix");
else reg_mat44_disp(&targetImage->qto_xyz, (char *)"[VERBOSE] Target image matrix");
reg_mat44_disp(sourceMatrix_xyz, (char *)"[VERBOSE] Source image matrix");
reg_mat44_disp(cppMatrix_xyz, (char *)"[VERBOSE] Control point image matrix");
#endif
printf("* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *\n");
......
......@@ -181,11 +181,11 @@ void reg_tool_ReadAffineFile( mat44 *mat,
absoluteTarget.m[3][3]=absoluteSource.m[3][3]=1.0;
#ifdef _VERBOSE
printf("[VERBOSE] An flirt affine file is assumed and is converted to a real word affine matrix\n");
reg_mat44_disp(mat, "[VERBOSE] Matrix read from the input file");
reg_mat44_disp(targetMatrix, "[VERBOSE] Target Matrix");
reg_mat44_disp(sourceMatrix, "[VERBOSE] Source Matrix");
reg_mat44_disp(&(absoluteTarget), "[VERBOSE] Target absolute Matrix");
reg_mat44_disp(&(absoluteSource), "[VERBOSE] Source absolute Matrix");
reg_mat44_disp(mat, (char *)"[VERBOSE] Matrix read from the input file");
reg_mat44_disp(targetMatrix, (char *)"[VERBOSE] Target Matrix");
reg_mat44_disp(sourceMatrix, (char *)"[VERBOSE] Source Matrix");
reg_mat44_disp(&(absoluteTarget), (char *)"[VERBOSE] Target absolute Matrix");
reg_mat44_disp(&(absoluteSource), (char *)"[VERBOSE] Source absolute Matrix");
#endif
absoluteSource = nifti_mat44_inverse(absoluteSource);
......@@ -199,7 +199,7 @@ void reg_tool_ReadAffineFile( mat44 *mat,
}
#ifdef _VERBOSE
reg_mat44_disp(mat, "[VERBOSE] Affine matrix");
reg_mat44_disp(mat, (char *)"[VERBOSE] Affine matrix");
#endif
}
/* *************************************************************** */
......
......@@ -812,7 +812,7 @@ PrecisionTYPE reg_bspline_bendingEnergyApproxValue2D( nifti_image *splineContr
int coord=0;
PrecisionTYPE constraintValue=0.0;
PrecisionTYPE basisXX[9], basisYY[9], basisZZ[9], basisXY[9], basisYZ[9], basisXZ[9];
PrecisionTYPE basisXX[9], basisYY[9], basisXY[9];
coord=0;
for(int b=0; b<3; b++){
......@@ -1803,7 +1803,7 @@ void reg_bspline_bendingEnergyGradient2D( nifti_image *splineControlPoint,
int coord;
// There are six different values taken into account
PrecisionTYPE basisXX[9], basisYY[9], basisZZ[9], basisXY[9], basisYZ[9], basisXZ[9];
PrecisionTYPE basisXX[9], basisYY[9], basisXY[9];
coord=0;
for(int b=0; b<3; b++){
......@@ -1824,7 +1824,6 @@ void reg_bspline_bendingEnergyGradient2D( nifti_image *splineControlPoint,
PrecisionTYPE xControlPointCoordinates[27];
PrecisionTYPE yControlPointCoordinates[27];
PrecisionTYPE zControlPointCoordinates[27];
for(int y=1;y<splineControlPoint->ny-1;y++){
derivativeValuesPtr = &derivativeValues[12*(y*splineControlPoint->nx+1)];
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment