Merge branch 'master' into asset-browser-grid-viewasset-browser-grid-view

1 files changed, 6 insertions, 5 deletions

diff --git a/source/blender/compositor/operations/COM_CalculateStandardDeviationOperation.cc b/source/blender/compositor/operations/COM_CalculateStandardDeviationOperation.cc
index 881b894d66d..709218297b7 100644
--- a/source/blender/compositor/operations/COM_CalculateStandardDeviationOperation.cc
+++ b/source/blender/compositor/operations/COM_CalculateStandardDeviationOperation.cc
@@ -74,15 +74,16 @@ void *CalculateStandardDeviationOperation::initialize_tile_data(rcti *rect)
         }
       }
     }
-    standard_deviation_ = sqrt(sum / (float)(pixels - 1));
+    standard_deviation_ = sqrt(sum / float(pixels - 1));
     iscalculated_ = true;
   }
   unlock_mutex();
   return nullptr;
 }
 
-void CalculateStandardDeviationOperation::update_memory_buffer_started(
-    MemoryBuffer *UNUSED(output), const rcti &UNUSED(area), Span<MemoryBuffer *> inputs)
+void CalculateStandardDeviationOperation::update_memory_buffer_started(MemoryBuffer * /*output*/,
+                                                                       const rcti & /*area*/,
+                                                                       Span<MemoryBuffer *> inputs)
 {
   if (!iscalculated_) {
     const MemoryBuffer *input = inputs[0];
@@ -98,13 +99,13 @@ void CalculateStandardDeviationOperation::update_memory_buffer_started(
           join.num_pixels += chunk.num_pixels;
         });
     standard_deviation_ = total.num_pixels <= 1 ? 0.0f :
-                                                  sqrt(total.sum / (float)(total.num_pixels - 1));
+                                                  sqrt(total.sum / float(total.num_pixels - 1));
     iscalculated_ = true;
   }
 }
 
 void CalculateStandardDeviationOperation::update_memory_buffer_partial(
-    MemoryBuffer *output, const rcti &area, Span<MemoryBuffer *> UNUSED(inputs))
+    MemoryBuffer *output, const rcti &area, Span<MemoryBuffer *> /*inputs*/)
 {
   output->fill(area, &standard_deviation_);
 }