Another big code clean-up patch by Bastien Montagne (GPL headers, indentation,

spaces around operators, and so forth).  Many thanks!

1 files changed, 85 insertions, 55 deletions

diff --git a/source/blender/freestyle/intern/application/AppCanvas.h b/source/blender/freestyle/intern/application/AppCanvas.h
index 59ed2af3bdd..3a65020463c 100644
--- a/source/blender/freestyle/intern/application/AppCanvas.h
+++ b/source/blender/freestyle/intern/application/AppCanvas.h
@@ -1,71 +1,101 @@
-#ifndef ARTCANVAS_H
-#define ARTCANVAS_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 __APPCANVAS_H__
+#define __APPCANVAS_H__
+
+/** \file blender/freestyle/intern/application/AppCanvas.h
+ *  \ingroup freestyle
+ */
 
 #include "../stroke/Canvas.h"
 #include "AppView.h"
 
 class AppCanvas : public Canvas
 {
-	
 public:
-  AppCanvas();
-  AppCanvas(AppView *iViewer);
-  AppCanvas(const AppCanvas& iBrother);
-  virtual ~AppCanvas();
-
-  /*! operations that need to be done before a draw */
-  virtual void preDraw();
-  
-  /*! operations that need to be done after a draw */
-  virtual void postDraw();
-  
-  /*! Erases the layers and clears the canvas */
-  virtual void Erase(); 
-  
-  /* init the canvas */
-  virtual void init();
-  
-  /*! Reads a pixel area from the canvas */
-  virtual void readColorPixels(int x,int y,int w, int h, RGBImage& oImage) const;
-  /*! Reads a depth pixel area from the canvas */
-  virtual void readDepthPixels(int x,int y,int w, int h, GrayImage& oImage) const;
-
-  virtual BBox<Vec3r> scene3DBBox() const ;
-
-	// abstract
+	AppCanvas();
+	AppCanvas(AppView *iViewer);
+	AppCanvas(const AppCanvas& iBrother);
+	virtual ~AppCanvas();
+
+	/*! operations that need to be done before a draw */
+	virtual void preDraw();
+
+	/*! operations that need to be done after a draw */
+	virtual void postDraw();
+
+	/*! Erases the layers and clears the canvas */
+	virtual void Erase();
+
+	/* init the canvas */
+	virtual void init();
+
+	/*! Reads a pixel area from the canvas */
+	virtual void readColorPixels(int x,int y,int w, int h, RGBImage& oImage) const;
+	/*! Reads a depth pixel area from the canvas */
+	virtual void readDepthPixels(int x,int y,int w, int h, GrayImage& oImage) const;
+
+	virtual BBox<Vec3r> scene3DBBox() const;
+
+	/* abstract */
 	virtual void RenderStroke(Stroke*);
 	virtual void update();
 
 
-  /*! accessors */
-  virtual int width() const ;
-  virtual int height() const ;
-  virtual BBox<Vec2i> border() const ;
-  virtual float thickness() const ;
+	/*! accessors */
+	virtual int width() const;
+	virtual int height() const;
+	virtual BBox<Vec2i> border() const;
+	virtual float thickness() const;
 
 	AppView *_pViewer;
-  inline const AppView * viewer() const {return _pViewer;}
-
-  /*! modifiers */
-  void setViewer(AppView *iViewer) ;
-
-  // soc
-  void setPassDiffuse(float *buf, int width, int height) {
-      _pass_diffuse.buf = buf;
-      _pass_diffuse.width = width;
-      _pass_diffuse.height = height;
-  }
-  void setPassZ(float *buf, int width, int height) {
-      _pass_z.buf = buf;
-      _pass_z.width = width;
-      _pass_z.height = height;
-  }
+	inline const AppView * viewer() const {return _pViewer;}
+
+	/*! modifiers */
+	void setViewer(AppView *iViewer);
+
+	/* soc */
+	void setPassDiffuse(float *buf, int width, int height) {
+		_pass_diffuse.buf = buf;
+		_pass_diffuse.width = width;
+		_pass_diffuse.height = height;
+	}
+	void setPassZ(float *buf, int width, int height) {
+		_pass_z.buf = buf;
+		_pass_z.width = width;
+		_pass_z.height = height;
+	}
+
 private:
-    struct {
-        float *buf;
-        int width, height;
-    } _pass_diffuse, _pass_z;
+	struct {
+		float *buf;
+		int width, height;
+	} _pass_diffuse, _pass_z;
 };
 
-
-#endif
+#endif // __APPCANVAS_H__