1 files changed, 9 insertions, 9 deletions

diff --git a/source/blender/compositor/operations/COM_RenderLayersProg.cc b/source/blender/compositor/operations/COM_RenderLayersProg.cc
index 40f2187b27b..d95ee2a5e1a 100644
--- a/source/blender/compositor/operations/COM_RenderLayersProg.cc
+++ b/source/blender/compositor/operations/COM_RenderLayersProg.cc
@@ -52,7 +52,7 @@ void RenderLayersProg::init_execution()
 
 void RenderLayersProg::do_interpolation(float output[4], float x, float y, PixelSampler sampler)
 {
-  unsigned int offset;
+  uint offset;
   int width = this->get_width(), height = this->get_height();
 
   int ix = x, iy = y;
@@ -169,7 +169,7 @@ void RenderLayersProg::deinit_execution()
   }
 }
 
-void RenderLayersProg::determine_canvas(const rcti &UNUSED(preferred_area), rcti &r_area)
+void RenderLayersProg::determine_canvas(const rcti & /*preferred_area*/, rcti &r_area)
 {
   Scene *sce = this->get_scene();
   Render *re = (sce) ? RE_GetSceneRender(sce) : nullptr;
@@ -235,7 +235,7 @@ std::unique_ptr<MetaData> RenderLayersProg::get_meta_data()
 
 void RenderLayersProg::update_memory_buffer_partial(MemoryBuffer *output,
                                                     const rcti &area,
-                                                    Span<MemoryBuffer *> UNUSED(inputs))
+                                                    Span<MemoryBuffer *> /*inputs*/)
 {
   BLI_assert(output->get_num_channels() >= elementsize_);
   if (layer_buffer_) {
@@ -266,7 +266,7 @@ void RenderLayersAOOperation::execute_pixel_sampled(float output[4],
 
 void RenderLayersAOOperation::update_memory_buffer_partial(MemoryBuffer *output,
                                                            const rcti &area,
-                                                           Span<MemoryBuffer *> UNUSED(inputs))
+                                                           Span<MemoryBuffer *> /*inputs*/)
 {
   BLI_assert(output->get_num_channels() == COM_DATA_TYPE_COLOR_CHANNELS);
   BLI_assert(elementsize_ == COM_DATA_TYPE_COLOR_CHANNELS);
@@ -300,7 +300,7 @@ void RenderLayersAlphaProg::execute_pixel_sampled(float output[4],
 
 void RenderLayersAlphaProg::update_memory_buffer_partial(MemoryBuffer *output,
                                                          const rcti &area,
-                                                         Span<MemoryBuffer *> UNUSED(inputs))
+                                                         Span<MemoryBuffer *> /*inputs*/)
 {
   BLI_assert(output->get_num_channels() == COM_DATA_TYPE_VALUE_CHANNELS);
   BLI_assert(elementsize_ == COM_DATA_TYPE_COLOR_CHANNELS);
@@ -323,19 +323,19 @@ void RenderLayersDepthProg::execute_pixel_sampled(float output[4],
   int iy = y;
   float *input_buffer = this->get_input_buffer();
 
-  if (input_buffer == nullptr || ix < 0 || iy < 0 || ix >= (int)this->get_width() ||
-      iy >= (int)this->get_height()) {
+  if (input_buffer == nullptr || ix < 0 || iy < 0 || ix >= int(this->get_width()) ||
+      iy >= int(this->get_height())) {
     output[0] = 10e10f;
   }
   else {
-    unsigned int offset = (iy * this->get_width() + ix);
+    uint offset = (iy * this->get_width() + ix);
     output[0] = input_buffer[offset];
   }
 }
 
 void RenderLayersDepthProg::update_memory_buffer_partial(MemoryBuffer *output,
                                                          const rcti &area,
-                                                         Span<MemoryBuffer *> UNUSED(inputs))
+                                                         Span<MemoryBuffer *> /*inputs*/)
 {
   BLI_assert(output->get_num_channels() == COM_DATA_TYPE_VALUE_CHANNELS);
   BLI_assert(elementsize_ == COM_DATA_TYPE_VALUE_CHANNELS);