Skip to content

Commit

Permalink
fix vc warnings
Browse files Browse the repository at this point in the history 
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@14508 c8812cc2-4d05-0410-92ff-de0c093fc19c
  • Loading branch information
jef committed Nov 4, 2010
1 parent 6f7786d commit 974773d
Show file tree
Hide file tree
Showing 2 changed files with 65 additions and 66 deletions.
3 changes: 1 addition & 2 deletions src/analysis/raster/qgsrastercalculator.cpp
View file
Expand Up @@ -84,7 +84,6 @@ int QgsRasterCalculator::processCalculation( QProgressDialog* p )
}
GDALDatasetH outputDataset = openOutputFile( outputDriver );
GDALRasterBandH outputRasterBand = GDALGetRasterBand( outputDataset, 1 );
int nodataSuccess;

float outputNodataValue = -FLT_MAX;
GDALSetRasterNoDataValue( outputRasterBand, outputNodataValue );
Expand Down Expand Up @@ -127,7 +126,7 @@ int QgsRasterCalculator::processCalculation( QProgressDialog* p )
bool resultIsNumber = resultMatrix.isNumber();
float* calcData;

if( resultIsNumber ) //scalar result. Insert number for every pixel
if( resultIsNumber ) //scalar result. Insert number for every pixel
{
calcData = new float[mNumOutputColumns];
for( int j = 0; j < mNumOutputColumns; ++j )
Expand Down
128 changes: 64 additions & 64 deletions src/analysis/raster/qgsrastermatrix.cpp
View file
Expand Up @@ -178,32 +178,32 @@ bool QgsRasterMatrix::oneArgumentOperation( OneArgOperator op )
switch( op )
{
case opSQRT:
if( value < 0 ) //no complex numbers
if( value < 0 ) //no complex numbers
{
mData[i] = mNodataValue;
mData[i] = static_cast<float>( mNodataValue );
}
else
{
mData[i] = sqrt( value );
mData[i] = static_cast<float>( sqrt( value ) );
}
break;
case opSIN:
mData[i] = sin( value );
mData[i] = static_cast<float>( sin( value ) );
break;
case opCOS:
mData[i] = cos( value );
mData[i] = static_cast<float>( cos( value ) );
break;
case opTAN:
mData[i] = tan( value );
mData[i] = static_cast<float>( tan( value ) );
break;
case opASIN:
mData[i] = asin( value );
mData[i] = static_cast<float>( asin( value ) );
break;
case opACOS:
mData[i] = acos( value );
mData[i] = static_cast<float>( acos( value ) );
break;
case opATAN:
mData[i] = atan( value );
mData[i] = static_cast<float>( atan( value ) );
break;
}
}
Expand All @@ -218,57 +218,57 @@ bool QgsRasterMatrix::twoArgumentOperation( TwoArgOperator op, const QgsRasterMa
//operations with nodata values always generate nodata
if( mData[0] == mNodataValue || other.number() == other.nodataValue() )
{
mData[0] = mNodataValue;
mData[0] = static_cast<float>( mNodataValue );
return true;
}
switch( op )
{
case opPLUS:
mData[0] = number() + other.number();
mData[0] = static_cast<float>( number() + other.number() );
break;
case opMINUS:
mData[0] = number() - other.number();
mData[0] = static_cast<float>( number() - other.number() );
break;
case opMUL:
mData[0] = number() * other.number();
mData[0] = static_cast<float>( number() * other.number() );
break;
case opDIV:
if( other.number() == 0 )
{
mData[0] = mNodataValue;
mData[0] = static_cast<float>( mNodataValue );
}
else
{
mData[0] = number() / other.number();
mData[0] = static_cast<float>( number() / other.number() );
}
break;
case opPOW:
if( !testPowerValidity( mData[0], ( float ) other.number() ) )
{
mData[0] = mNodataValue;
mData[0] = static_cast<float>( mNodataValue );
}
else
{
mData[0] = pow( mData[0], ( float ) other.number() );
}
break;
case opEQ:
mData[0] = ( mData[0] == other.number() ? 1 : 0 );
mData[0] = mData[0] == other.number() ? 1.0f : 0.0f;
break;
case opNE:
mData[0] = ( mData[0] == other.number() ? 0 : 1 );
mData[0] = mData[0] == other.number() ? 0.0f : 1.0f;
break;
case opGT:
mData[0] = ( mData[0] > other.number() ? 1 : 0 );
mData[0] = mData[0] > other.number() ? 1.0f : 0.0f;
break;
case opLT:
mData[0] = ( mData[0] < other.number() ? 1 : 0 );
mData[0] = mData[0] < other.number() ? 1.0f : 0.0f;
break;
case opGE:
mData[0] = ( mData[0] >= other.number() ? 1 : 0 );
mData[0] = mData[0] >= other.number() ? 1.0f : 0.0f;
break;
case opLE:
mData[0] = ( mData[0] <= other.number() ? 1 : 0 );
mData[0] = mData[0] <= other.number() ? 1.0f : 0.0f;
break;
}
return true;
Expand All @@ -286,58 +286,58 @@ bool QgsRasterMatrix::twoArgumentOperation( TwoArgOperator op, const QgsRasterMa
value1 = mData[i]; value2 = matrix[i];
if( value1 == mNodataValue || value2 == other.mNodataValue )
{
mData[i] = mNodataValue;
mData[i] = static_cast<float>( mNodataValue );
}
else
{
switch( op )
{
case opPLUS:
mData[i] = value1 + value2;
mData[i] = static_cast<float>( value1 + value2 );
break;
case opMINUS:
mData[i] = value1 - value2;
mData[i] = static_cast<float>( value1 - value2 );
break;
case opMUL:
mData[i] = value1 * value2;
mData[i] = static_cast<float>( value1 * value2 );
break;
case opDIV:
if( value2 == 0 )
{
mData[i] = mNodataValue;
mData[i] = static_cast<float>( mNodataValue );
}
else
{
mData[i] = value1 / value2;
mData[i] = static_cast<float>( value1 / value2 );
}
break;
case opPOW:
if( !testPowerValidity( value1, value2 ) )
{
mData[i] = mNodataValue;
mData[i] = static_cast<float>( mNodataValue );
}
else
{
mData[i] = pow( value1, value2 );
mData[i] = static_cast<float>( pow( value1, value2 ) );
}
break;
case opEQ:
mData[i] = ( value1 == value2 ? 1 : 0 );
mData[i] = value1 == value2 ? 1.0f : 0.0f;
break;
case opNE:
mData[i] = ( value1 == value2 ? 0 : 1 );
mData[i] = value1 == value2 ? 0.0f : 1.0f;
break;
case opGT:
mData[i] = ( value1 > value2 ? 1 : 0 );
mData[i] = value1 > value2 ? 1.0f : 0.0f;
break;
case opLT:
mData[i] = ( value1 < value2 ? 1 : 0 );
mData[i] = value1 < value2 ? 1.0f : 0.0f;
break;
case opGE:
mData[i] = ( value1 >= value2 ? 1 : 0 );
mData[i] = value1 >= value2 ? 1.0f : 0.0f;
break;
case opLE:
mData[i] = ( value1 <= value2 ? 1 : 0 );
mData[i] = value1 <= value2 ? 1.0f : 0.0f;
break;
}
}
Expand All @@ -359,7 +359,7 @@ bool QgsRasterMatrix::twoArgumentOperation( TwoArgOperator op, const QgsRasterMa
{
for( int i = 0; i < nEntries; ++i )
{
mData[i] = mNodataValue;
mData[i] = static_cast<float>( mNodataValue );
}
return true;
}
Expand All @@ -368,58 +368,58 @@ bool QgsRasterMatrix::twoArgumentOperation( TwoArgOperator op, const QgsRasterMa
{
if( matrix[i] == other.mNodataValue )
{
mData[i] = mNodataValue;
mData[i] = static_cast<float>( mNodataValue );
continue;
}

switch( op )
{
case opPLUS:
mData[i] = value + matrix[i];
mData[i] = static_cast<float>( value + matrix[i] );
break;
case opMINUS:
mData[i] = value - matrix[i];
mData[i] = static_cast<float>( value - matrix[i] );
break;
case opMUL:
mData[i] = value * matrix[i];
mData[i] = static_cast<float>( value * matrix[i] );
break;
case opDIV:
if( matrix[i] == 0 )
{
mData[i] = mNodataValue;
mData[i] = static_cast<float>( mNodataValue );
}
else
{
mData[i] = value / matrix[i];
mData[i] = static_cast<float>( value / matrix[i] );
}
break;
case opPOW:
if( !testPowerValidity( value, matrix[i] ) )
{
mData[i] = mNodataValue;
mData[i] = static_cast<float>( mNodataValue );
}
else
{
mData[i] = pow(( float ) value, matrix[i] );
mData[i] = pow( static_cast<float>( value ), matrix[i] );
}
break;
case opEQ:
mData[i] = ( value == matrix[i] ? 1 : 0 );
mData[i] = value == matrix[i] ? 1.0f : 0.0f;
break;
case opNE:
mData[i] = ( value == matrix[i] ? 0 : 1 );
mData[i] = value == matrix[i] ? 0.0f : 1.0f;
break;
case opGT:
mData[i] = ( value > matrix[i] ? 1 : 0 );
mData[i] = value > matrix[i] ? 1.0f : 0.0f;
break;
case opLT:
mData[i] = ( value < matrix[i] ? 1 : 0 );
mData[i] = value < matrix[i] ? 1.0f : 0.0f;
break;
case opGE:
mData[i] = ( value >= matrix[i] ? 1 : 0 );
mData[i] = value >= matrix[i] ? 1.0f : 0.0f;
break;
case opLE:
mData[i] = ( value <= matrix[i] ? 1 : 0 );
mData[i] = value <= matrix[i] ? 1.0f : 0.0f;
break;
}
}
Expand All @@ -434,7 +434,7 @@ bool QgsRasterMatrix::twoArgumentOperation( TwoArgOperator op, const QgsRasterMa
{
for( int i = 0; i < nEntries; ++i )
{
mData[i] = mNodataValue;
mData[i] = static_cast<float>( mNodataValue );
}
return true;
}
Expand All @@ -449,51 +449,51 @@ bool QgsRasterMatrix::twoArgumentOperation( TwoArgOperator op, const QgsRasterMa
switch( op )
{
case opPLUS:
mData[i] = mData[i] + value;
mData[i] = static_cast<float>( mData[i] + value );
break;
case opMINUS:
mData[i] = mData[i] - value;
mData[i] = static_cast<float>( mData[i] - value );
break;
case opMUL:
mData[i] = mData[i] * value;
mData[i] = static_cast<float>( mData[i] * value );
break;
case opDIV:
if( value == 0 )
{
mData[i] = mNodataValue;
mData[i] = static_cast<float>( mNodataValue );
}
else
{
mData[i] = mData[i] / value;
mData[i] = static_cast<float>( mData[i] / value );
}
break;
case opPOW:
if( !testPowerValidity( mData[i], value ) )
{
mData[i] = mNodataValue;
mData[i] = static_cast<float>( mNodataValue );
}
else
{
mData[i] = pow( mData[i], ( float ) value );
}
break;
case opEQ:
mData[i] = ( mData[i] == value ? 1 : 0 );
mData[i] = mData[i] == value ? 1.0f : 0.0f;
break;
case opNE:
mData[i] = ( mData[i] == value ? 0 : 1 );
mData[i] = mData[i] == value ? 0.0f : 1.0f;
break;
case opGT:
mData[i] = ( mData[i] > value ? 1 : 0 );
mData[i] = mData[i] > value ? 1.0f : 0.0f;
break;
case opLT:
mData[i] = ( mData[i] < value ? 1 : 0 );
mData[i] = mData[i] < value ? 1.0f : 0.0f;
break;
case opGE:
mData[i] = ( mData[i] >= value ? 1 : 0 );
mData[i] = mData[i] >= value ? 1.0f : 0.0f;
break;
case opLE:
mData[i] = ( mData[i] <= value ? 1 : 0 );
mData[i] = mData[i] <= value ? 1.0f : 0.0f;
break;
}
}
Expand Down

0 comments on commit 974773d

Please sign in to comment.