Cleanup: use array syntax for sizeof with fixed values

Also order sizeof(..) first to promote other values to size_t.

3 files changed, 7 insertions, 8 deletions

diff --git a/source/blender/freestyle/intern/application/AppCanvas.cpp b/source/blender/freestyle/intern/application/AppCanvas.cpp
index 5681c65e5d2..d34be79cd66 100644
--- a/source/blender/freestyle/intern/application/AppCanvas.cpp
+++ b/source/blender/freestyle/intern/application/AppCanvas.cpp
@@ -122,7 +122,7 @@ void AppCanvas::Erase()
 void AppCanvas::readColorPixels(int x, int y, int w, int h, RGBImage &oImage) const
 {
   float *rgb = new float[3 * w * h];
-  memset(rgb, 0, sizeof(float) * 3 * w * h);
+  memset(rgb, 0, sizeof(float[3]) * w * h);
   int xsch = width();
   int ysch = height();
   if (_pass_diffuse.buf) {
@@ -161,8 +161,7 @@ void AppCanvas::readColorPixels(int x, int y, int w, int h, RGBImage &oImage) co
         if (ii < 0 || ii >= rectx) {
           continue;
         }
-        memcpy(
-            rgb + (w * j + i) * 3, _pass_diffuse.buf + (rectx * jj + ii) * 3, sizeof(float) * 3);
+        memcpy(rgb + (w * j + i) * 3, _pass_diffuse.buf + (rectx * jj + ii) * 3, sizeof(float[3]));
       }
     }
   }
diff --git a/source/blender/freestyle/intern/scene_graph/NodeCamera.cpp b/source/blender/freestyle/intern/scene_graph/NodeCamera.cpp
index ad2310d7875..052ae73da43 100644
--- a/source/blender/freestyle/intern/scene_graph/NodeCamera.cpp
+++ b/source/blender/freestyle/intern/scene_graph/NodeCamera.cpp
@@ -52,8 +52,8 @@ NodeCamera::NodeCamera(CameraType camera_type) : camera_type_(camera_type)
 #if 0 /* UNUSED, gives warning in gcc */
 NodeCamera::NodeCamera(const NodeCamera &iBrother) : camera_type_(iBrother.camera_type_)
 {
-  memcpy(modelview_matrix_, iBrother.modelview_matrix_, 16 * sizeof(double));
-  memcpy(projection_matrix_, iBrother.projection_matrix_, 16 * sizeof(double));
+  memcpy(modelview_matrix_, iBrother.modelview_matrix_, sizeof(double[16]));
+  memcpy(projection_matrix_, iBrother.projection_matrix_, sizeof(double[16]));
 }
 #endif
 
@@ -64,12 +64,12 @@ void NodeCamera::accept(SceneVisitor &v)
 
 void NodeCamera::setModelViewMatrix(double modelview_matrix[16])
 {
-  memcpy(modelview_matrix_, modelview_matrix, 16 * sizeof(double));
+  memcpy(modelview_matrix_, modelview_matrix, sizeof(double[16]));
 }
 
 void NodeCamera::setProjectionMatrix(double projection_matrix[16])
 {
-  memcpy(projection_matrix_, projection_matrix, 16 * sizeof(double));
+  memcpy(projection_matrix_, projection_matrix, sizeof(double[16]));
 }
 
 NodeOrthographicCamera::NodeOrthographicCamera()
diff --git a/source/blender/freestyle/intern/view_map/SilhouetteGeomEngine.cpp b/source/blender/freestyle/intern/view_map/SilhouetteGeomEngine.cpp
index 46d4389ea83..2624c70c988 100644
--- a/source/blender/freestyle/intern/view_map/SilhouetteGeomEngine.cpp
+++ b/source/blender/freestyle/intern/view_map/SilhouetteGeomEngine.cpp
@@ -124,7 +124,7 @@ void SilhouetteGeomEngine::setFrustum(real iZNear, real iZFar)
 
 void SilhouetteGeomEngine::retrieveViewport(int viewport[4])
 {
-  memcpy(viewport, _viewport, 4 * sizeof(int));
+  memcpy(viewport, _viewport, sizeof(int[4]));
 }
 
 void SilhouetteGeomEngine::ProjectSilhouette(vector<SVertex *> &ioVertices)