Got rid of a number of compiler warnings with regard to redefinitions
authorTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Wed, 7 Apr 2010 23:28:29 +0000 (23:28 +0000)
committerTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Wed, 7 Apr 2010 23:28:29 +0000 (23:28 +0000)
of _POSIX_C_SOURCE and _XOPEN_SOURCE.  There are no functional changes.
Tested with GCC 4.4.1 on Ubuntu 9.10 (karmic).

65 files changed:
source/blender/freestyle/intern/application/AppCanvas.cpp
source/blender/freestyle/intern/application/AppView.cpp
source/blender/freestyle/intern/application/Controller.h
source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.h
source/blender/freestyle/intern/blender_interface/BlenderTextureManager.h
source/blender/freestyle/intern/blender_interface/FRS_freestyle.cpp
source/blender/freestyle/intern/python/BPy_BBox.h
source/blender/freestyle/intern/python/BPy_BinaryPredicate0D.h
source/blender/freestyle/intern/python/BPy_BinaryPredicate1D.h
source/blender/freestyle/intern/python/BPy_ContextFunctions.h
source/blender/freestyle/intern/python/BPy_Convert.h
source/blender/freestyle/intern/python/BPy_Freestyle.h
source/blender/freestyle/intern/python/BPy_FrsMaterial.h
source/blender/freestyle/intern/python/BPy_FrsNoise.h
source/blender/freestyle/intern/python/BPy_Id.h
source/blender/freestyle/intern/python/BPy_IntegrationType.h
source/blender/freestyle/intern/python/BPy_Interface0D.h
source/blender/freestyle/intern/python/BPy_Interface1D.h
source/blender/freestyle/intern/python/BPy_Iterator.h
source/blender/freestyle/intern/python/BPy_MediumType.h
source/blender/freestyle/intern/python/BPy_Nature.h
source/blender/freestyle/intern/python/BPy_Operators.h
source/blender/freestyle/intern/python/BPy_SShape.h
source/blender/freestyle/intern/python/BPy_StrokeAttribute.h
source/blender/freestyle/intern/python/BPy_StrokeShader.h
source/blender/freestyle/intern/python/BPy_UnaryFunction0D.h
source/blender/freestyle/intern/python/BPy_UnaryFunction1D.h
source/blender/freestyle/intern/python/BPy_UnaryPredicate0D.h
source/blender/freestyle/intern/python/BPy_UnaryPredicate1D.h
source/blender/freestyle/intern/python/BPy_ViewMap.h
source/blender/freestyle/intern/python/BPy_ViewShape.h
source/blender/freestyle/intern/rendering/GLDebugRenderer.cpp
source/blender/freestyle/intern/rendering/GLDebugRenderer.h
source/blender/freestyle/intern/rendering/GLRenderer.cpp
source/blender/freestyle/intern/rendering/GLStrokeRenderer.h
source/blender/freestyle/intern/stroke/AdvancedFunctions1D.h
source/blender/freestyle/intern/stroke/AdvancedStrokeShaders.cpp
source/blender/freestyle/intern/stroke/BasicStrokeShaders.cpp
source/blender/freestyle/intern/stroke/Canvas.cpp
source/blender/freestyle/intern/stroke/ChainingIterators.h
source/blender/freestyle/intern/stroke/Curve.h
source/blender/freestyle/intern/stroke/Operators.cpp
source/blender/freestyle/intern/stroke/Operators.h
source/blender/freestyle/intern/stroke/PSStrokeRenderer.h
source/blender/freestyle/intern/stroke/Stroke.h
source/blender/freestyle/intern/stroke/StrokeIO.h
source/blender/freestyle/intern/stroke/StrokeLayer.cpp
source/blender/freestyle/intern/stroke/StrokeRenderer.h
source/blender/freestyle/intern/stroke/StrokeRep.cpp
source/blender/freestyle/intern/stroke/StrokeTesselator.cpp
source/blender/freestyle/intern/stroke/StrokeTesselator.h
source/blender/freestyle/intern/stroke/TextStrokeRenderer.h
source/blender/freestyle/intern/system/PythonInterpreter.h
source/blender/freestyle/intern/view_map/Functions1D.h
source/blender/freestyle/intern/view_map/Interface0D.h
source/blender/freestyle/intern/view_map/Interface1D.h
source/blender/freestyle/intern/view_map/Silhouette.h
source/blender/freestyle/intern/view_map/SilhouetteGeomEngine.cpp
source/blender/freestyle/intern/view_map/SteerableViewMap.cpp
source/blender/freestyle/intern/view_map/ViewEdgeXBuilder.cpp
source/blender/freestyle/intern/view_map/ViewMap.h
source/blender/freestyle/intern/view_map/ViewMapBuilder.cpp
source/blender/freestyle/intern/view_map/ViewMapBuilder.h
source/blender/freestyle/intern/view_map/ViewMapIO.h
source/blender/freestyle/intern/view_map/ViewMapTesselator.h

index 986830292c9db52dcf2ed32e6cf727c99884bf8b..3844cf2195a5ca3d8f0de87370992016aaac2222 100755 (executable)
 //
 ///////////////////////////////////////////////////////////////////////////////
 
+#include "Controller.h"
 #include "../rendering/GLBlendEquation.h"
-
 #include "AppView.h"
 #include "../image/Image.h"
 #include "../system/TimeStamp.h"
-#include "Controller.h"
 #include "../stroke/StrokeRenderer.h"
 #include "AppCanvas.h"
 #include "../rendering/GLRenderer.h"
index 886fa31bc9323bdec7f6a1138c9d1a7d4a740110..e523a89b44523abe19f8409c5c3d13ab0af21ebb 100644 (file)
@@ -19,6 +19,8 @@
 //
 ///////////////////////////////////////////////////////////////////////////////
 
+#include "Controller.h"
+
 extern "C" {
 #include "BLI_jitter.h"
 }
