Another big code clean-up patch from Bastien Montagne, thanks again!

1 files changed, 15 insertions, 13 deletions

diff --git a/source/blender/freestyle/intern/stroke/AdvancedFunctions0D.cpp b/source/blender/freestyle/intern/stroke/AdvancedFunctions0D.cpp
index 9d955722ac7..25b5bdb26dc 100644
--- a/source/blender/freestyle/intern/stroke/AdvancedFunctions0D.cpp
+++ b/source/blender/freestyle/intern/stroke/AdvancedFunctions0D.cpp
@@ -43,11 +43,12 @@ namespace Functions0D {
 
 int DensityF0D::operator()(Interface0DIterator& iter)
 {
-	Canvas* canvas = Canvas::getInstance();
+	Canvas *canvas = Canvas::getInstance();
 	int bound = _filter.getBound();
 
-	if ((iter->getProjectedX()-bound < 0) || (iter->getProjectedX()+bound>canvas->width()) ||
-	    (iter->getProjectedY()-bound < 0) || (iter->getProjectedY()+bound>canvas->height())) {
+	if ((iter->getProjectedX() - bound < 0) || (iter->getProjectedX() + bound>canvas->width()) ||
+	    (iter->getProjectedY() - bound < 0) || (iter->getProjectedY() + bound>canvas->height()))
+	{
 		result = 0.0;
 		return 0;
 	}
@@ -63,17 +64,18 @@ int DensityF0D::operator()(Interface0DIterator& iter)
 
 int LocalAverageDepthF0D::operator()(Interface0DIterator& iter)
 {
-	Canvas * iViewer = Canvas::getInstance();
+	Canvas *iViewer = Canvas::getInstance();
 	int bound = _filter.getBound();
 
-	if ((iter->getProjectedX()-bound < 0) || (iter->getProjectedX()+bound>iViewer->width()) ||
-	    (iter->getProjectedY()-bound < 0) || (iter->getProjectedY()+bound>iViewer->height())) {
+	if ((iter->getProjectedX() - bound < 0) || (iter->getProjectedX() + bound>iViewer->width()) ||
+	    (iter->getProjectedY() - bound < 0) || (iter->getProjectedY() + bound>iViewer->height()))
+	{
 		result = 0.0;
 		return 0;
 	}
 
 	GrayImage image;
-	iViewer->readDepthPixels((int)iter->getProjectedX() - bound, (int)iter->getProjectedY()-bound,
+	iViewer->readDepthPixels((int)iter->getProjectedX() - bound, (int)iter->getProjectedY() - bound,
 	                         _filter.maskSize(), _filter.maskSize(), image);
 	result = _filter.getSmoothedPixel(&image, (int)iter->getProjectedX(), (int)iter->getProjectedY());
 
@@ -82,7 +84,7 @@ int LocalAverageDepthF0D::operator()(Interface0DIterator& iter)
 
 int ReadMapPixelF0D::operator()(Interface0DIterator& iter)
 {
-	Canvas * canvas = Canvas::getInstance();
+	Canvas *canvas = Canvas::getInstance();
 	result = canvas->readMapPixel(_mapName, _level, (int)iter->getProjectedX(), (int)iter->getProjectedY());
 	return 0;
 }
@@ -98,7 +100,7 @@ int ReadSteerableViewMapPixelF0D::operator()(Interface0DIterator& iter)
 int ReadCompleteViewMapPixelF0D::operator()(Interface0DIterator& iter)
 {
 	SteerableViewMap *svm = Canvas::getInstance()->getSteerableViewMap();
-	result = svm->readCompleteViewMapPixel(_level,(int)iter->getProjectedX(), (int)iter->getProjectedY());
+	result = svm->readCompleteViewMapPixel(_level, (int)iter->getProjectedX(), (int)iter->getProjectedY());
 	return 0;
 }
 
@@ -106,10 +108,10 @@ int GetViewMapGradientNormF0D::operator()(Interface0DIterator& iter)
 {
 	SteerableViewMap *svm = Canvas::getInstance()->getSteerableViewMap();
 	float pxy = svm->readCompleteViewMapPixel(_level, (int)iter->getProjectedX(), (int)iter->getProjectedY());
-	float gx = svm->readCompleteViewMapPixel(_level, (int)iter->getProjectedX() + _step, (int)iter->getProjectedY())
-	           - pxy;
-	float gy = svm->readCompleteViewMapPixel(_level, (int)iter->getProjectedX(), (int)iter->getProjectedY() + _step)
-	           - pxy;
+	float gx = svm->readCompleteViewMapPixel(_level, (int)iter->getProjectedX() + _step,
+	                                         (int)iter->getProjectedY()) - pxy;
+	float gy = svm->readCompleteViewMapPixel(_level, (int)iter->getProjectedX(),
+	                                         (int)iter->getProjectedY() + _step) - pxy;
 	result = Vec2f(gx, gy).norm();
 	return 0;
 }