From 1674a04488143149b19fda4985193dd8431fcac4 Mon Sep 17 00:00:00 2001 From: Tamito Kajiyama Date: Thu, 17 Apr 2014 14:19:10 +0900 Subject: Freestyle: removed unused *_EXPORT qualifiers for building Windows DLLs. These qualifiers were leftovers of the stand alone Freestyle program and not used (set to an empty string) in Blender for years. --- .../freestyle/intern/view_map/Functions0D.h | 48 ++++++++++------------ 1 file changed, 21 insertions(+), 27 deletions(-) (limited to 'source/blender/freestyle/intern/view_map/Functions0D.h') diff --git a/source/blender/freestyle/intern/view_map/Functions0D.h b/source/blender/freestyle/intern/view_map/Functions0D.h index b9b28f77636..045ad317db2 100644 --- a/source/blender/freestyle/intern/view_map/Functions0D.h +++ b/source/blender/freestyle/intern/view_map/Functions0D.h @@ -74,7 +74,7 @@ using namespace Geometry; * - UnaryFunction0DVec3f */ template -class /*LIB_VIEW_MAP_EXPORT*/ UnaryFunction0D +class UnaryFunction0D { public: T result; @@ -144,7 +144,7 @@ namespace Functions0D { // GetXF0D /*! Returns the X 3D coordinate of an Interface0D. */ -class LIB_VIEW_MAP_EXPORT GetXF0D : public UnaryFunction0D +class GetXF0D : public UnaryFunction0D { public: /*! Returns the string "GetXF0D" */ @@ -163,7 +163,7 @@ public: // GetYF0D /*! Returns the Y 3D coordinate of an Interface0D. */ -class LIB_VIEW_MAP_EXPORT GetYF0D : public UnaryFunction0D +class GetYF0D : public UnaryFunction0D { public: /*! Returns the string "GetYF0D" */ @@ -182,7 +182,7 @@ public: // GetZF0D /*! Returns the Z 3D coordinate of an Interface0D. */ -class LIB_VIEW_MAP_EXPORT GetZF0D : public UnaryFunction0D +class GetZF0D : public UnaryFunction0D { public: /*! Returns the string "GetZF0D" */ @@ -201,7 +201,7 @@ public: // GetProjectedXF0D /*! Returns the X 3D projected coordinate of an Interface0D. */ -class LIB_VIEW_MAP_EXPORT GetProjectedXF0D : public UnaryFunction0D +class GetProjectedXF0D : public UnaryFunction0D { public: /*! Returns the string "GetProjectedXF0D" */ @@ -220,7 +220,7 @@ public: // GetProjectedYF0D /*! Returns the Y projected 3D coordinate of an Interface0D. */ -class LIB_VIEW_MAP_EXPORT GetProjectedYF0D : public UnaryFunction0D +class GetProjectedYF0D : public UnaryFunction0D { public: /*! Returns the string "GetProjectedYF0D" */ @@ -239,7 +239,7 @@ public: // GetProjectedZF0D /*! Returns the Z projected 3D coordinate of an Interface0D. */ -class LIB_VIEW_MAP_EXPORT GetProjectedZF0D : public UnaryFunction0D +class GetProjectedZF0D : public UnaryFunction0D { public: /*! Returns the string "GetProjectedZF0D" */ @@ -258,7 +258,7 @@ public: // GetCurvilinearAbscissaF0D /*! Returns the curvilinear abscissa of an Interface0D in the context of its 1D element. */ -class LIB_VIEW_MAP_EXPORT GetCurvilinearAbscissaF0D : public UnaryFunction0D +class GetCurvilinearAbscissaF0D : public UnaryFunction0D { public: /*! Returns the string "GetCurvilinearAbscissaF0D" */ @@ -277,7 +277,7 @@ public: // GetParameterF0D /*! Returns the parameter of an Interface0D in the context of its 1D element. */ -class LIB_VIEW_MAP_EXPORT GetParameterF0D : public UnaryFunction0D +class GetParameterF0D : public UnaryFunction0D { public: /*! Returns the string "GetCurvilinearAbscissaF0D" */ @@ -298,7 +298,7 @@ public: /*! Returns a Vec2r giving the 2D oriented tangent to the 1D element to which the Interface0DIterator& belongs to and * evaluated at the Interface0D pointed by this Interface0DIterator&. */ -class LIB_VIEW_MAP_EXPORT VertexOrientation2DF0D : public UnaryFunction0D +class VertexOrientation2DF0D : public UnaryFunction0D { public: /*! Returns the string "VertexOrientation2DF0D" */ @@ -315,7 +315,7 @@ public: /*! Returns a Vec3r giving the 3D oriented tangent to the 1D element to which the Interface0DIterator& belongs to and * evaluated at the Interface0D pointed by this Interface0DIterator&. */ -class LIB_VIEW_MAP_EXPORT VertexOrientation3DF0D : public UnaryFunction0D +class VertexOrientation3DF0D : public UnaryFunction0D { public: /*! Returns the string "VertexOrientation3DF0D" */ @@ -332,7 +332,7 @@ public: /*! Returns a real giving the 2D curvature (as an angle) of the 1D element to which the Interface0DIterator& * belongs to and evaluated at the Interface0D pointed by this Interface0DIterator&. */ -class LIB_VIEW_MAP_EXPORT Curvature2DAngleF0D : public UnaryFunction0D +class Curvature2DAngleF0D : public UnaryFunction0D { public: /*! Returns the string "Curvature2DAngleF0D" */ @@ -350,7 +350,7 @@ public: * This distance is evaluated in the camera space and normalized between 0 and 1. Therefore, if no object is occluded * by the shape to which the Interface0D belongs to, 1 is returned. */ -class LIB_VIEW_MAP_EXPORT ZDiscontinuityF0D : public UnaryFunction0D +class ZDiscontinuityF0D : public UnaryFunction0D { public: /*! Returns the string "ZDiscontinuityF0D" */ @@ -367,7 +367,7 @@ public: /*! Returns a Vec2f giving the normalized 2D normal to the 1D element to which the Interface0DIterator& belongs to and * evaluated at the Interface0D pointed by this Interface0DIterator&. */ -class LIB_VIEW_MAP_EXPORT Normal2DF0D : public UnaryFunction0D +class Normal2DF0D : public UnaryFunction0D { public: /*! Returns the string "Normal2DF0D" */ @@ -389,7 +389,7 @@ public: * However, there still can be problematic cases, and the user willing to deal with this cases in a specific way * should implement its own getMaterial functor. */ -class LIB_VIEW_MAP_EXPORT MaterialF0D : public UnaryFunction0D +class MaterialF0D : public UnaryFunction0D { public: /*! Returns the string "MaterialF0D" */ @@ -410,7 +410,7 @@ public: * However, there still can be problematic cases, and the user willing to deal with this cases in a specific way * should implement its own getShapeIdF0D functor. */ -class LIB_VIEW_MAP_EXPORT ShapeIdF0D : public UnaryFunction0D +class ShapeIdF0D : public UnaryFunction0D { public: /*! Returns the string "ShapeIdF0D" */ @@ -431,7 +431,7 @@ public: * However, there still can be problematic cases, and the user willing to deal with this cases in a specific way * should implement its own getQIF0D functor. */ -class LIB_VIEW_MAP_EXPORT QuantitativeInvisibilityF0D : public UnaryFunction0D +class QuantitativeInvisibilityF0D : public UnaryFunction0D { public: /*! Returns the string "QuantitativeInvisibilityF0D" */ @@ -446,7 +446,7 @@ public: // CurveNatureF0D /*! Returns the Nature::EdgeNature of the 1D element the Interface0DIterator& belongs to. */ -class LIB_VIEW_MAP_EXPORT CurveNatureF0D : public UnaryFunction0D +class CurveNatureF0D : public UnaryFunction0D { public: /*! Returns the string "QuantitativeInvisibilityF0D" */ @@ -461,7 +461,7 @@ public: // GetShapeF0D /*! Returns the ViewShape* containing the Interface0D */ -class LIB_VIEW_MAP_EXPORT GetShapeF0D : public UnaryFunction0D< ViewShape*> +class GetShapeF0D : public UnaryFunction0D< ViewShape*> { public: /*! Returns the string "GetShapeF0D" */ @@ -476,7 +476,7 @@ public: // GetOccludersF0D /*! Returns a vector containing the ViewShape* occluding the Interface0D */ -class LIB_VIEW_MAP_EXPORT GetOccludersF0D : public UnaryFunction0D< std::vector > +class GetOccludersF0D : public UnaryFunction0D< std::vector > { public: /*! Returns the string "GetOccludersF0D" */ @@ -491,7 +491,7 @@ public: // GetOccludeeF0D /*! Returns the ViewShape* "occluded" by the Interface0D */ -class LIB_VIEW_MAP_EXPORT GetOccludeeF0D: public UnaryFunction0D< ViewShape*> +class GetOccludeeF0D: public UnaryFunction0D< ViewShape*> { public: /*! Returns the string "GetOccludeeF0D" */ @@ -508,27 +508,21 @@ public: /////////////////////////// Internal //////////////////////////// // getFEdge -LIB_VIEW_MAP_EXPORT FEdge *getFEdge(Interface0D& it1, Interface0D& it2); // getFEdges -LIB_VIEW_MAP_EXPORT void getFEdges(Interface0DIterator& it, FEdge *&fe1, FEdge *&fe2); // getViewEdges -LIB_VIEW_MAP_EXPORT void getViewEdges(Interface0DIterator& it, ViewEdge *&ve1, ViewEdge *&ve2); // getShapeF0D -LIB_VIEW_MAP_EXPORT ViewShape *getShapeF0D(Interface0DIterator& it); // getOccludersF0D -LIB_VIEW_MAP_EXPORT void getOccludersF0D(Interface0DIterator& it, std::set& oOccluders); // getOccludeeF0D -LIB_VIEW_MAP_EXPORT ViewShape *getOccludeeF0D(Interface0DIterator& it); } // end of namespace Functions0D -- cgit v1.2.3