ClangFormat: apply to source, most of intern

Apply clang format as proposed in T53211.

For details on usage and instructions for migrating branches
without conflicts, see:

https://wiki.blender.org/wiki/Tools/ClangFormat

4 files changed, 102 insertions, 91 deletions

diff --git a/tests/gtests/testing/CMakeLists.txt b/tests/gtests/testing/CMakeLists.txt
index b868f4da8f4..e08ee486933 100644
--- a/tests/gtests/testing/CMakeLists.txt
+++ b/tests/gtests/testing/CMakeLists.txt
@@ -19,20 +19,20 @@
 # ***** END GPL LICENSE BLOCK *****
 
 set(INC
-	.
-	..
-	${GLOG_INCLUDE_DIRS}
-	${GFLAGS_INCLUDE_DIRS}
-	../../../extern/gtest/include
+  .
+  ..
+  ${GLOG_INCLUDE_DIRS}
+  ${GFLAGS_INCLUDE_DIRS}
+  ../../../extern/gtest/include
 )
 
 set(INC_SYS
 )
 
 set(SRC
-	testing_main.cc
+  testing_main.cc
 
-	testing.h
+  testing.h
 )
 
 set(LIB
diff --git a/tests/gtests/testing/mock_log.h b/tests/gtests/testing/mock_log.h
index 2ec558fac87..e3414fa1533 100644
--- a/tests/gtests/testing/mock_log.h
+++ b/tests/gtests/testing/mock_log.h
@@ -74,10 +74,16 @@ class ScopedMockLog : public google::LogSink {
  public:
   // When a ScopedMockLog object is constructed, it starts to
   // intercept logs.
-  ScopedMockLog() { AddLogSink(this); }
+  ScopedMockLog()
+  {
+    AddLogSink(this);
+  }
 
   // When the object is destructed, it stops intercepting logs.
-  virtual ~ScopedMockLog() { RemoveLogSink(this); }
+  virtual ~ScopedMockLog()
+  {
+    RemoveLogSink(this);
+  }
 
   // Implements the mock method:
   //
@@ -92,9 +98,10 @@ class ScopedMockLog : public google::LogSink {
   // for messages from different threads. In fact, if the same or multiple
   // expectations are matched on two threads concurrently, their actions will
   // be executed concurrently as well and may interleave.
-  MOCK_METHOD3(Log, void(google::LogSeverity severity,
-                         const std::string& file_path,
-                         const std::string& message));
+  MOCK_METHOD3(Log,
+               void(google::LogSeverity severity,
+                    const std::string &file_path,
+                    const std::string &message));
 
  private:
   // Implements the send() virtual function in class LogSink.
@@ -119,12 +126,13 @@ class ScopedMockLog : public google::LogSink {
   // send() and WaitTillSent(), and that for each message, LOG(), send(),
   // WaitTillSent() and Log() are executed in the same thread.
   virtual void send(google::LogSeverity severity,
-                    const char* full_filename,
-                    const char* /*base_filename*/,
+                    const char *full_filename,
+                    const char * /*base_filename*/,
                     int /*line*/,
-                    const tm* /*tm_time*/,
-                    const char* message,
-                    size_t message_len) {
+                    const tm * /*tm_time*/,
+                    const char *message,
+                    size_t message_len)
+  {
     // We are only interested in the log severity, full file name, and
     // log message.
     message_info_.severity = severity;
@@ -139,7 +147,8 @@ class ScopedMockLog : public google::LogSink {
   //
   // LOG(), send(), WaitTillSent() and Log() will occur in the same thread for
   // a given log message.
-  virtual void WaitTillSent() {
+  virtual void WaitTillSent()
+  {
     // First, and very importantly, we save a copy of the message being
     // processed before calling Log(), since Log() may indirectly call send()
     // and WaitTillSent() in the same thread again.
diff --git a/tests/gtests/testing/testing.h b/tests/gtests/testing/testing.h
index 9efdbe22557..67138e4f874 100644
--- a/tests/gtests/testing/testing.h
+++ b/tests/gtests/testing/testing.h
@@ -12,115 +12,116 @@
     EXPECT_NEAR(a[0], b[0], eps); \
     EXPECT_NEAR(a[1], b[1], eps); \
     EXPECT_NEAR(a[2], b[2], eps); \
-  } (void) 0
+  } \
+  (void)0
 
 #define EXPECT_V4_NEAR(a, b, eps) \
-{ \
-	EXPECT_NEAR(a[0], b[0], eps); \
-	EXPECT_NEAR(a[1], b[1], eps); \
-	EXPECT_NEAR(a[2], b[2], eps); \
-	EXPECT_NEAR(a[3], b[3], eps); \
-	} (void) 0
+  { \
+    EXPECT_NEAR(a[0], b[0], eps); \
+    EXPECT_NEAR(a[1], b[1], eps); \
+    EXPECT_NEAR(a[2], b[2], eps); \
+    EXPECT_NEAR(a[3], b[3], eps); \
+  } \
+  (void)0
 
 #define EXPECT_M3_NEAR(a, b, eps) \
-do { \
-	EXPECT_V3_NEAR(a[0], b[0], eps); \
-	EXPECT_V3_NEAR(a[1], b[1], eps); \
-	EXPECT_V3_NEAR(a[2], b[2], eps); \
-} while(false);
+  do { \
+    EXPECT_V3_NEAR(a[0], b[0], eps); \
+    EXPECT_V3_NEAR(a[1], b[1], eps); \
+    EXPECT_V3_NEAR(a[2], b[2], eps); \
+  } while (false);
 
 #define EXPECT_M4_NEAR(a, b, eps) \
-do { \
-	EXPECT_V3_NEAR(a[0], b[0], eps); \
-	EXPECT_V3_NEAR(a[1], b[1], eps); \
-	EXPECT_V3_NEAR(a[2], b[2], eps); \
-	EXPECT_V4_NEAR(a[3], b[3], eps); \
-} while(false);
+  do { \
+    EXPECT_V3_NEAR(a[0], b[0], eps); \
+    EXPECT_V3_NEAR(a[1], b[1], eps); \
+    EXPECT_V3_NEAR(a[2], b[2], eps); \
+    EXPECT_V4_NEAR(a[3], b[3], eps); \
+  } while (false);
 
 #define EXPECT_MATRIX_NEAR(a, b, tolerance) \
-do { \
-  bool dims_match = (a.rows() == b.rows()) && (a.cols() == b.cols()); \
-  EXPECT_EQ(a.rows(), b.rows()) << "Matrix rows don't match."; \
-  EXPECT_EQ(a.cols(), b.cols()) << "Matrix cols don't match."; \
-  if (dims_match) { \
-    for (int r = 0; r < a.rows(); ++r) { \
-      for (int c = 0; c < a.cols(); ++c) { \
-        EXPECT_NEAR(a(r, c), b(r, c), tolerance) \
-          << "r=" << r << ", c=" << c << "."; \
+  do { \
+    bool dims_match = (a.rows() == b.rows()) && (a.cols() == b.cols()); \
+    EXPECT_EQ(a.rows(), b.rows()) << "Matrix rows don't match."; \
+    EXPECT_EQ(a.cols(), b.cols()) << "Matrix cols don't match."; \
+    if (dims_match) { \
+      for (int r = 0; r < a.rows(); ++r) { \
+        for (int c = 0; c < a.cols(); ++c) { \
+          EXPECT_NEAR(a(r, c), b(r, c), tolerance) << "r=" << r << ", c=" << c << "."; \
+        } \
       } \
     } \
-  } \
-} while(false);
+  } while (false);
 
 #define EXPECT_MATRIX_NEAR_ZERO(a, tolerance) \
-do { \
-  for (int r = 0; r < a.rows(); ++r) { \
-    for (int c = 0; c < a.cols(); ++c) { \
-      EXPECT_NEAR(0.0, a(r, c), tolerance) \
-        << "r=" << r << ", c=" << c << "."; \
+  do { \
+    for (int r = 0; r < a.rows(); ++r) { \
+      for (int c = 0; c < a.cols(); ++c) { \
+        EXPECT_NEAR(0.0, a(r, c), tolerance) << "r=" << r << ", c=" << c << "."; \
+      } \
     } \
-  } \
-} while(false);
+  } while (false);
 
 #define EXPECT_MATRIX_EQ(a, b) \
-do { \
-  bool dims_match = (a.rows() == b.rows()) && (a.cols() == b.cols()); \
-  EXPECT_EQ(a.rows(), b.rows()) << "Matrix rows don't match."; \
-  EXPECT_EQ(a.cols(), b.cols()) << "Matrix cols don't match."; \
-  if (dims_match) { \
-    for (int r = 0; r < a.rows(); ++r) { \
-      for (int c = 0; c < a.cols(); ++c) { \
-        EXPECT_EQ(a(r, c), b(r, c)) \
-          << "r=" << r << ", c=" << c << "."; \
+  do { \
+    bool dims_match = (a.rows() == b.rows()) && (a.cols() == b.cols()); \
+    EXPECT_EQ(a.rows(), b.rows()) << "Matrix rows don't match."; \
+    EXPECT_EQ(a.cols(), b.cols()) << "Matrix cols don't match."; \
+    if (dims_match) { \
+      for (int r = 0; r < a.rows(); ++r) { \
+        for (int c = 0; c < a.cols(); ++c) { \
+          EXPECT_EQ(a(r, c), b(r, c)) << "r=" << r << ", c=" << c << "."; \
+        } \
       } \
     } \
-  } \
-} while(false);
+  } while (false);
 
 // Check that sin(angle(a, b)) < tolerance.
 #define EXPECT_MATRIX_PROP(a, b, tolerance) \
-do { \
-  bool dims_match = (a.rows() == b.rows()) && (a.cols() == b.cols()); \
-  EXPECT_EQ(a.rows(), b.rows()) << "Matrix rows don't match."; \
-  EXPECT_EQ(a.cols(), b.cols()) << "Matrix cols don't match."; \
-  if (dims_match) { \
-    double c = CosinusBetweenMatrices(a, b); \
-    if (c * c < 1) { \
-      double s = sqrt(1 - c * c); \
-      EXPECT_NEAR(0, s, tolerance); \
+  do { \
+    bool dims_match = (a.rows() == b.rows()) && (a.cols() == b.cols()); \
+    EXPECT_EQ(a.rows(), b.rows()) << "Matrix rows don't match."; \
+    EXPECT_EQ(a.cols(), b.cols()) << "Matrix cols don't match."; \
+    if (dims_match) { \
+      double c = CosinusBetweenMatrices(a, b); \
+      if (c * c < 1) { \
+        double s = sqrt(1 - c * c); \
+        EXPECT_NEAR(0, s, tolerance); \
+      } \
     } \
-  } \
-} while(false);
+  } while (false);
 
 #ifdef LIBMV_NUMERIC_NUMERIC_H
-template<class TMat>
-double CosinusBetweenMatrices(const TMat &a, const TMat &b) {
-  return (a.array() * b.array()).sum() /
-      libmv::FrobeniusNorm(a) / libmv::FrobeniusNorm(b);
+template<class TMat> double CosinusBetweenMatrices(const TMat &a, const TMat &b)
+{
+  return (a.array() * b.array()).sum() / libmv::FrobeniusNorm(a) / libmv::FrobeniusNorm(b);
 }
 #endif
 
-template <typename T>
-inline void EXPECT_EQ_VECTOR(const std::vector<T>& expected, const std::vector<T>& actual) {
+template<typename T>
+inline void EXPECT_EQ_VECTOR(const std::vector<T> &expected, const std::vector<T> &actual)
+{
   EXPECT_EQ(expected.size(), actual.size());
   if (expected.size() == actual.size()) {
-    for(size_t i = 0; i < expected.size(); ++i) {
+    for (size_t i = 0; i < expected.size(); ++i) {
       EXPECT_EQ(expected[i], actual[i]) << "Element mismatch at index " << i;
     }
   }
 }
 
-template <typename T>
-inline void EXPECT_EQ_ARRAY(const T *expected, const T *actual, const size_t N) {
-  for(size_t i = 0; i < N; ++i) {
+template<typename T>
+inline void EXPECT_EQ_ARRAY(const T *expected, const T *actual, const size_t N)
+{
+  for (size_t i = 0; i < N; ++i) {
     EXPECT_EQ(expected[i], actual[i]) << "Element mismatch at index " << i;
   }
 }
 
-template <typename T>
-inline void EXPECT_EQ_ARRAY_ND(const T *expected, const T *actual, const size_t N, const size_t D) {
-  for(size_t i = 0; i < N; ++i) {
-    for(size_t j = 0; j < D; ++j) {
+template<typename T>
+inline void EXPECT_EQ_ARRAY_ND(const T *expected, const T *actual, const size_t N, const size_t D)
+{
+  for (size_t i = 0; i < N; ++i) {
+    for (size_t j = 0; j < D; ++j) {
       EXPECT_EQ(expected[i][j], actual[i][j])
           << "Element mismatch at index " << i << ", component index " << j;
     }
diff --git a/tests/gtests/testing/testing_main.cc b/tests/gtests/testing/testing_main.cc
index fc607c948c3..6b3a8e5515d 100644
--- a/tests/gtests/testing/testing_main.cc
+++ b/tests/gtests/testing/testing_main.cc
@@ -19,7 +19,8 @@
 
 #include "testing/testing.h"
 
-int main(int argc, char **argv) {
+int main(int argc, char **argv)
+{
   testing::InitGoogleTest(&argc, argv);
   BLENDER_GFLAGS_NAMESPACE::ParseCommandLineFlags(&argc, &argv, true);
   google::InitGoogleLogging(argv[0]);