From 171e77c3c25a1224fc5f7db40ec6f8879f8dbbb0 Mon Sep 17 00:00:00 2001
From: Campbell Barton <ideasman42@gmail.com>
Date: Sat, 8 Aug 2020 13:29:21 +1000
Subject: Cleanup: use array syntax for sizeof with fixed values

Also order sizeof(..) first to promote other values to size_t.
---
 .../blender/compositor/operations/COM_CompositorOperation.cpp  |  4 ++--
 source/blender/compositor/operations/COM_DenoiseOperation.cpp  | 10 +++++-----
 .../blender/compositor/operations/COM_VectorBlurOperation.cpp  |  4 ++--
 3 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'source/blender/compositor')

diff --git a/source/blender/compositor/operations/COM_CompositorOperation.cpp b/source/blender/compositor/operations/COM_CompositorOperation.cpp
index 71cef9dc4da..8d55fe53aa7 100644
--- a/source/blender/compositor/operations/COM_CompositorOperation.cpp
+++ b/source/blender/compositor/operations/COM_CompositorOperation.cpp
@@ -65,11 +65,11 @@ void CompositorOperation::initExecution()
   this->m_depthInput = getInputSocketReader(2);
   if (this->getWidth() * this->getHeight() != 0) {
     this->m_outputBuffer = (float *)MEM_callocN(
-        this->getWidth() * this->getHeight() * 4 * sizeof(float), "CompositorOperation");
+        sizeof(float[4]) * this->getWidth() * this->getHeight(), "CompositorOperation");
   }
   if (this->m_depthInput != NULL) {
     this->m_depthBuffer = (float *)MEM_callocN(
-        this->getWidth() * this->getHeight() * sizeof(float), "CompositorOperation");
+        sizeof(float) * this->getWidth() * this->getHeight(), "CompositorOperation");
   }
 }
 
diff --git a/source/blender/compositor/operations/COM_DenoiseOperation.cpp b/source/blender/compositor/operations/COM_DenoiseOperation.cpp
index 202e614c0c5..4087056a79d 100644
--- a/source/blender/compositor/operations/COM_DenoiseOperation.cpp
+++ b/source/blender/compositor/operations/COM_DenoiseOperation.cpp
@@ -105,7 +105,7 @@ void DenoiseOperation::generateDenoise(float *data,
                     inputTileColor->getWidth(),
                     inputTileColor->getHeight(),
                     0,
-                    4 * sizeof(float));
+                    sizeof(float[4]));
     if (inputTileNormal && inputTileNormal->getBuffer()) {
       filter.setImage("normal",
                       inputTileNormal->getBuffer(),
@@ -113,7 +113,7 @@ void DenoiseOperation::generateDenoise(float *data,
                       inputTileNormal->getWidth(),
                       inputTileNormal->getHeight(),
                       0,
-                      3 * sizeof(float));
+                      sizeof(float[3]));
     }
     if (inputTileAlbedo && inputTileAlbedo->getBuffer()) {
       filter.setImage("albedo",
@@ -122,7 +122,7 @@ void DenoiseOperation::generateDenoise(float *data,
                       inputTileAlbedo->getWidth(),
                       inputTileAlbedo->getHeight(),
                       0,
-                      4 * sizeof(float));
+                      sizeof(float[4]));
     }
     filter.setImage("output",
                     data,
@@ -130,7 +130,7 @@ void DenoiseOperation::generateDenoise(float *data,
                     inputTileColor->getWidth(),
                     inputTileColor->getHeight(),
                     0,
-                    4 * sizeof(float));
+                    sizeof(float[4]));
 
     BLI_assert(settings);
     if (settings) {
@@ -158,5 +158,5 @@ void DenoiseOperation::generateDenoise(float *data,
   UNUSED_VARS(inputTileAlbedo, inputTileNormal, settings);
   ::memcpy(data,
            inputBufferColor,
-           inputTileColor->getWidth() * inputTileColor->getHeight() * sizeof(float) * 4);
+           sizeof(float[4]) * inputTileColor->getWidth() * inputTileColor->getHeight());
 }
diff --git a/source/blender/compositor/operations/COM_VectorBlurOperation.cpp b/source/blender/compositor/operations/COM_VectorBlurOperation.cpp
index 0f81780bb00..1e392b1f991 100644
--- a/source/blender/compositor/operations/COM_VectorBlurOperation.cpp
+++ b/source/blender/compositor/operations/COM_VectorBlurOperation.cpp
@@ -595,7 +595,7 @@ void zbuf_accumulate_vecblur(NodeBlurData *nbd,
     float minspeed = (float)nbd->minspeed;
     float minspeedsq = minspeed * minspeed;
 
-    minvecbufrect = (float *)MEM_callocN(4 * sizeof(float) * xsize * ysize, "minspeed buf");
+    minvecbufrect = (float *)MEM_callocN(sizeof(float[4]) * xsize * ysize, "minspeed buf");
 
     dvec1 = vecbufrect;
     dvec2 = minvecbufrect;
@@ -621,7 +621,7 @@ void zbuf_accumulate_vecblur(NodeBlurData *nbd,
   }
 
   /* make vertex buffer with averaged speed and zvalues */
-  rectvz = (float *)MEM_callocN(4 * sizeof(float) * (xsize + 1) * (ysize + 1), "vertices");
+  rectvz = (float *)MEM_callocN(sizeof(float[4]) * (xsize + 1) * (ysize + 1), "vertices");
   dvz = rectvz;
   for (y = 0; y <= ysize; y++) {
 
-- 
cgit v1.2.3