Another "insanely" big code clean-up patch by Bastien Montagne, many thanks!

1 files changed, 139 insertions, 126 deletions

diff --git a/source/blender/freestyle/intern/geometry/BBox.h b/source/blender/freestyle/intern/geometry/BBox.h
index 9c46d7918e2..b13960a4d2e 100644
--- a/source/blender/freestyle/intern/geometry/BBox.h
+++ b/source/blender/freestyle/intern/geometry/BBox.h
@@ -1,141 +1,154 @@
-//
-//  Filename         : BBox.h
-//  Author(s)        : Stephane Grabli
-//  Purpose          : A class to hold a bounding box
-//  Date of creation : 22/05/2003
-//
-///////////////////////////////////////////////////////////////////////////////
-
-
-//
-//  Copyright (C) : Please refer to the COPYRIGHT file distributed 
-//   with this source distribution. 
-//
-//  This program is free software; you can redistribute it and/or
-//  modify it under the terms of the GNU General Public License
-//  as published by the Free Software Foundation; either version 2
-//  of the License, or (at your option) any later version.
-//
-//  This program is distributed in the hope that it will be useful,
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//  GNU General Public License for more details.
-//
-//  You should have received a copy of the GNU General Public License
-//  along with this program; if not, write to the Free Software
-//  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-//
-///////////////////////////////////////////////////////////////////////////////
-
-#ifndef  BBOX_H
-# define BBOX_H
+/*
+ * ***** BEGIN GPL LICENSE BLOCK *****
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * The Original Code is Copyright (C) 2010 Blender Foundation.
+ * All rights reserved.
+ *
+ * The Original Code is: all of this file.
+ *
+ * Contributor(s): none yet.
+ *
+ * ***** END GPL LICENSE BLOCK *****
+ */
+
+#ifndef __BBOX_H__
+#define __BBOX_H__
+
+/** \file blender/freestyle/intern/geometry/BBox.h
+ *  \ingroup freestyle
+ *  \brief A class to hold a bounding box
+ *  \author Stephane Grabli
+ *  \date 22/05/2003
+ */
 
 template <class Point>
 class BBox
 {
- public:
-
-  inline BBox() {
-    _empty = true;
-  }
-
-  template <class T>
-  inline BBox(const T& min_in, const T& max_in) : _min(min_in), _max(max_in) {
-    _empty = false;
-  }
-
-  template <class T>
-  inline BBox(const BBox<T>& b) : _min(b.getMin()), _max(b.getMax()) {
-    _empty = false;
-  }
-
-  template <class T>
-  inline void extendToContain(const T& p) {
-    if (_empty) {
-      _min = p;
-      _max = p;
-      _empty = false;
-      return;
-    }
-    for (unsigned i = 0; i < Point::dim(); i++) {
-      if (p[i] < _min[i])
-	_min[i] = p[i];
-      else if (p[i] > _max[i])
-	_max[i] = p[i];
-    }
-    _empty = false;
-  }
-
-  inline void clear() {
-    _empty = true;
-  }
-
-  inline bool empty() const {
-    return _empty;
-  }
-
-  inline const Point& getMin() const {
-    return _min;
-  }
-
-  inline const Point& getMax() const {
-    return _max;
-  }
-
-  inline BBox<Point>& operator=(const BBox<Point>& b) {
-    _min = b.getMin();
-    _max = b.getMax();
-    _empty = false;
-    return *this;
-  }
-
-  inline BBox<Point>& operator+=(const BBox<Point>& b) {
-    if (_empty) {
-      _min = b.getMin();
-      _max = b.getMax();
-      _empty = false;
-    }
-    else {
-      for (unsigned i = 0; i < Point::dim(); i++) {
-	if (b.getMin()[i] < _min[i])
-	  _min[i] = b.getMin()[i];
-	if (b.getMax()[i] > _max[i])
-	  _max[i] = b.getMax()[i];
-      }
-    }
-    return *this;
-  }
-
-  inline bool inside(const Point& p){
-    if(empty())
-        return false;
-    for (unsigned i = 0; i < Point::dim(); i++) {
-        if((_min[i]>p[i]) || (_max[i]<p[i]))
-            return false;
-    }
-    return true;
-
-  }
+public:
+	inline BBox()
+	{
+		_empty = true;
+	}
+
+	template <class T>
+	inline BBox(const T& min_in, const T& max_in) : _min(min_in), _max(max_in)
+	{
+		_empty = false;
+	}
+
+	template <class T>
+	inline BBox(const BBox<T>& b) : _min(b.getMin()), _max(b.getMax())
+	{
+		_empty = false;
+	}
+
+	template <class T>
+	inline void extendToContain(const T& p)
+	{
+		if (_empty) {
+			_min = p;
+			_max = p;
+			_empty = false;
+			return;
+		}
+		for (unsigned int i = 0; i < Point::dim(); i++) {
+			if (p[i] < _min[i])
+				_min[i] = p[i];
+			else if (p[i] > _max[i])
+				_max[i] = p[i];
+		}
+		_empty = false;
+	}
+
+	inline void clear()
+	{
+		_empty = true;
+	}
+
+	inline bool empty() const
+	{
+		return _empty;
+	}
+
+	inline const Point& getMin() const
+	{
+		return _min;
+	}
+
+	inline const Point& getMax() const
+	{
+		return _max;
+	}
+
+	inline BBox<Point>& operator=(const BBox<Point>& b)
+	{
+		_min = b.getMin();
+		_max = b.getMax();
+		_empty = false;
+		return *this;
+	}
+
+	inline BBox<Point>& operator+=(const BBox<Point>& b)
+	{
+		if (_empty) {
+			_min = b.getMin();
+			_max = b.getMax();
+			_empty = false;
+		}
+		else {
+			for (unsigned int i = 0; i < Point::dim(); i++) {
+				if (b.getMin()[i] < _min[i])
+					_min[i] = b.getMin()[i];
+				if (b.getMax()[i] > _max[i])
+					_max[i] = b.getMax()[i];
+			}
+		}
+		return *this;
+	}
+
+	inline bool inside(const Point& p)
+	{
+		if (empty())
+			return false;
+		for (unsigned int i = 0; i < Point::dim(); i++) {
+			if ((_min[i]>p[i]) || (_max[i]<p[i]))
+				return false;
+		}
+		return true;
+	}
 
 private:
-
-  Point	_min;
-  Point	_max;
-  bool	_empty;
+	Point _min;
+	Point _max;
+	bool _empty;
 };
 
 template <class Point>
 BBox<Point>& operator+(const BBox<Point> &b1, const BBox<Point> &b2)
 {
-  Point new_min;
-  Point new_max;
+	Point new_min;
+	Point new_max;
 
-  for (unsigned i = 0; i < Point::dim(); i++) {
-    new_min[i] = b1.getMin()[i] < b2.getMin()[i] ? b1.getMin()[i] : b2.getMin()[i];
-    new_max[i] = b1.getMax()[i] > b2.getMax()[i] ? b1.getMax()[i] : b2.getMax()[i];
-  }
+	for (unsigned int i = 0; i < Point::dim(); i++) {
+		new_min[i] = b1.getMin()[i] < b2.getMin()[i] ? b1.getMin()[i] : b2.getMin()[i];
+		new_max[i] = b1.getMax()[i] > b2.getMax()[i] ? b1.getMax()[i] : b2.getMax()[i];
+	}
 
-  return BBox<Point>(new_min, new_max);
+	return BBox<Point>(new_min, new_max);
 }
 
-#endif // BBOX_H
+#endif // __BBOX_H__