Skip to content

Commit

Permalink
Fixed VS-2015 compilation warnings because bool treated as int
Browse files Browse the repository at this point in the history
  • Loading branch information
Richard Whitehead committed Mar 29, 2018
1 parent 94e3b16 commit 9c29a48
Show file tree
Hide file tree
Showing 6 changed files with 41 additions and 41 deletions.
4 changes: 2 additions & 2 deletions seg-apps/seg_LabFusion.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -506,7 +506,7 @@ int main(int argc, char **argv)
bool * inputMaskPtr=static_cast<bool *>(Mask->data);
for(int i=0; i<tempImgSize; i++)
{
maskcount+=(inputMaskPtr[i]>0)?1:0;
maskcount+=(inputMaskPtr[i])?1:0;
}
}

Expand Down Expand Up @@ -833,7 +833,7 @@ int main(int argc, char **argv)
{
LabFusion.Turn_MRF_ON(MRF_strength);
}
if(PropUpdate>0.0f)
if(PropUpdate)
{
LabFusion.Turn_Prop_Update_ON();
}
Expand Down
16 changes: 8 additions & 8 deletions seg-lib/_seg_EM.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -272,7 +272,7 @@ void seg_EM::SetMaskImage(nifti_image *_r)
this->numElementsMasked=0;
for(int i=0; i<this->numElements; i++,MaskDataPtr++)
{
if((*MaskDataPtr)>0)
if((*MaskDataPtr))
{
this->numElementsMasked++;
}
Expand Down Expand Up @@ -796,7 +796,7 @@ void seg_EM::InitializeMeansUsingIntensity()

for(int i=0; i<this->numElements; i++)
{
if(this->maskImageStatus==0 || MaskDataPtr[i]>0)
if(this->maskImageStatus==0 || MaskDataPtr[i])
{
mycounter++;
meanval+=(Intensity_PTR[i+ms*this->numElements]);
Expand All @@ -806,7 +806,7 @@ void seg_EM::InitializeMeansUsingIntensity()

for(int i=0; i<this->numElements; i++)
{
if(this->maskImageStatus==0 || MaskDataPtr[i]>0 )
if(this->maskImageStatus==0 || MaskDataPtr[i] )
{
variance+=pow((meanval-Intensity_PTR[i+ms*this->numElements]),2);
}
Expand All @@ -824,7 +824,7 @@ void seg_EM::InitializeMeansUsingIntensity()

for(int i=0; i<this->numElements; i++)
{
if(this->maskImageStatus==0 || MaskDataPtr[i]>0)
if(this->maskImageStatus==0 || MaskDataPtr[i])
{
if(tmpmax<(int)(Intensity_PTR[i+ms*this->numElements]))
{
Expand All @@ -839,7 +839,7 @@ void seg_EM::InitializeMeansUsingIntensity()

for(int i=0; i<this->numElements; i++)
{
if(this->maskImageStatus==0 || MaskDataPtr[i]>0)
if(this->maskImageStatus==0 || MaskDataPtr[i])
{

int index4hist=(int)(1000.0f*(segPrecisionTYPE)(Intensity_PTR[i+ms*this->numElements]-tmpmin)/(segPrecisionTYPE)(tmpmax-tmpmin));
Expand Down Expand Up @@ -976,7 +976,7 @@ void seg_EM::CreateShort2LongMatrix()
bool * Maskptrtmp = Maskptr;
for (int i=0; i<numel; i++, Maskptrtmp++)
{
(*Maskptrtmp)>0?numel_masked++:0;
(*Maskptrtmp)?numel_masked++:0;
}
this->numElementsMasked=numel_masked;

Expand All @@ -987,7 +987,7 @@ void seg_EM::CreateShort2LongMatrix()
int tempindex=0;
for (int i=0; i<numel; i++)
{
if ((*Maskptrtmp)>0)
if (*Maskptrtmp)
{
Short_2_Long_Indices_PTR[tempindex]=i;
tempindex++;
Expand Down Expand Up @@ -1026,7 +1026,7 @@ void seg_EM::CreateLong2ShortMatrix()
int tempindex=0;
for (int i=0; i<numel; i++,Maskptrtmp++,Long_2_Short_Indices_PTR++)
{
if ((*Maskptrtmp)>0)
if (*Maskptrtmp)
{
(*Long_2_Short_Indices_PTR)=tempindex;
tempindex++;
Expand Down
6 changes: 3 additions & 3 deletions seg-lib/_seg_FMM.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ float * DoubleEuclideanDistance_3D(bool *LablePtr, float * speedptr,
if(speedptr[centre_index]<=0.000001)
speedptr[centre_index]=speedptr[centre_index]+0.000001;
}
if(LablePtr[centre_index]>0.5)
if(LablePtr[centre_index])
{
Labels[centre_index]=0;
GeoTime[centre_index]=0;
Expand Down Expand Up @@ -148,7 +148,7 @@ float * DoubleEuclideanDistance_3D(bool *LablePtr, float * speedptr,
float *GeoTime2= (float *) calloc(NumElements, sizeof(float));
for(centre_index=0; centre_index<NumElements; centre_index++)
{
if(LablePtr[centre_index]<0.5)
if(!LablePtr[centre_index])
{
Labels[centre_index]=0;
GeoTime2[centre_index]=0;
Expand Down Expand Up @@ -223,7 +223,7 @@ float * DoubleEuclideanDistance_3D(bool *LablePtr, float * speedptr,

for(centre_index=0; centre_index<NumElements; centre_index++)
{
GeoTime[centre_index]=LablePtr[centre_index]<0.5?(-1*GeoTime[centre_index]):(GeoTime2[centre_index]);
GeoTime[centre_index]=LablePtr[centre_index]?(-1*GeoTime[centre_index]):(GeoTime2[centre_index]);
}

centre_index=0;
Expand Down
2 changes: 1 addition & 1 deletion seg-lib/_seg_LabFusion.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ int seg_LabFusion::SetMask(nifti_image *Mask)
this->sizeAfterMaskingAndUncertainty=0;
for(long i=0; i<(this->numel); i++)
{
if(inputMaskPtr[i]>0)
if(inputMaskPtr[i])
{
this->maskAndUncertainIndeces[i]=this->sizeAfterMaskingAndUncertainty;
this->sizeAfterMaskingAndUncertainty++;
Expand Down
24 changes: 12 additions & 12 deletions seg-lib/_seg_LoAd.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -470,7 +470,7 @@ int Normalize_NaN_Priors(nifti_image * Priors,
register int numel = Priors->nx*Priors->ny*Priors->nz;
register int ups=0;
register int good=0;
if(verbose>0)
if(verbose)
{
cout<< "Normalizing Priors" << endl;
}
Expand Down Expand Up @@ -516,7 +516,7 @@ int Normalize_NaN_Priors(nifti_image * Priors,

}

if(verbose>0)
if(verbose)
{
cout<<"Priors: "<< good<<" good voxels and "<<ups<<" bad voxels" << endl;
flush(cout);
Expand Down Expand Up @@ -556,7 +556,7 @@ int Normalize_NaN_Priors_mask(nifti_image * Priors,
register int numel = Mask->nx*Mask->ny*Mask->nz;
register int ups=0;
register int good=0;
if(verbose>0)
if(verbose)
{
cout<< "Normalizing Priors" << endl;
}
Expand Down Expand Up @@ -625,7 +625,7 @@ int Normalize_NaN_Priors_mask(nifti_image * Priors,

}

if(verbose>0)
if(verbose)
{
cout<<"Priors: "<< good<<" good voxels and "<<ups<<" bad voxels" << endl;
flush(cout);
Expand All @@ -644,7 +644,7 @@ int Normalize_Image_mask(nifti_image * input,
{
seg_changeDatatype<float>(input);
}
if(verbose>0)
if(verbose)
{
cout<< "Normalizing Input Image" << endl;
}
Expand Down Expand Up @@ -682,7 +682,7 @@ int Normalize_Image_mask(nifti_image * input,
}
CurrSizes->rescale_max[udir]=tempmax;
CurrSizes->rescale_min[udir]=tempmin;
if(verbose>0)
if(verbose)
{
cout << "Normalization["<<udir<<"] = ["<<tempmin<<","<<tempmax<<"]"<<endl;
}
Expand Down Expand Up @@ -718,7 +718,7 @@ int Normalize_Image(nifti_image * input,
{
seg_changeDatatype<float>(input);
}
if(verbose>0)
if(verbose)
{
cout<< "Normalizing Input Image" << endl;
}
Expand Down Expand Up @@ -834,7 +834,7 @@ int * Create_Short_2_Long_Matrix_from_NII(nifti_image * Mask,
bool * Maskptrtmp = Maskptr;
for (int i=0; i<numel; i++, Maskptrtmp++)
{
(*Maskptrtmp)>0?numel_masked++:0;
(*Maskptrtmp)?numel_masked++:0;
}
shortsize[0]=numel_masked;

Expand All @@ -845,7 +845,7 @@ int * Create_Short_2_Long_Matrix_from_NII(nifti_image * Mask,
int tempindex=0;
for (int i=0; i<numel; i++)
{
if ((*Maskptrtmp)>0)
if (*Maskptrtmp)
{
Short_2_Long_Indices_PTR[tempindex]=i;
tempindex++;
Expand Down Expand Up @@ -876,7 +876,7 @@ int * Create_Long_2_Short_Matrix_from_NII(nifti_image * Mask)
int tempindex=0;
for (int i=0; i<numel; i++,Maskptrtmp++,Long_2_Short_Indices_PTR++)
{
if ((*Maskptrtmp)>0)
if (*Maskptrtmp)
{
(*Long_2_Short_Indices_PTR)=tempindex;
tempindex++;
Expand Down Expand Up @@ -914,7 +914,7 @@ int * Create_Short_2_Long_Matrix_from_Carray(bool * Mask,
int tempindex=0;
for (int i=0; i<numel; i++)
{
if ((Mask[i])>0)
if (Mask[i])
{
Short_2_Long_Indices_PTR[tempindex]=i;
tempindex++;
Expand All @@ -933,7 +933,7 @@ int * Create_Long_2_Short_Matrix_from_Carray(bool * Mask,
int tempindex=0;
for (int i=0; i<nvox; i++,Long_2_Short_Indices_PTR++)
{
if ((Mask[i])>0)
if (Mask[i])
{
(*Long_2_Short_Indices_PTR)=tempindex;
tempindex++;
Expand Down
30 changes: 15 additions & 15 deletions seg-lib/_seg_tools.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -949,7 +949,7 @@ float estimateNCC3D(nifti_image * BaseImage,nifti_image * Template,nifti_image *
if(Templateptr[i]!=Templateptr[i] || BaseImageptr[i]!=BaseImageptr[i]){
Maskptr[i]=0;
}
Maskcount+=(float)(Maskptr[i]>0);
Maskcount+=(float)(Maskptr[i]);
}
}

Expand Down Expand Up @@ -2428,7 +2428,7 @@ void LTS_Vecs(float * Y, float * X,int * mask, float percentOutliers,int maxNumb

for(unsigned int i=0; i<size; i++)
{
if(mask==NULL || (mask!=NULL && mask[i]==true))
if(mask==NULL || (mask!=NULL && mask[i]!=0))
{
if( distance_threshold > fabs(Y[i]-Aval*X[i]+Bval) )
{
Expand All @@ -2451,7 +2451,7 @@ void LTS_Vecs(float * Y, float * X,int * mask, float percentOutliers,int maxNumb
int indexmask=0;
for(unsigned int i=0; i<size; i++)
{
if(mask==NULL || (mask!=NULL && mask[i]==true))
if(mask==NULL || (mask!=NULL && mask[i]!=0))
{
distance[indexmask]=fabs(Y[i]-Aval*X[i]+Bval);
maxdistance=(maxdistance<distance[indexmask])?distance[indexmask]:maxdistance;
Expand Down Expand Up @@ -2531,7 +2531,7 @@ void LS_Vecs(float * Y, float * X,int * mask, unsigned int size, float *a, float
float sizefloat=0;
for(unsigned int i=0; i<size; i++)
{
if(mask==NULL || (mask!=NULL && mask[i]==true))
if(mask==NULL || (mask!=NULL && mask[i]!=0))
{
sumX+=X[i];
sumY+=Y[i];
Expand Down Expand Up @@ -3776,7 +3776,7 @@ bool isSimplePoint(bool * SimplePointTestBlock){
{
for(int x=0; x<3; x++)
{
if(SimplePointTestBlock[index]>0){
if(SimplePointTestBlock[index]){
CounterBlock[index]=CCcounter;
CCcounter++;
index++;
Expand Down Expand Up @@ -3813,30 +3813,30 @@ bool isSimplePoint(bool * SimplePointTestBlock){
{
for(int x=1; x<3; x++)
{
if(SimplePointTestBlock[index]>0 && CClist[CounterBlock[index]]>0)
if(SimplePointTestBlock[index] && CClist[CounterBlock[index]])
{
tempmin=CClist[CounterBlock[index]];

for(int deltaZ=-1; deltaZ<=1; deltaZ+=2)
{
currindex=index+deltaZ*9;
if(SimplePointTestBlock[currindex]>0 && tempmin>CClist[CounterBlock[currindex]])
if(SimplePointTestBlock[currindex] && tempmin>CClist[CounterBlock[currindex]])
{
tempmin=CClist[CounterBlock[currindex]];
}
}
for(int deltaY=-1; deltaY<=1; deltaY+=2)
{
currindex=index+deltaY*3;
if(SimplePointTestBlock[currindex]>0 && tempmin>CClist[CounterBlock[currindex]])
if(SimplePointTestBlock[currindex] && tempmin>CClist[CounterBlock[currindex]])
{
tempmin=CClist[CounterBlock[currindex]];
}
}
for(int deltaX=-1; deltaX<=1; deltaX+=2)
{
currindex=index+deltaX;
if(SimplePointTestBlock[currindex]>0 && tempmin>CClist[CounterBlock[currindex]])
if(SimplePointTestBlock[currindex] && tempmin>CClist[CounterBlock[currindex]])
{
tempmin=CClist[CounterBlock[currindex]];
}
Expand Down Expand Up @@ -3874,7 +3874,7 @@ bool isSimplePoint(bool * SimplePointTestBlock){
{
SimplePointTestBlockMod[index]=(z==1 && y==1 && x==1)?0:SimplePointTestBlock[index];

if(SimplePointTestBlockMod[index]>0){
if(SimplePointTestBlockMod[index]){
CounterBlock[index]=CCcounter;
CCcounter++;
index++;
Expand Down Expand Up @@ -3909,30 +3909,30 @@ bool isSimplePoint(bool * SimplePointTestBlock){
{
for(int x=1; x<3; x++)
{
if(SimplePointTestBlockMod[index]>0 && CClist[CounterBlock[index]]>0)
if(SimplePointTestBlockMod[index] && CClist[CounterBlock[index]])
{
tempmin=CClist[CounterBlock[index]];

for(int deltaZ=-1; deltaZ<=1; deltaZ+=2)
{
currindex=index+deltaZ*9;
if(SimplePointTestBlockMod[currindex]>0 && tempmin>CClist[CounterBlock[currindex]])
if(SimplePointTestBlockMod[currindex] && tempmin>CClist[CounterBlock[currindex]])
{
tempmin=CClist[CounterBlock[currindex]];
}
}
for(int deltaY=-1; deltaY<=1; deltaY+=2)
{
currindex=index+deltaY*3;
if(SimplePointTestBlockMod[currindex]>0 && tempmin>CClist[CounterBlock[currindex]])
if(SimplePointTestBlockMod[currindex] && tempmin>CClist[CounterBlock[currindex]])
{
tempmin=CClist[CounterBlock[currindex]];
}
}
for(int deltaX=-1; deltaX<=1; deltaX+=2)
{
currindex=index+deltaX;
if(SimplePointTestBlockMod[currindex]>0 && tempmin>CClist[CounterBlock[currindex]])
if(SimplePointTestBlockMod[currindex] && tempmin>CClist[CounterBlock[currindex]])
{
tempmin=CClist[CounterBlock[currindex]];
}
Expand Down Expand Up @@ -4108,7 +4108,7 @@ int direction)
{
for(xyzpos[0]=0; xyzpos[0]<dimensions[0]; xyzpos[0]++)
{
if(Image[index]>0)
if(Image[index])
{
tmpvalue=true;
if(direction>0)
Expand Down

0 comments on commit 9c29a48

Please sign in to comment.