@@ -178,32 +178,32 @@ bool QgsRasterMatrix::oneArgumentOperation( OneArgOperator op )
178
178
switch ( op )
179
179
{
180
180
case opSQRT:
181
- if ( value < 0 ) // no complex numbers
181
+ if ( value < 0 ) // no complex numbers
182
182
{
183
- mData [i] = mNodataValue ;
183
+ mData [i] = static_cast < float >( mNodataValue ) ;
184
184
}
185
185
else
186
186
{
187
- mData [i] = sqrt ( value );
187
+ mData [i] = static_cast < float >( sqrt ( value ) );
188
188
}
189
189
break ;
190
190
case opSIN:
191
- mData [i] = sin ( value );
191
+ mData [i] = static_cast < float >( sin ( value ) );
192
192
break ;
193
193
case opCOS:
194
- mData [i] = cos ( value );
194
+ mData [i] = static_cast < float >( cos ( value ) );
195
195
break ;
196
196
case opTAN:
197
- mData [i] = tan ( value );
197
+ mData [i] = static_cast < float >( tan ( value ) );
198
198
break ;
199
199
case opASIN:
200
- mData [i] = asin ( value );
200
+ mData [i] = static_cast < float >( asin ( value ) );
201
201
break ;
202
202
case opACOS:
203
- mData [i] = acos ( value );
203
+ mData [i] = static_cast < float >( acos ( value ) );
204
204
break ;
205
205
case opATAN:
206
- mData [i] = atan ( value );
206
+ mData [i] = static_cast < float >( atan ( value ) );
207
207
break ;
208
208
}
209
209
}
@@ -218,57 +218,57 @@ bool QgsRasterMatrix::twoArgumentOperation( TwoArgOperator op, const QgsRasterMa
218
218
// operations with nodata values always generate nodata
219
219
if ( mData [0 ] == mNodataValue || other.number () == other.nodataValue () )
220
220
{
221
- mData [0 ] = mNodataValue ;
221
+ mData [0 ] = static_cast < float >( mNodataValue ) ;
222
222
return true ;
223
223
}
224
224
switch ( op )
225
225
{
226
226
case opPLUS:
227
- mData [0 ] = number () + other.number ();
227
+ mData [0 ] = static_cast < float >( number () + other.number () );
228
228
break ;
229
229
case opMINUS:
230
- mData [0 ] = number () - other.number ();
230
+ mData [0 ] = static_cast < float >( number () - other.number () );
231
231
break ;
232
232
case opMUL:
233
- mData [0 ] = number () * other.number ();
233
+ mData [0 ] = static_cast < float >( number () * other.number () );
234
234
break ;
235
235
case opDIV:
236
236
if ( other.number () == 0 )
237
237
{
238
- mData [0 ] = mNodataValue ;
238
+ mData [0 ] = static_cast < float >( mNodataValue ) ;
239
239
}
240
240
else
241
241
{
242
- mData [0 ] = number () / other.number ();
242
+ mData [0 ] = static_cast < float >( number () / other.number () );
243
243
}
244
244
break ;
245
245
case opPOW:
246
246
if ( !testPowerValidity ( mData [0 ], ( float ) other.number () ) )
247
247
{
248
- mData [0 ] = mNodataValue ;
248
+ mData [0 ] = static_cast < float >( mNodataValue ) ;
249
249
}
250
250
else
251
251
{
252
252
mData [0 ] = pow ( mData [0 ], ( float ) other.number () );
253
253
}
254
254
break ;
255
255
case opEQ:
256
- mData [0 ] = ( mData [0 ] == other.number () ? 1 : 0 ) ;
256
+ mData [0 ] = mData [0 ] == other.number () ? 1 . 0f : 0 . 0f ;
257
257
break ;
258
258
case opNE:
259
- mData [0 ] = ( mData [0 ] == other.number () ? 0 : 1 ) ;
259
+ mData [0 ] = mData [0 ] == other.number () ? 0 . 0f : 1 . 0f ;
260
260
break ;
261
261
case opGT:
262
- mData [0 ] = ( mData [0 ] > other.number () ? 1 : 0 ) ;
262
+ mData [0 ] = mData [0 ] > other.number () ? 1 . 0f : 0 . 0f ;
263
263
break ;
264
264
case opLT:
265
- mData [0 ] = ( mData [0 ] < other.number () ? 1 : 0 ) ;
265
+ mData [0 ] = mData [0 ] < other.number () ? 1 . 0f : 0 . 0f ;
266
266
break ;
267
267
case opGE:
268
- mData [0 ] = ( mData [0 ] >= other.number () ? 1 : 0 ) ;
268
+ mData [0 ] = mData [0 ] >= other.number () ? 1 . 0f : 0 . 0f ;
269
269
break ;
270
270
case opLE:
271
- mData [0 ] = ( mData [0 ] <= other.number () ? 1 : 0 ) ;
271
+ mData [0 ] = mData [0 ] <= other.number () ? 1 . 0f : 0 . 0f ;
272
272
break ;
273
273
}
274
274
return true ;
@@ -286,58 +286,58 @@ bool QgsRasterMatrix::twoArgumentOperation( TwoArgOperator op, const QgsRasterMa
286
286
value1 = mData [i]; value2 = matrix[i];
287
287
if ( value1 == mNodataValue || value2 == other.mNodataValue )
288
288
{
289
- mData [i] = mNodataValue ;
289
+ mData [i] = static_cast < float >( mNodataValue ) ;
290
290
}
291
291
else
292
292
{
293
293
switch ( op )
294
294
{
295
295
case opPLUS:
296
- mData [i] = value1 + value2;
296
+ mData [i] = static_cast < float >( value1 + value2 ) ;
297
297
break ;
298
298
case opMINUS:
299
- mData [i] = value1 - value2;
299
+ mData [i] = static_cast < float >( value1 - value2 ) ;
300
300
break ;
301
301
case opMUL:
302
- mData [i] = value1 * value2;
302
+ mData [i] = static_cast < float >( value1 * value2 ) ;
303
303
break ;
304
304
case opDIV:
305
305
if ( value2 == 0 )
306
306
{
307
- mData [i] = mNodataValue ;
307
+ mData [i] = static_cast < float >( mNodataValue ) ;
308
308
}
309
309
else
310
310
{
311
- mData [i] = value1 / value2;
311
+ mData [i] = static_cast < float >( value1 / value2 ) ;
312
312
}
313
313
break ;
314
314
case opPOW:
315
315
if ( !testPowerValidity ( value1, value2 ) )
316
316
{
317
- mData [i] = mNodataValue ;
317
+ mData [i] = static_cast < float >( mNodataValue ) ;
318
318
}
319
319
else
320
320
{
321
- mData [i] = pow ( value1, value2 );
321
+ mData [i] = static_cast < float >( pow ( value1, value2 ) );
322
322
}
323
323
break ;
324
324
case opEQ:
325
- mData [i] = ( value1 == value2 ? 1 : 0 ) ;
325
+ mData [i] = value1 == value2 ? 1 . 0f : 0 . 0f ;
326
326
break ;
327
327
case opNE:
328
- mData [i] = ( value1 == value2 ? 0 : 1 ) ;
328
+ mData [i] = value1 == value2 ? 0 . 0f : 1 . 0f ;
329
329
break ;
330
330
case opGT:
331
- mData [i] = ( value1 > value2 ? 1 : 0 ) ;
331
+ mData [i] = value1 > value2 ? 1 . 0f : 0 . 0f ;
332
332
break ;
333
333
case opLT:
334
- mData [i] = ( value1 < value2 ? 1 : 0 ) ;
334
+ mData [i] = value1 < value2 ? 1 . 0f : 0 . 0f ;
335
335
break ;
336
336
case opGE:
337
- mData [i] = ( value1 >= value2 ? 1 : 0 ) ;
337
+ mData [i] = value1 >= value2 ? 1 . 0f : 0 . 0f ;
338
338
break ;
339
339
case opLE:
340
- mData [i] = ( value1 <= value2 ? 1 : 0 ) ;
340
+ mData [i] = value1 <= value2 ? 1 . 0f : 0 . 0f ;
341
341
break ;
342
342
}
343
343
}
@@ -359,7 +359,7 @@ bool QgsRasterMatrix::twoArgumentOperation( TwoArgOperator op, const QgsRasterMa
359
359
{
360
360
for ( int i = 0 ; i < nEntries; ++i )
361
361
{
362
- mData [i] = mNodataValue ;
362
+ mData [i] = static_cast < float >( mNodataValue ) ;
363
363
}
364
364
return true ;
365
365
}
@@ -368,58 +368,58 @@ bool QgsRasterMatrix::twoArgumentOperation( TwoArgOperator op, const QgsRasterMa
368
368
{
369
369
if ( matrix[i] == other.mNodataValue )
370
370
{
371
- mData [i] = mNodataValue ;
371
+ mData [i] = static_cast < float >( mNodataValue ) ;
372
372
continue ;
373
373
}
374
374
375
375
switch ( op )
376
376
{
377
377
case opPLUS:
378
- mData [i] = value + matrix[i];
378
+ mData [i] = static_cast < float >( value + matrix[i] ) ;
379
379
break ;
380
380
case opMINUS:
381
- mData [i] = value - matrix[i];
381
+ mData [i] = static_cast < float >( value - matrix[i] ) ;
382
382
break ;
383
383
case opMUL:
384
- mData [i] = value * matrix[i];
384
+ mData [i] = static_cast < float >( value * matrix[i] ) ;
385
385
break ;
386
386
case opDIV:
387
387
if ( matrix[i] == 0 )
388
388
{
389
- mData [i] = mNodataValue ;
389
+ mData [i] = static_cast < float >( mNodataValue ) ;
390
390
}
391
391
else
392
392
{
393
- mData [i] = value / matrix[i];
393
+ mData [i] = static_cast < float >( value / matrix[i] ) ;
394
394
}
395
395
break ;
396
396
case opPOW:
397
397
if ( !testPowerValidity ( value, matrix[i] ) )
398
398
{
399
- mData [i] = mNodataValue ;
399
+ mData [i] = static_cast < float >( mNodataValue ) ;
400
400
}
401
401
else
402
402
{
403
- mData [i] = pow (( float ) value, matrix[i] );
403
+ mData [i] = pow ( static_cast < float >( value ) , matrix[i] );
404
404
}
405
405
break ;
406
406
case opEQ:
407
- mData [i] = ( value == matrix[i] ? 1 : 0 ) ;
407
+ mData [i] = value == matrix[i] ? 1 . 0f : 0 . 0f ;
408
408
break ;
409
409
case opNE:
410
- mData [i] = ( value == matrix[i] ? 0 : 1 ) ;
410
+ mData [i] = value == matrix[i] ? 0 . 0f : 1 . 0f ;
411
411
break ;
412
412
case opGT:
413
- mData [i] = ( value > matrix[i] ? 1 : 0 ) ;
413
+ mData [i] = value > matrix[i] ? 1 . 0f : 0 . 0f ;
414
414
break ;
415
415
case opLT:
416
- mData [i] = ( value < matrix[i] ? 1 : 0 ) ;
416
+ mData [i] = value < matrix[i] ? 1 . 0f : 0 . 0f ;
417
417
break ;
418
418
case opGE:
419
- mData [i] = ( value >= matrix[i] ? 1 : 0 ) ;
419
+ mData [i] = value >= matrix[i] ? 1 . 0f : 0 . 0f ;
420
420
break ;
421
421
case opLE:
422
- mData [i] = ( value <= matrix[i] ? 1 : 0 ) ;
422
+ mData [i] = value <= matrix[i] ? 1 . 0f : 0 . 0f ;
423
423
break ;
424
424
}
425
425
}
@@ -434,7 +434,7 @@ bool QgsRasterMatrix::twoArgumentOperation( TwoArgOperator op, const QgsRasterMa
434
434
{
435
435
for ( int i = 0 ; i < nEntries; ++i )
436
436
{
437
- mData [i] = mNodataValue ;
437
+ mData [i] = static_cast < float >( mNodataValue ) ;
438
438
}
439
439
return true ;
440
440
}
@@ -449,51 +449,51 @@ bool QgsRasterMatrix::twoArgumentOperation( TwoArgOperator op, const QgsRasterMa
449
449
switch ( op )
450
450
{
451
451
case opPLUS:
452
- mData [i] = mData [i] + value;
452
+ mData [i] = static_cast < float >( mData [i] + value ) ;
453
453
break ;
454
454
case opMINUS:
455
- mData [i] = mData [i] - value;
455
+ mData [i] = static_cast < float >( mData [i] - value ) ;
456
456
break ;
457
457
case opMUL:
458
- mData [i] = mData [i] * value;
458
+ mData [i] = static_cast < float >( mData [i] * value ) ;
459
459
break ;
460
460
case opDIV:
461
461
if ( value == 0 )
462
462
{
463
- mData [i] = mNodataValue ;
463
+ mData [i] = static_cast < float >( mNodataValue ) ;
464
464
}
465
465
else
466
466
{
467
- mData [i] = mData [i] / value;
467
+ mData [i] = static_cast < float >( mData [i] / value ) ;
468
468
}
469
469
break ;
470
470
case opPOW:
471
471
if ( !testPowerValidity ( mData [i], value ) )
472
472
{
473
- mData [i] = mNodataValue ;
473
+ mData [i] = static_cast < float >( mNodataValue ) ;
474
474
}
475
475
else
476
476
{
477
477
mData [i] = pow ( mData [i], ( float ) value );
478
478
}
479
479
break ;
480
480
case opEQ:
481
- mData [i] = ( mData [i] == value ? 1 : 0 ) ;
481
+ mData [i] = mData [i] == value ? 1 . 0f : 0 . 0f ;
482
482
break ;
483
483
case opNE:
484
- mData [i] = ( mData [i] == value ? 0 : 1 ) ;
484
+ mData [i] = mData [i] == value ? 0 . 0f : 1 . 0f ;
485
485
break ;
486
486
case opGT:
487
- mData [i] = ( mData [i] > value ? 1 : 0 ) ;
487
+ mData [i] = mData [i] > value ? 1 . 0f : 0 . 0f ;
488
488
break ;
489
489
case opLT:
490
- mData [i] = ( mData [i] < value ? 1 : 0 ) ;
490
+ mData [i] = mData [i] < value ? 1 . 0f : 0 . 0f ;
491
491
break ;
492
492
case opGE:
493
- mData [i] = ( mData [i] >= value ? 1 : 0 ) ;
493
+ mData [i] = mData [i] >= value ? 1 . 0f : 0 . 0f ;
494
494
break ;
495
495
case opLE:
496
- mData [i] = ( mData [i] <= value ? 1 : 0 ) ;
496
+ mData [i] = mData [i] <= value ? 1 . 0f : 0 . 0f ;
497
497
break ;
498
498
}
499
499
}
0 commit comments