@@ -27,7 +29,6 @@ extern "C" {
 #include "../stroke/Canvas.h"
 #include "AppView.h"
 #include "../scene_graph/NodeLight.h"
-#include "Controller.h"
 #include "../view_map/Silhouette.h"
 #include "../view_map/ViewMap.h"
 #include "../scene_graph/LineRep.h"
index deeabb6da0a426f991b97ed502f63d407fa6d86b..422707d3c1f7355fc1df5aba598e307b2bd29c7b 100755 (executable)
 #ifndef  CONTROLLER_H
 # define CONTROLLER_H
 
+# include "../view_map/ViewMapBuilder.h"
 # include <string>
 //# include "ConfigIO.h"
 # include "../geometry/FastGrid.h"
 # include "../geometry/HashGrid.h"
-# include "../view_map/ViewMapBuilder.h"
 # include "../system/TimeUtils.h"
 # include "../system/ProgressBar.h"
 # include "../system/Precision.h"
index 38f498ead6fb6eded32cfbb7351227a47c7c2d57..40d87ce53a193a9030af0b3fa7eba2f3ac3b9ee0 100644 (file)
@@ -1,8 +1,8 @@
 #ifndef  BLENDERSTROKERENDERER_H
 # define BLENDERSTROKERENDERER_H
 
-# include "../system/FreestyleConfig.h"
 # include "../stroke/StrokeRenderer.h"
+# include "../system/FreestyleConfig.h"
 
 #ifdef __cplusplus
 extern "C" {
index d49ab9cf00841cce3c197aa463d64770d32b3970..fac33c139e183f58acff91a963d7b66365484fad 100644 (file)
@@ -1,9 +1,9 @@
 #ifndef  BLENDERTEXTUREMANAGER_H
 #define BLENDERTEXTUREMANAGER_H
 
-# include "../system/FreestyleConfig.h"
 # include "../stroke/StrokeRenderer.h"
 # include "../stroke/StrokeRep.h"
+# include "../system/FreestyleConfig.h"
 
 /*! Class to load textures
  */
index 1c2993f72978e61c6885a560d1829cd914cbd5b3..1b22e1003d3a571df0ab6c00eea0096801039111 100644 (file)
@@ -1,5 +1,5 @@
-#include "../application/AppView.h"
 #include "../application/Controller.h"
+#include "../application/AppView.h"
 #include "../application/AppConfig.h"
 #include "../application/AppCanvas.h"
 
index 96a61e18c2f16471bc200852be093c50e9e706fd..f8282187da0ffb187de5945c369b922c579d01f1 100644 (file)
@@ -1,6 +1,8 @@
 #ifndef FREESTYLE_PYTHON_BBOX_H
 #define FREESTYLE_PYTHON_BBOX_H
 
+#include <Python.h>
+
 #include "../geometry/BBox.h"
 #include "../geometry/Geom.h"
 using namespace Geometry;
@@ -11,8 +13,6 @@ extern "C" {
 
 ///////////////////////////////////////////////////////////////////////////////////////////
 
-#include <Python.h>
-
 extern PyTypeObject BBox_Type;
 
 #define BPy_BBox_Check(v)      (  PyObject_IsInstance( (PyObject *) v, (PyObject *) &BBox_Type)  )
index d27b6cc0fe8159f3e62ceb89ce1b0fd747d24026..6a9a07756089a78f9fa30995a7d48b725cd73e21 100644 (file)
@@ -1,6 +1,8 @@
 #ifndef FREESTYLE_PYTHON_BINARYPREDICATE0D_H
 #define FREESTYLE_PYTHON_BINARYPREDICATE0D_H
 
+#include <Python.h>
+
 #include "../stroke/Predicates0D.h"
 
 #ifdef __cplusplus
@@ -9,8 +11,6 @@ extern "C" {
 
 ///////////////////////////////////////////////////////////////////////////////////////////
 
-#include <Python.h>
-
 extern PyTypeObject BinaryPredicate0D_Type;
 
 #define BPy_BinaryPredicate0D_Check(v) (  PyObject_IsInstance( (PyObject *) v, (PyObject *) &BinaryPredicate0D_Type)  )
index 42419ce71299c9802f7937f46458ce93735c9269..5a993f84f5be4c948ba8e61498858bb390334500 100644 (file)
@@ -1,6 +1,8 @@
 #ifndef FREESTYLE_PYTHON_BINARYPREDICATE1D_H
 #define FREESTYLE_PYTHON_BINARYPREDICATE1D_H
 
+#include <Python.h>
+
 #include "../stroke/Predicates1D.h"
 
 #ifdef __cplusplus
@@ -9,8 +11,6 @@ extern "C" {
 
 ///////////////////////////////////////////////////////////////////////////////////////////
 
-#include <Python.h>
-
 extern PyTypeObject BinaryPredicate1D_Type;
 
 #define BPy_BinaryPredicate1D_Check(v) (  PyObject_IsInstance( (PyObject *) v, (PyObject *) &BinaryPredicate1D_Type)  )
index 5ec70f1a261d04f3d7ee6ed678128c2c89a2da7a..fafeff3e974729b49bb78e9bdac19610674364ff 100644 (file)
@@ -1,12 +1,12 @@
 #ifndef FREESTYLE_PYTHON_CONTEXTFUNCTIONS_H
 #define FREESTYLE_PYTHON_CONTEXTFUNCTIONS_H
 
+#include <Python.h>
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-#include <Python.h>
-
 /*---------------------------Python BPy_ContextFunctions visible prototypes-----------*/
 
 int ContextFunctions_Init( PyObject *module );
index 3c0ada2ce764ef465dd21a5a6964b10ff7ba22f2..1e861e23c783b58a92e8e2cc43b802b257089806 100644 (file)
@@ -1,6 +1,7 @@
 #ifndef FREESTYLE_PYTHON_CONVERT_H
 #define FREESTYLE_PYTHON_CONVERT_H
 
+#include <Python.h>
 #include <typeinfo>
 
 #include "../geometry/Geom.h"
@@ -61,7 +62,6 @@ extern "C" {
 
 ///////////////////////////////////////////////////////////////////////////////////////////
 
-#include <Python.h>
 #include "generic/Mathutils.h"
 
 //==============================
index 4a280cee5af1168ee2dbdf5e6355082078496c62..8ade4b5ff4d7fcf25fdff11ac5c36cb6425ddfdc 100644 (file)
@@ -1,14 +1,14 @@
 #ifndef FREESTYLE_PYTHON_FREESTYLE_H
 #define FREESTYLE_PYTHON_FREESTYLE_H
 
+#include <Python.h>
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 
 ///////////////////////////////////////////////////////////////////////////////////////////
 
-#include <Python.h>
-
 /*---------------------------Python BPy_Freestyle visible prototypes-----------*/
 
 PyObject *Freestyle_Init( void );
index 01bdabc09d931936805a514cf724ae2d42558fde..f541e1bb52920a49131c534a9e756cd1f87160a2 100644 (file)
@@ -1,6 +1,8 @@
 #ifndef FREESTYLE_PYTHON_FRSMATERIAL_H
 #define FREESTYLE_PYTHON_FRSMATERIAL_H
 
+#include <Python.h>
+
 #include "../scene_graph/FrsMaterial.h"
 
 #ifdef __cplusplus
@@ -9,8 +11,6 @@ extern "C" {
 
 ///////////////////////////////////////////////////////////////////////////////////////////
 
-#include <Python.h>
-
 extern PyTypeObject FrsMaterial_Type;
 
 #define BPy_FrsMaterial_Check(v)       (  PyObject_IsInstance( (PyObject *) v, (PyObject *) &FrsMaterial_Type)  )
index 9b06ea0c37d84ca06226ec8a901b828e69bb606a..00b4f3375bccb46673d7b9bb137800f5b845055d 100644 (file)
@@ -1,6 +1,8 @@
 #ifndef FREESTYLE_PYTHON_FRSNOISE_H
 #define FREESTYLE_PYTHON_FRSNOISE_H
 
+#include <Python.h>
+
 #include "../geometry/Noise.h"
 
 #ifdef __cplusplus
@@ -9,8 +11,6 @@ extern "C" {
 
 ///////////////////////////////////////////////////////////////////////////////////////////
 
-#include <Python.h>
-
 extern PyTypeObject FrsNoise_Type;
 
 #define BPy_FrsNoise_Check(v)  (  PyObject_IsInstance( (PyObject *) v, (PyObject *) &FrsNoise_Type)  )
index 3063334f0754363494c32651bdaea4904283d982..10f370f8a809c01eef003d7ea6208ef251e6b635 100644 (file)
@@ -1,6 +1,7 @@
 #ifndef FREESTYLE_PYTHON_ID_H
 #define FREESTYLE_PYTHON_ID_H
 
+#include <Python.h>
 #include <iostream>
 using namespace std;
 
@@ -12,8 +13,6 @@ extern "C" {
 
 ///////////////////////////////////////////////////////////////////////////////////////////
 
-#include <Python.h>
-
 extern PyTypeObject Id_Type;
 
 #define BPy_Id_Check(v)        (  PyObject_IsInstance( (PyObject *) v, (PyObject *) &Id_Type)  )
index 176d8750c455dfe561b8464b6b69436499d700f7..f15ae8309e3ef006ae0a59688db74ebe82fd9aa0 100644 (file)
@@ -1,6 +1,8 @@
 #ifndef FREESTYLE_PYTHON_INTEGRATIONTYPE_H
 #define FREESTYLE_PYTHON_INTEGRATIONTYPE_H
 
+#include <Python.h>
+
 #include "../view_map/Interface1D.h"
 
 #ifdef __cplusplus
@@ -9,8 +11,6 @@ extern "C" {
 
 ///////////////////////////////////////////////////////////////////////////////////////////
 
-#include <Python.h>
-
 extern PyTypeObject IntegrationType_Type;
 
 #define BPy_IntegrationType_Check(v)   (  PyObject_IsInstance( (PyObject *) v, (PyObject *) &IntegrationType_Type)  )
index cd8a8e19749242dc167c705ad492325aa9330752..25134db5352a42e2c2e0ec2d3e042481cda4631c 100644 (file)
@@ -1,6 +1,8 @@
 #ifndef FREESTYLE_PYTHON_INTERFACE0D_H
 #define FREESTYLE_PYTHON_INTERFACE0D_H
 
+#include <Python.h>
+
 #include "../view_map/Interface0D.h"
 
 #ifdef __cplusplus
@@ -9,8 +11,6 @@ extern "C" {
 
 ///////////////////////////////////////////////////////////////////////////////////////////
 
-#include <Python.h>
-
 extern PyTypeObject Interface0D_Type;
 
 #define BPy_Interface0D_Check(v)       (  PyObject_IsInstance( (PyObject *) v, (PyObject *) &Interface0D_Type)  )
index f82b80e20eb589a1f1ad74a3d4473a02c9fd67bd..75eefa1836fa68841e86fd5b0caca3b78082d1bb 100644 (file)
@@ -1,6 +1,8 @@
 #ifndef FREESTYLE_PYTHON_INTERFACE1D_H
 #define FREESTYLE_PYTHON_INTERFACE1D_H
 
+#include <Python.h>
+
 #include "../view_map/Interface1D.h"
 
 #ifdef __cplusplus
@@ -9,8 +11,6 @@ extern "C" {
 
 ///////////////////////////////////////////////////////////////////////////////////////////
 
-#include <Python.h>
-
 extern PyTypeObject Interface1D_Type;
 
 #define BPy_Interface1D_Check(v)       (  PyObject_IsInstance( (PyObject *) v, (PyObject *) &Interface1D_Type)  )
index 162df60d91ee6993f08e967058e07071931bd33a..0bdb52ef9a593e6f1ca4b222ec716c54ac987785 100644 (file)
@@ -1,6 +1,8 @@
 #ifndef FREESTYLE_PYTHON_ITERATOR_H
 #define FREESTYLE_PYTHON_ITERATOR_H
 
+#include <Python.h>
+
 #include "../system/Iterator.h"
 
 #ifdef __cplusplus
@@ -9,8 +11,6 @@ extern "C" {
 
 ///////////////////////////////////////////////////////////////////////////////////////////
 
-#include <Python.h>
-
 extern PyTypeObject Iterator_Type;
 
 #define BPy_Iterator_Check(v)  (  PyObject_IsInstance( (PyObject *) v, (PyObject *) &Iterator_Type)  )
index 94bc7aa954cef528101defaa40e205a3ecab4d5f..3bc50477295f4021658a26cd3d3dc00d11500395 100644 (file)
@@ -1,6 +1,8 @@
 #ifndef FREESTYLE_PYTHON_MEDIUMTYPE_H
 #define FREESTYLE_PYTHON_MEDIUMTYPE_H
 
+#include <Python.h>
+
 #include "../stroke/Stroke.h"
 
 #ifdef __cplusplus
@@ -9,8 +11,6 @@ extern "C" {
 
 ///////////////////////////////////////////////////////////////////////////////////////////
 
-#include <Python.h>
-
 extern PyTypeObject MediumType_Type;
 
 #define BPy_MediumType_Check(v)        (  PyObject_IsInstance( (PyObject *) v, (PyObject *) &MediumType_Type)  )
index d5e1c9c63d4f2aee3635a01e77ac333f28156226..8c38415242e4fdec140b4a5c60d2d15582a43ea6 100644 (file)
@@ -1,6 +1,8 @@
 #ifndef FREESTYLE_PYTHON_NATURE_H
 #define FREESTYLE_PYTHON_NATURE_H
 
+#include <Python.h>
+
 #include "../winged_edge/Nature.h"
 
 #ifdef __cplusplus
@@ -9,8 +11,6 @@ extern "C" {
 
 ///////////////////////////////////////////////////////////////////////////////////////////
 
-#include <Python.h>
-
 extern PyTypeObject Nature_Type;
 
 #define BPy_Nature_Check(v)    (  PyObject_IsInstance( (PyObject *) v, (PyObject *) &Nature_Type)  )
index c6b088415c426abdd39e90fa7b5dd1a2b0a6e85f..5e01d6bb1fe55887649405fe02ab1011c4d4b8d2 100644 (file)
@@ -1,6 +1,8 @@
 #ifndef FREESTYLE_PYTHON_OPERATORS_H
 #define FREESTYLE_PYTHON_OPERATORS_H
 
+#include <Python.h>
+
 #include "../stroke/Operators.h"
 
 #ifdef __cplusplus
@@ -9,8 +11,6 @@ extern "C" {
 
 ///////////////////////////////////////////////////////////////////////////////////////////
 
-#include <Python.h>
-
 extern PyTypeObject Operators_Type;
 
 #define BPy_Operators_Check(v) (  PyObject_IsInstance( (PyObject *) v, (PyObject *) &Operators_Type)  )
index 3bcb6a60603921c0f9c61012b884c8754ed01a93..e8d631f05388c4377c302bb3d5d50526d36b56cf 100644 (file)
@@ -1,6 +1,8 @@
 #ifndef FREESTYLE_PYTHON_SSHAPE_H
 #define FREESTYLE_PYTHON_SSHAPE_H
 
+#include <Python.h>
+
 #include "../view_map/Silhouette.h"
 
 #ifdef __cplusplus
@@ -9,8 +11,6 @@ extern "C" {
 
 ///////////////////////////////////////////////////////////////////////////////////////////
 
-#include <Python.h>
-
 extern PyTypeObject SShape_Type;
 
 #define BPy_SShape_Check(v)    (  PyObject_IsInstance( (PyObject *) v, (PyObject *) &SShape_Type)  )
index a2193c681aaa7260593f7a5d4b1cddd9599fdcb5..51e18c0a96f45637caf73ff163c1e8009ad0a6ea 100644 (file)
@@ -1,6 +1,8 @@
 #ifndef FREESTYLE_PYTHON_STROKEATTRIBUTE_H
 #define FREESTYLE_PYTHON_STROKEATTRIBUTE_H
 
+#include <Python.h>
+
 #include "../stroke/Stroke.h"
 
 #ifdef __cplusplus
@@ -9,8 +11,6 @@ extern "C" {
 
 ///////////////////////////////////////////////////////////////////////////////////////////
 
-#include <Python.h>
-
 extern PyTypeObject StrokeAttribute_Type;
 
 #define BPy_StrokeAttribute_Check(v)   (  PyObject_IsInstance( (PyObject *) v, (PyObject *) &StrokeAttribute_Type)  )
index e1d72cef5469c5ce9fe2d1aa6ff131e696ed4cd8..baa31a3100e96cc63cdbf04fdbd0d72df1564ec9 100644 (file)
@@ -1,6 +1,7 @@
 #ifndef FREESTYLE_PYTHON_STROKESHADER_H
 #define FREESTYLE_PYTHON_STROKESHADER_H
 
+#include <Python.h>
 
 #include "../system/FreestyleConfig.h"
 
@@ -14,8 +15,6 @@ extern "C" {
 
 ///////////////////////////////////////////////////////////////////////////////////////////
 
-#include <Python.h>
-
 extern PyTypeObject StrokeShader_Type;
 
 #define BPy_StrokeShader_Check(v)      (  PyObject_IsInstance( (PyObject *) v, (PyObject *) &StrokeShader_Type)  )
index d9215e3275f0f0e96e2a8333a98b45e947c060d1..6d61c336662b0bb4d7081ebc6987805c7c4c0b2b 100644 (file)
@@ -1,6 +1,8 @@
 #ifndef FREESTYLE_PYTHON_UNARYFUNCTION0D_H
 #define FREESTYLE_PYTHON_UNARYFUNCTION0D_H
 
+#include <Python.h>
+
 #include "../view_map/Functions0D.h"
 
 #ifdef __cplusplus
@@ -9,8 +11,6 @@ extern "C" {
 
 ///////////////////////////////////////////////////////////////////////////////////////////
 
-#include <Python.h>
-
 extern PyTypeObject UnaryFunction0D_Type;
 
 #define BPy_UnaryFunction0D_Check(v)   (  PyObject_IsInstance( (PyObject *) v, (PyObject *) &UnaryFunction0D_Type)  )
index b8d92ba649da3dc1c257d2410065c55b91c3bf6b..cb9df18ab75858d99d1843258e864abd474245b6 100644 (file)
@@ -1,6 +1,8 @@
 #ifndef FREESTYLE_PYTHON_UNARYFUNCTION1D_H
 #define FREESTYLE_PYTHON_UNARYFUNCTION1D_H
 
+#include <Python.h>
+
 #include "../view_map/Functions1D.h"
 
 #ifdef __cplusplus
@@ -9,8 +11,6 @@ extern "C" {
 
 ///////////////////////////////////////////////////////////////////////////////////////////
 
-#include <Python.h>
-
 extern PyTypeObject UnaryFunction1D_Type;
 
 #define BPy_UnaryFunction1D_Check(v)   (  PyObject_IsInstance( (PyObject *) v, (PyObject *) &UnaryFunction1D_Type)  )
index a3b56d39594756466f0912e3d5ee1dd322eff449..9f9bb0c1003b5e63d0f852bcb6bbd52e384a03cf 100644 (file)
@@ -1,6 +1,8 @@
 #ifndef FREESTYLE_PYTHON_UNARYPREDICATE0D_H
 #define FREESTYLE_PYTHON_UNARYPREDICATE0D_H
 
+#include <Python.h>
+
 #include "../stroke/Predicates0D.h"
 
 #ifdef __cplusplus
@@ -9,8 +11,6 @@ extern "C" {
 
 ///////////////////////////////////////////////////////////////////////////////////////////
 
-#include <Python.h>
-
 extern PyTypeObject UnaryPredicate0D_Type;
 
 #define BPy_UnaryPredicate0D_Check(v)  (  PyObject_IsInstance( (PyObject *) v, (PyObject *) &UnaryPredicate0D_Type)  )
index f23b2e0d25f9f8b185c66ab646e2779dffbc8e92..75953e7977b2cce2af912ae8378b7cf00847acea 100644 (file)
@@ -1,6 +1,8 @@
 #ifndef FREESTYLE_PYTHON_UNARYPREDICATE1D_H
 #define FREESTYLE_PYTHON_UNARYPREDICATE1D_H
 
+#include <Python.h>
+
 #include "../stroke/Predicates1D.h"
 
 #ifdef __cplusplus
@@ -9,8 +11,6 @@ extern "C" {
 
 ///////////////////////////////////////////////////////////////////////////////////////////
 
-#include <Python.h>
-
 extern PyTypeObject UnaryPredicate1D_Type;
 
 #define BPy_UnaryPredicate1D_Check(v)  (  PyObject_IsInstance( (PyObject *) v, (PyObject *) &UnaryPredicate1D_Type)  )
index f1966e5c71ee83200aabbd78bfae52f8d78d06ef..943aeb718fca06425041d26002a685cf4f7b9930 100644 (file)
@@ -1,6 +1,8 @@
 #ifndef FREESTYLE_PYTHON_VIEWMAP_H
 #define FREESTYLE_PYTHON_VIEWMAP_H
 
+#include <Python.h>
+
 #include "../view_map/ViewMap.h"
 
 #ifdef __cplusplus
@@ -9,8 +11,6 @@ extern "C" {
 
 ///////////////////////////////////////////////////////////////////////////////////////////
 
-#include <Python.h>
-
 extern PyTypeObject ViewMap_Type;
 
 #define BPy_ViewMap_Check(v)   (  PyObject_IsInstance( (PyObject *) v, (PyObject *) &ViewMap_Type)  )
index e88ab090b4726bf01ab851c47543d345aec62dc4..1850ec8f13a71b3c48e363f1d5e1bc3bdecadfda 100644 (file)
@@ -1,6 +1,8 @@
 #ifndef FREESTYLE_PYTHON_VIEWSHAPE_H
 #define FREESTYLE_PYTHON_VIEWSHAPE_H
 
+#include <Python.h>
+
 #include "../view_map/ViewMap.h"
 
 #ifdef __cplusplus
@@ -9,8 +11,6 @@ extern "C" {
 
 ///////////////////////////////////////////////////////////////////////////////////////////
 
-#include <Python.h>
-
 extern PyTypeObject ViewShape_Type;
 
 #define BPy_ViewShape_Check(v) (  PyObject_IsInstance( (PyObject *) v, (PyObject *) &ViewShape_Type)  )
index b3b77bb3ed818856ad60d272aba2f27ecc1b6d2c..12428ab633f3886962e8a28865f5ac20ef60b0fe 100755 (executable)
@@ -19,6 +19,8 @@
 //
 ///////////////////////////////////////////////////////////////////////////////
 
+#include "GLDebugRenderer.h"
+
 #include <stdio.h>
 #include "../scene_graph/VertexRep.h"
 #include "../scene_graph/NodeShape.h"
@@ -26,8 +28,6 @@
 #include "../scene_graph/LineRep.h"
 #include "../geometry/Grid.h"
 
-#include "GLDebugRenderer.h"
-
 #ifdef __MACH__
 #include <GLUT/glut.h>
 #else
index 9111d5067bc7c28451516a47575a2f97b1150a84..45316b3abc6b18eea247ab3bca349d957cb83842 100755 (executable)
 #ifndef  GLDEBUGRENDERER_H
 # define GLDEBUGRENDERER_H
 
+# include "../view_map/Silhouette.h"
 # include <float.h>
 # include "../system/FreestyleConfig.h"
 # include "GLRenderer.h"
-# include "../view_map/Silhouette.h"
 # include "../winged_edge/Curvature.h"
 
 class WSMeshShape;
index 678256f72bf6e44eae2a128d86973052f68edc1e..75901e09c2b919049c781a5b3fc57576049484e1 100755 (executable)
@@ -19,6 +19,7 @@
 //
 ///////////////////////////////////////////////////////////////////////////////
 
+#include "../stroke/Stroke.h"
 #include "../scene_graph/IndexedFaceSet.h"
 #include "../scene_graph/NodeDrawingStyle.h"
 #include "../scene_graph/NodeLight.h"
@@ -27,7 +28,6 @@
 #include "../scene_graph/NodeShape.h"
 #include "../scene_graph/OrientedLineRep.h"
 #include "../scene_graph/VertexRep.h"
-#include "../stroke/Stroke.h"
 
 #include "../scene_graph/TriangleRep.h"
 
index 345a427335041bd7195e25f302b362a2ee238efd..702899240026a47283500ce4c20355bf5fdcad94 100755 (executable)
@@ -30,9 +30,9 @@
 #ifndef  GLSTROKERENDERER_H
 # define GLSTROKERENDERER_H
 
-# include "../system/FreestyleConfig.h"
 # include "../stroke/StrokeRenderer.h"
 # include "../stroke/StrokeRep.h"
+# include "../system/FreestyleConfig.h"
 
 #include "GLBlendEquation.h"
 
index 46a28c209172d55045d33f15814411381cecbcb9..ab963c68034ae6215d0af066128b670efdb06eea 100755 (executable)
@@ -31,8 +31,8 @@
 # define ADVANCED_FUNCTIONS1D_HPP
 
 
-# include "AdvancedFunctions0D.h"
 # include "../view_map/Functions1D.h"
+# include "AdvancedFunctions0D.h"
 
 //
 // Functions definitions
index 2075f7ca6add0d8400c4a42f33afe5ffac5dbf2f..05da47914f3af5559f08081401700294ff42ebb0 100755 (executable)
@@ -19,9 +19,9 @@
 //
 ///////////////////////////////////////////////////////////////////////////////
 
+#include "AdvancedStrokeShaders.h"
 #include "../system/PseudoNoise.h"
 #include "../system/RandGen.h"
-#include "AdvancedStrokeShaders.h"
 #include "StrokeIterators.h"
 
 /////////////////////////////////////////
index 828c13338ae3375e74dd121880d519b35835a43c..bc9edcef057e7746e0c7bc00f0cc6e5483374764 100755 (executable)
@@ -19,6 +19,7 @@
 //
 ///////////////////////////////////////////////////////////////////////////////
 
+#include "StrokeRenderer.h"
 #include <fstream>
 #include "BasicStrokeShaders.h"
 #include "../system/PseudoNoise.h"
@@ -29,7 +30,6 @@
 #include "AdvancedFunctions1D.h"
 #include "StrokeIterators.h"
 #include "../system/StringUtils.h"
-#include "StrokeRenderer.h"
 #include "StrokeIO.h"
 
 //soc #include <qimage.h>
index 7be2b54a0366dde414cd194751f3e4f44ce19025..c1843b7a6c1453e1b830b73b2ac6c19577245bc7 100755 (executable)
@@ -19,9 +19,9 @@
 //
 ///////////////////////////////////////////////////////////////////////////////
 
+#include "StrokeRenderer.h"
 #include <vector>
 #include "../system/FreestyleConfig.h"
-#include "StrokeRenderer.h"
 #include "../system/TimeStamp.h"
 #include "../system/PseudoNoise.h"
 #include "Canvas.h"
index ec093888aea1f5acb941b58893ab18cc0c7aed19..fec8d5ab6dc1e7f6a59ad51595f5a581c667058e 100755 (executable)
 #ifndef  CHAININGITERATORS_H
 # define CHAININGITERATORS_H
 
-# include <iostream>
 # include "../view_map/ViewMap.h"
 # include "../view_map/ViewMapIterators.h"
 # include "../view_map/ViewMapAdvancedIterators.h"
+# include <iostream>
 # include "Predicates1D.h"
 
 #include "../system/Iterator.h" //soc 
index 52a0dda1f175d428c2fe5b6fc0c975a3b5555c71..60bc9815cb4601d51d505e7719a788b4f2a03500 100755 (executable)
 #ifndef  CURVE_H
 # define CURVE_H
 
+# include "../view_map/Silhouette.h"
 # include <deque>
 # include "../system/BaseIterator.h"
 # include "../geometry/Geom.h"
 //# include "../scene_graph/FrsMaterial.h"
-# include "../view_map/Silhouette.h"
 # include "../view_map/SilhouetteGeomEngine.h"
 # include "../view_map/Interface0D.h"
 # include "../view_map/Interface1D.h"
index 950c9570f0e8e1445d2c348db52c1745b23dbd22..ef1b26629982f95091c9ffdd2a1f080cfaf14814 100755 (executable)
@@ -19,9 +19,9 @@
 //
 ///////////////////////////////////////////////////////////////////////////////
 
+#include "Operators.h"
 #include <algorithm>
 #include <stdexcept>
-#include "Operators.h"
 #include "Canvas.h"
 #include "Stroke.h"
 
index cff9e120c1aa07eacb5b7f77be7748a4d9fc38e0..d705d5af5b24c2114e835fde8e660171da4e84d2 100755 (executable)
@@ -30,9 +30,9 @@
 #ifndef  OPERATORS_H
 # define OPERATORS_H
 
+# include "../view_map/Interface1D.h"
 # include <vector>
 # include <iostream>
-# include "../view_map/Interface1D.h"
 # include "Predicates1D.h"
 # include "Predicates0D.h"
 # include "../view_map/ViewMap.h"
index 821c016ab91a57f31e1b23cd05d8639c2d56125d..b30949845abf81c9aa09383008e2f8e0512deaf1 100755 (executable)
@@ -30,8 +30,8 @@
 #ifndef  PSSTROKERENDERER_H
 # define PSSTROKERENDERER_H
 
-# include "../system/FreestyleConfig.h"
 # include "StrokeRenderer.h"
+# include "../system/FreestyleConfig.h"
 # include <fstream>
 
 /**********************************/
index 796b5dc9e2d51f86e0841811031583114b21f052..5e0974edea722a40b84b5e85928c69fbf062db91 100755 (executable)
 #ifndef  STROKE_H
 # define STROKE_H
 
+# include "../view_map/Silhouette.h"
 # include <vector>
 # include <map>
 # include "../system/FreestyleConfig.h"
-# include "../view_map/Silhouette.h"
 # include "Curve.h"
 # include "../view_map/Interface1D.h"
 # include "../system/StringUtils.h"
index c99704c3b37a103c9b41fdd2987ae62028302aaa..150c8340778db0c4b7957108a78513d7945a6375 100755 (executable)
@@ -30,9 +30,9 @@
 #ifndef  STROKEIO_H
 # define STROKEIO_H
 
+# include "Stroke.h"
 # include <iostream>
 # include "../system/FreestyleConfig.h"
-# include "Stroke.h"
 
 LIB_STROKE_EXPORT
 ostream& operator<<(ostream& out, const StrokeAttribute& iStrokeAttribute);
index 8b469399ca827e1db4689c4bd76b825f2c453882..d5fc27d3d7367d1f1cfc43440b2a7509f331353e 100755 (executable)
@@ -19,8 +19,8 @@
 //
 ///////////////////////////////////////////////////////////////////////////////
 
-#include "StrokeLayer.h"
 #include "Stroke.h"
+#include "StrokeLayer.h"
 #include "Canvas.h"
 
 StrokeLayer::~StrokeLayer()
index 339e401aa4158309f4a3278217fadf9816d6ad3e..c7c6df635d5176654e8371fdfb7d4540112e4b02 100755 (executable)
 #ifndef  STROKE_RENDERER_H
 # define STROKE_RENDERER_H
 
+# include "Stroke.h"
 # include <vector>
 # include <map>
 # include <utility>
 # include "../system/FreestyleConfig.h"
-# include "Stroke.h"
 # include "StrokeRep.h"
 # include <string.h>
 
index 51a1c8cfd4dba33dd4fa870d305bc9b2ab3db0ac..fbe1273bac0c4bb69c03037a543520d8937445b5 100755 (executable)
@@ -19,8 +19,8 @@
 //
 ///////////////////////////////////////////////////////////////////////////////
 
-#include "StrokeRep.h"
 #include "Stroke.h"
+#include "StrokeRep.h"
 #include "StrokeRenderer.h"
 #include "StrokeAdvancedIterators.h"
 #include "StrokeIterators.h"
index 465e56627749811754641b97435f5218a3078b28..a8b71f9f3c331cc98aafca38189b2313f1784f64 100755 (executable)
 //
 ///////////////////////////////////////////////////////////////////////////////
 
+#include "StrokeTesselator.h"
 #include "../scene_graph/OrientedLineRep.h"
 #include "../scene_graph/NodeGroup.h"
 #include "../scene_graph/NodeShape.h"
-#include "StrokeTesselator.h"
 #include "StrokeAdvancedIterators.h"
 
 LineRep* StrokeTesselator::Tesselate(Stroke *iStroke)
index 1de281734cd473eb32d8b3ed4ecba2ed755e56bb..671df00ef84cb1c464309f262c74c303ac22452c 100755 (executable)
@@ -31,8 +31,8 @@
 #ifndef  STROKETESSELATOR_H
 # define STROKETESSELATOR_H
 
-# include "../scene_graph/LineRep.h"
 # include "Stroke.h"
+# include "../scene_graph/LineRep.h"
 
 class StrokeTesselator
 {
index ef610d63bddcc6f72dfb41698f81efe8394a13e7..8b4b6bc80d71d3d379fe99286e1178635da35a60 100755 (executable)
@@ -35,8 +35,8 @@
 #ifndef  TEXTSTROKERENDERER_H
 # define TEXTSTROKERENDERER_H
 
-# include "../system/FreestyleConfig.h"
 # include "StrokeRenderer.h"
+# include "../system/FreestyleConfig.h"
 # include <fstream>
 
 /**********************************/
index bf1a5064d3ed5348987b2e6df957f02e491e35a2..1178e18cdeab9e3d9962dfb8c1878cd65fb970d1 100755 (executable)
@@ -30,8 +30,8 @@
 #ifndef  PYTHON_INTERPRETER_H
 # define PYTHON_INTERPRETER_H
 
-# include <iostream>
 # include <Python.h>
+# include <iostream>
 # include "StringUtils.h"
 # include "Interpreter.h"
 
index c4060e0897ff318987692e8b23a7cec03014d314..ba42b25b47ea115e62b16b3da6d8e488b5790318 100755 (executable)
 #ifndef  FUNCTIONS1D_HPP
 # define FUNCTIONS1D_HPP
 
-# include "../system/Precision.h"
-# include "../system/TimeStamp.h"
 # include "ViewMap.h"
 # include "Functions0D.h"
 # include "Interface1D.h"
+# include "../system/Precision.h"
+# include "../system/TimeStamp.h"
 # include "../system/FreestyleConfig.h"
 
 #include "../python/Director.h"
index 5108524cdd3c176da29534e66623a332e0dfb722..48d956eec194b4dcc0970a70ded90fcb307a4eba 100755 (executable)
@@ -30,6 +30,7 @@
 #ifndef  INTERFACE0D_H
 # define INTERFACE0D_H
 
+# include <Python.h>
 # include <string>
 # include <iostream>
 # include "../system/Id.h"
@@ -40,16 +41,6 @@ using namespace std;
 
 #include "../system/Iterator.h" //soc 
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <Python.h>
-
-#ifdef __cplusplus
-}
-#endif
-
 //
 // Interface0D
 //
index 17dee3973de1b507cb81e62bb8e67068ef883c98..60cc0ebcb7eee852b7b8d3a34433ffb4e7aaf3e4 100755 (executable)
@@ -30,6 +30,7 @@
 #ifndef  INTERFACE1D_H
 # define INTERFACE1D_H
 
+# include <Python.h>
 # include <string>
 # include <iostream>
 # include <float.h>
 # include "../winged_edge/Nature.h"
 # include "Functions0D.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <Python.h>
-
-#ifdef __cplusplus
-}
-#endif
-
 using namespace std;
 /*! \file Interface1D.h
  *  Interface1D and related tools definitions
index a928eb87cc9320d4aa2418542af93d3ba7f2c0d9..fc0bff9cbff152bb5d020bd5ae1c6a01283e4bbb 100755 (executable)
@@ -30,6 +30,8 @@
 #ifndef  SILHOUETTE_H
 # define SILHOUETTE_H
 
+# include "Interface0D.h"
+# include "Interface1D.h"
 # include <iostream>
 # include <string>
 # include <vector>
@@ -41,8 +43,6 @@
 # include "../scene_graph/FrsMaterial.h"
 # include "../geometry/Polygon.h"
 # include "../system/Exception.h"
-# include "Interface0D.h"
-# include "Interface1D.h"
 # include "../winged_edge/Curvature.h"
 
 using namespace std;
index f91318101a0bec8bcaf76cf9d6311ea900e319c2..c0817189bc2db0992d6aa4e6572b34f171e788fd 100755 (executable)
@@ -19,8 +19,8 @@
 //
 ///////////////////////////////////////////////////////////////////////////////
 
-#include "SilhouetteGeomEngine.h"
 #include "Silhouette.h"
+#include "SilhouetteGeomEngine.h"
 #include "../geometry/GeomUtils.h"
 
 using namespace std;
index 13c6bd653127225f858315b1a8ce9fb033e35a29..2c3a2cebadce6eb6d885975eda5d4cf87ef4a616 100755 (executable)
 //
 ///////////////////////////////////////////////////////////////////////////////
 
+#include "Silhouette.h"
 #include "SteerableViewMap.h"
 #include "../image/ImagePyramid.h"
 #include "../image/Image.h"
-#include "Silhouette.h"
 #include <math.h>
 #include "../geometry/Geom.h"
 using namespace Geometry;
index 5f7b313aaf6f1496acfc5669cf71b54a16215d37..3e0979f684fa6768255b8a4ae2b7e059aa4a21a5 100755 (executable)
@@ -18,9 +18,9 @@
 //
 ///////////////////////////////////////////////////////////////////////////////
 
+#include "ViewMap.h"
 #include "ViewEdgeXBuilder.h"
 #include "../winged_edge/WXEdge.h"
-#include "ViewMap.h"
 #include "SilhouetteGeomEngine.h"
 #include <list>
 
index 3f6be25312a90b06fcc0fd421c106efe03e65eeb..5a9d8f3b57bf142db00b74a337e03b1a61e577f7 100755 (executable)
 #ifndef  VIEWMAP_H
 # define VIEWMAP_H
 
-# include "../system/BaseIterator.h"
-# include "../system/FreestyleConfig.h"
-# include "../geometry/GeomUtils.h"
 # include "Interface0D.h"
 # include "Interface1D.h"
 # include "Silhouette.h" // defines the embedding
+# include "../system/BaseIterator.h"
+# include "../system/FreestyleConfig.h"
+# include "../geometry/GeomUtils.h"
 # include <map>
 
                   /**********************************/
index 96635517747230fb200a6cae803b027cda508f35..7e582e7f037183de7f8b2f680217cc640ad29b29 100755 (executable)
@@ -19,8 +19,8 @@
 //
 ///////////////////////////////////////////////////////////////////////////////
 
-#include <algorithm>
 #include "ViewMapBuilder.h"
+#include <algorithm>
 
 using namespace std;
 
index aad9aa245b709fd26166f7efb39195255b95c932..12b1266fa128a3e40001cedb9186b7e7680ce51b 100755 (executable)
 #ifndef  VIEWMAPBUILDER_H
 # define VIEWMAPBUILDER_H
 
+# include "Silhouette.h"
 # include <vector>
 # include "../system/FreestyleConfig.h"
 # include "../geometry/Geom.h"
 # include "../scene_graph/NodeGroup.h"
 # include "../winged_edge/WXEdge.h"
-# include "Silhouette.h"
 # include "../geometry/GeomUtils.h"
 # include "../geometry/Grid.h"
 # include "../system/ProgressBar.h"
index 33e168b537b2c6ce6d53c9a3895b2d59ede68aff..185841a90ec0a68218697fd284d10b3996512c47 100755 (executable)
 #ifndef  VIEWMAPIO_H
 # define VIEWMAPIO_H
 
+# include "ViewMap.h"
 # include <fstream>
 # include <string>
 # include "../system/FreestyleConfig.h"
 # include "../system/ProgressBar.h"
-# include "ViewMap.h"
 
 namespace ViewMapIO {
 
index 630bfa561f2fcc91f1b4b1278c98e9dda3974c96..0177dc630b80faa8b1704dbb4ddca1d8a1a1bfb1 100755 (executable)
 #ifndef  VIEWMAPTESSELATOR_H
 # define VIEWMAPTESSELATOR_H
 
-# include "../scene_graph/NodeShape.h"
-# include "../winged_edge/WEdge.h"
 # include "Silhouette.h"
 # include "ViewMap.h"
+# include "../scene_graph/NodeShape.h"
+# include "../winged_edge/WEdge.h"
 # include "../scene_graph/NodeGroup.h"
 # include "../scene_graph/LineRep.h"
 # include "../scene_graph/OrientedLineRep.h"