Cleanup: style, use braces in source/

Automated using clang-tidy.

4 files changed, 18 insertions, 9 deletions

diff --git a/source/blender/freestyle/intern/image/GaussianFilter.cpp b/source/blender/freestyle/intern/image/GaussianFilter.cpp
index 8a14fe4e6dd..87e2caee8a9 100644
--- a/source/blender/freestyle/intern/image/GaussianFilter.cpp
+++ b/source/blender/freestyle/intern/image/GaussianFilter.cpp
@@ -63,8 +63,9 @@ GaussianFilter::~GaussianFilter()
 int GaussianFilter::computeMaskSize(float sigma)
 {
   int maskSize = (int)floor(4 * sigma) + 1;
-  if (0 == (maskSize % 2))
+  if (0 == (maskSize % 2)) {
     ++maskSize;
+  }
 
   return maskSize;
 }
diff --git a/source/blender/freestyle/intern/image/GaussianFilter.h b/source/blender/freestyle/intern/image/GaussianFilter.h
index e6824fcb81e..f933e66dc94 100644
--- a/source/blender/freestyle/intern/image/GaussianFilter.h
+++ b/source/blender/freestyle/intern/image/GaussianFilter.h
@@ -134,11 +134,13 @@ template<class Map> float GaussianFilter::getSmoothedPixel(Map *map, int x, int
   // Current pixel is x,y
   // Sum surrounding pixels L value:
   for (int i = -_bound; i <= _bound; ++i) {
-    if ((y + i < 0) || (y + i >= h))
+    if ((y + i < 0) || (y + i >= h)) {
       continue;
+    }
     for (int j = -_bound; j <= _bound; ++j) {
-      if ((x + j < 0) || (x + j >= w))
+      if ((x + j < 0) || (x + j >= w)) {
         continue;
+      }
 
       float tmpL = map->pixel(x + j, y + i);
       float m = _mask[abs(i) * _storedMaskSize + abs(j)];
diff --git a/source/blender/freestyle/intern/image/Image.h b/source/blender/freestyle/intern/image/Image.h
index b854e411a83..c42e47a670b 100644
--- a/source/blender/freestyle/intern/image/Image.h
+++ b/source/blender/freestyle/intern/image/Image.h
@@ -238,8 +238,9 @@ class RGBImage : public FrsImage {
 
   virtual ~RGBImage()
   {
-    if (_rgb)
+    if (_rgb) {
       delete[] _rgb;
+    }
   }
 
   inline float getR(unsigned x, unsigned y) const
@@ -376,8 +377,9 @@ class GrayImage : public FrsImage {
 
   virtual ~GrayImage()
   {
-    if (_lvl)
+    if (_lvl) {
       delete[] _lvl;
+    }
   }
 
   inline void setPixel(unsigned x, unsigned y, float v)
diff --git a/source/blender/freestyle/intern/image/ImagePyramid.cpp b/source/blender/freestyle/intern/image/ImagePyramid.cpp
index e5b4053fbf4..2f12081eb76 100644
--- a/source/blender/freestyle/intern/image/ImagePyramid.cpp
+++ b/source/blender/freestyle/intern/image/ImagePyramid.cpp
@@ -71,10 +71,12 @@ float ImagePyramid::pixel(int x, int y, int level)
   unsigned int i = 1 << level;
   unsigned int sx = x >> level;
   unsigned int sy = y >> level;
-  if (sx >= img->width())
+  if (sx >= img->width()) {
     sx = img->width() - 1;
-  if (sy >= img->height())
+  }
+  if (sy >= img->height()) {
     sy = img->height() - 1;
+  }
 
   // bilinear interpolation
   float A = i * (sx + 1) - x;
@@ -85,8 +87,9 @@ float ImagePyramid::pixel(int x, int y, int level)
   float P1(0), P2(0);
   P1 = A * img->pixel(sx, sy);
   if (sx < img->width() - 1) {
-    if (x % i != 0)
+    if (x % i != 0) {
       P1 += B * img->pixel(sx + 1, sy);
+    }
   }
   else {
     P1 += B * img->pixel(sx, sy);
@@ -95,8 +98,9 @@ float ImagePyramid::pixel(int x, int y, int level)
     if (y % i != 0) {
       P2 = A * img->pixel(sx, sy + 1);
       if (sx < img->width() - 1) {
-        if (x % i != 0)
+        if (x % i != 0) {
           P2 += B * img->pixel(sx + 1, sy + 1);
+        }
       }
       else {
         P2 += B * img->pixel(sx, sy + 1);