Skip to content

Commit 974773d

Browse files
author
jef
committedNov 4, 2010
fix vc warnings
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@14508 c8812cc2-4d05-0410-92ff-de0c093fc19c
·
final-1_7_1final-1_7_0
1 parent 6f7786d commit 974773d

File tree

2 files changed

+65
-66
lines changed

2 files changed

+65
-66
lines changed
 

‎src/analysis/raster/qgsrastercalculator.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,6 @@ int QgsRasterCalculator::processCalculation( QProgressDialog* p )
8484
}
8585
GDALDatasetH outputDataset = openOutputFile( outputDriver );
8686
GDALRasterBandH outputRasterBand = GDALGetRasterBand( outputDataset, 1 );
87-
int nodataSuccess;
8887

8988
float outputNodataValue = -FLT_MAX;
9089
GDALSetRasterNoDataValue( outputRasterBand, outputNodataValue );
@@ -127,7 +126,7 @@ int QgsRasterCalculator::processCalculation( QProgressDialog* p )
127126
bool resultIsNumber = resultMatrix.isNumber();
128127
float* calcData;
129128

130-
if( resultIsNumber ) //scalar result. Insert number for every pixel
129+
if( resultIsNumber ) //scalar result. Insert number for every pixel
131130
{
132131
calcData = new float[mNumOutputColumns];
133132
for( int j = 0; j < mNumOutputColumns; ++j )

‎src/analysis/raster/qgsrastermatrix.cpp

Lines changed: 64 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -178,32 +178,32 @@ bool QgsRasterMatrix::oneArgumentOperation( OneArgOperator op )
178178
switch( op )
179179
{
180180
case opSQRT:
181-
if( value < 0 ) //no complex numbers
181+
if( value < 0 ) //no complex numbers
182182
{
183-
mData[i] = mNodataValue;
183+
mData[i] = static_cast<float>( mNodataValue );
184184
}
185185
else
186186
{
187-
mData[i] = sqrt( value );
187+
mData[i] = static_cast<float>( sqrt( value ) );
188188
}
189189
break;
190190
case opSIN:
191-
mData[i] = sin( value );
191+
mData[i] = static_cast<float>( sin( value ) );
192192
break;
193193
case opCOS:
194-
mData[i] = cos( value );
194+
mData[i] = static_cast<float>( cos( value ) );
195195
break;
196196
case opTAN:
197-
mData[i] = tan( value );
197+
mData[i] = static_cast<float>( tan( value ) );
198198
break;
199199
case opASIN:
200-
mData[i] = asin( value );
200+
mData[i] = static_cast<float>( asin( value ) );
201201
break;
202202
case opACOS:
203-
mData[i] = acos( value );
203+
mData[i] = static_cast<float>( acos( value ) );
204204
break;
205205
case opATAN:
206-
mData[i] = atan( value );
206+
mData[i] = static_cast<float>( atan( value ) );
207207
break;
208208
}
209209
}
@@ -218,57 +218,57 @@ bool QgsRasterMatrix::twoArgumentOperation( TwoArgOperator op, const QgsRasterMa
218218
//operations with nodata values always generate nodata
219219
if( mData[0] == mNodataValue || other.number() == other.nodataValue() )
220220
{
221-
mData[0] = mNodataValue;
221+
mData[0] = static_cast<float>( mNodataValue );
222222
return true;
223223
}
224224
switch( op )
225225
{
226226
case opPLUS:
227-
mData[0] = number() + other.number();
227+
mData[0] = static_cast<float>( number() + other.number() );
228228
break;
229229
case opMINUS:
230-
mData[0] = number() - other.number();
230+
mData[0] = static_cast<float>( number() - other.number() );
231231
break;
232232
case opMUL:
233-
mData[0] = number() * other.number();
233+
mData[0] = static_cast<float>( number() * other.number() );
234234
break;
235235
case opDIV:
236236
if( other.number() == 0 )
237237
{
238-
mData[0] = mNodataValue;
238+
mData[0] = static_cast<float>( mNodataValue );
239239
}
240240
else
241241
{
242-
mData[0] = number() / other.number();
242+
mData[0] = static_cast<float>( number() / other.number() );
243243
}
244244
break;
245245
case opPOW:
246246
if( !testPowerValidity( mData[0], ( float ) other.number() ) )
247247
{
248-
mData[0] = mNodataValue;
248+
mData[0] = static_cast<float>( mNodataValue );
249249
}
250250
else
251251
{
252252
mData[0] = pow( mData[0], ( float ) other.number() );
253253
}
254254
break;
255255
case opEQ:
256-
mData[0] = ( mData[0] == other.number() ? 1 : 0 );
256+
mData[0] = mData[0] == other.number() ? 1.0f : 0.0f;
257257
break;
258258
case opNE:
259-
mData[0] = ( mData[0] == other.number() ? 0 : 1 );
259+
mData[0] = mData[0] == other.number() ? 0.0f : 1.0f;
260260
break;
261261
case opGT:
262-
mData[0] = ( mData[0] > other.number() ? 1 : 0 );
262+
mData[0] = mData[0] > other.number() ? 1.0f : 0.0f;
263263
break;
264264
case opLT:
265-
mData[0] = ( mData[0] < other.number() ? 1 : 0 );
265+
mData[0] = mData[0] < other.number() ? 1.0f : 0.0f;
266266
break;
267267
case opGE:
268-
mData[0] = ( mData[0] >= other.number() ? 1 : 0 );
268+
mData[0] = mData[0] >= other.number() ? 1.0f : 0.0f;
269269
break;
270270
case opLE:
271-
mData[0] = ( mData[0] <= other.number() ? 1 : 0 );
271+
mData[0] = mData[0] <= other.number() ? 1.0f : 0.0f;
272272
break;
273273
}
274274
return true;
@@ -286,58 +286,58 @@ bool QgsRasterMatrix::twoArgumentOperation( TwoArgOperator op, const QgsRasterMa
286286
value1 = mData[i]; value2 = matrix[i];
287287
if( value1 == mNodataValue || value2 == other.mNodataValue )
288288
{
289-
mData[i] = mNodataValue;
289+
mData[i] = static_cast<float>( mNodataValue );
290290
}
291291
else
292292
{
293293
switch( op )
294294
{
295295
case opPLUS:
296-
mData[i] = value1 + value2;
296+
mData[i] = static_cast<float>( value1 + value2 );
297297
break;
298298
case opMINUS:
299-
mData[i] = value1 - value2;
299+
mData[i] = static_cast<float>( value1 - value2 );
300300
break;
301301
case opMUL:
302-
mData[i] = value1 * value2;
302+
mData[i] = static_cast<float>( value1 * value2 );
303303
break;
304304
case opDIV:
305305
if( value2 == 0 )
306306
{
307-
mData[i] = mNodataValue;
307+
mData[i] = static_cast<float>( mNodataValue );
308308
}
309309
else
310310
{
311-
mData[i] = value1 / value2;
311+
mData[i] = static_cast<float>( value1 / value2 );
312312
}
313313
break;
314314
case opPOW:
315315
if( !testPowerValidity( value1, value2 ) )
316316
{
317-
mData[i] = mNodataValue;
317+
mData[i] = static_cast<float>( mNodataValue );
318318
}
319319
else
320320
{
321-
mData[i] = pow( value1, value2 );
321+
mData[i] = static_cast<float>( pow( value1, value2 ) );
322322
}
323323
break;
324324
case opEQ:
325-
mData[i] = ( value1 == value2 ? 1 : 0 );
325+
mData[i] = value1 == value2 ? 1.0f : 0.0f;
326326
break;
327327
case opNE:
328-
mData[i] = ( value1 == value2 ? 0 : 1 );
328+
mData[i] = value1 == value2 ? 0.0f : 1.0f;
329329
break;
330330
case opGT:
331-
mData[i] = ( value1 > value2 ? 1 : 0 );
331+
mData[i] = value1 > value2 ? 1.0f : 0.0f;
332332
break;
333333
case opLT:
334-
mData[i] = ( value1 < value2 ? 1 : 0 );
334+
mData[i] = value1 < value2 ? 1.0f : 0.0f;
335335
break;
336336
case opGE:
337-
mData[i] = ( value1 >= value2 ? 1 : 0 );
337+
mData[i] = value1 >= value2 ? 1.0f : 0.0f;
338338
break;
339339
case opLE:
340-
mData[i] = ( value1 <= value2 ? 1 : 0 );
340+
mData[i] = value1 <= value2 ? 1.0f : 0.0f;
341341
break;
342342
}
343343
}
@@ -359,7 +359,7 @@ bool QgsRasterMatrix::twoArgumentOperation( TwoArgOperator op, const QgsRasterMa
359359
{
360360
for( int i = 0; i < nEntries; ++i )
361361
{
362-
mData[i] = mNodataValue;
362+
mData[i] = static_cast<float>( mNodataValue );
363363
}
364364
return true;
365365
}
@@ -368,58 +368,58 @@ bool QgsRasterMatrix::twoArgumentOperation( TwoArgOperator op, const QgsRasterMa
368368
{
369369
if( matrix[i] == other.mNodataValue )
370370
{
371-
mData[i] = mNodataValue;
371+
mData[i] = static_cast<float>( mNodataValue );
372372
continue;
373373
}
374374

375375
switch( op )
376376
{
377377
case opPLUS:
378-
mData[i] = value + matrix[i];
378+
mData[i] = static_cast<float>( value + matrix[i] );
379379
break;
380380
case opMINUS:
381-
mData[i] = value - matrix[i];
381+
mData[i] = static_cast<float>( value - matrix[i] );
382382
break;
383383
case opMUL:
384-
mData[i] = value * matrix[i];
384+
mData[i] = static_cast<float>( value * matrix[i] );
385385
break;
386386
case opDIV:
387387
if( matrix[i] == 0 )
388388
{
389-
mData[i] = mNodataValue;
389+
mData[i] = static_cast<float>( mNodataValue );
390390
}
391391
else
392392
{
393-
mData[i] = value / matrix[i];
393+
mData[i] = static_cast<float>( value / matrix[i] );
394394
}
395395
break;
396396
case opPOW:
397397
if( !testPowerValidity( value, matrix[i] ) )
398398
{
399-
mData[i] = mNodataValue;
399+
mData[i] = static_cast<float>( mNodataValue );
400400
}
401401
else
402402
{
403-
mData[i] = pow(( float ) value, matrix[i] );
403+
mData[i] = pow( static_cast<float>( value ), matrix[i] );
404404
}
405405
break;
406406
case opEQ:
407-
mData[i] = ( value == matrix[i] ? 1 : 0 );
407+
mData[i] = value == matrix[i] ? 1.0f : 0.0f;
408408
break;
409409
case opNE:
410-
mData[i] = ( value == matrix[i] ? 0 : 1 );
410+
mData[i] = value == matrix[i] ? 0.0f : 1.0f;
411411
break;
412412
case opGT:
413-
mData[i] = ( value > matrix[i] ? 1 : 0 );
413+
mData[i] = value > matrix[i] ? 1.0f : 0.0f;
414414
break;
415415
case opLT:
416-
mData[i] = ( value < matrix[i] ? 1 : 0 );
416+
mData[i] = value < matrix[i] ? 1.0f : 0.0f;
417417
break;
418418
case opGE:
419-
mData[i] = ( value >= matrix[i] ? 1 : 0 );
419+
mData[i] = value >= matrix[i] ? 1.0f : 0.0f;
420420
break;
421421
case opLE:
422-
mData[i] = ( value <= matrix[i] ? 1 : 0 );
422+
mData[i] = value <= matrix[i] ? 1.0f : 0.0f;
423423
break;
424424
}
425425
}
@@ -434,7 +434,7 @@ bool QgsRasterMatrix::twoArgumentOperation( TwoArgOperator op, const QgsRasterMa
434434
{
435435
for( int i = 0; i < nEntries; ++i )
436436
{
437-
mData[i] = mNodataValue;
437+
mData[i] = static_cast<float>( mNodataValue );
438438
}
439439
return true;
440440
}
@@ -449,51 +449,51 @@ bool QgsRasterMatrix::twoArgumentOperation( TwoArgOperator op, const QgsRasterMa
449449
switch( op )
450450
{
451451
case opPLUS:
452-
mData[i] = mData[i] + value;
452+
mData[i] = static_cast<float>( mData[i] + value );
453453
break;
454454
case opMINUS:
455-
mData[i] = mData[i] - value;
455+
mData[i] = static_cast<float>( mData[i] - value );
456456
break;
457457
case opMUL:
458-
mData[i] = mData[i] * value;
458+
mData[i] = static_cast<float>( mData[i] * value );
459459
break;
460460
case opDIV:
461461
if( value == 0 )
462462
{
463-
mData[i] = mNodataValue;
463+
mData[i] = static_cast<float>( mNodataValue );
464464
}
465465
else
466466
{
467-
mData[i] = mData[i] / value;
467+
mData[i] = static_cast<float>( mData[i] / value );
468468
}
469469
break;
470470
case opPOW:
471471
if( !testPowerValidity( mData[i], value ) )
472472
{
473-
mData[i] = mNodataValue;
473+
mData[i] = static_cast<float>( mNodataValue );
474474
}
475475
else
476476
{
477477
mData[i] = pow( mData[i], ( float ) value );
478478
}
479479
break;
480480
case opEQ:
481-
mData[i] = ( mData[i] == value ? 1 : 0 );
481+
mData[i] = mData[i] == value ? 1.0f : 0.0f;
482482
break;
483483
case opNE:
484-
mData[i] = ( mData[i] == value ? 0 : 1 );
484+
mData[i] = mData[i] == value ? 0.0f : 1.0f;
485485
break;
486486
case opGT:
487-
mData[i] = ( mData[i] > value ? 1 : 0 );
487+
mData[i] = mData[i] > value ? 1.0f : 0.0f;
488488
break;
489489
case opLT:
490-
mData[i] = ( mData[i] < value ? 1 : 0 );
490+
mData[i] = mData[i] < value ? 1.0f : 0.0f;
491491
break;
492492
case opGE:
493-
mData[i] = ( mData[i] >= value ? 1 : 0 );
493+
mData[i] = mData[i] >= value ? 1.0f : 0.0f;
494494
break;
495495
case opLE:
496-
mData[i] = ( mData[i] <= value ? 1 : 0 );
496+
mData[i] = mData[i] <= value ? 1.0f : 0.0f;
497497
break;
498498
}
499499
}

0 commit comments

Comments
 (0)
Please sign in to comment.