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. --- source/blender/freestyle/intern/geometry/Bezier.h | 4 ++-- source/blender/freestyle/intern/geometry/FastGrid.h | 2 +- source/blender/freestyle/intern/geometry/FitCurve.h | 2 +- .../blender/freestyle/intern/geometry/GeomCleaner.h | 2 +- .../blender/freestyle/intern/geometry/GeomUtils.h | 21 --------------------- source/blender/freestyle/intern/geometry/Grid.h | 4 ++-- source/blender/freestyle/intern/geometry/HashGrid.h | 2 +- source/blender/freestyle/intern/geometry/Noise.h | 2 +- .../blender/freestyle/intern/geometry/matrix_util.h | 1 - .../freestyle/intern/geometry/normal_cycle.h | 2 +- 10 files changed, 10 insertions(+), 32 deletions(-) (limited to 'source/blender/freestyle/intern/geometry') diff --git a/source/blender/freestyle/intern/geometry/Bezier.h b/source/blender/freestyle/intern/geometry/Bezier.h index 34af31d0ba8..ed26803c2a2 100644 --- a/source/blender/freestyle/intern/geometry/Bezier.h +++ b/source/blender/freestyle/intern/geometry/Bezier.h @@ -42,7 +42,7 @@ namespace Freestyle { using namespace Geometry; -class LIB_GEOMETRY_EXPORT BezierCurveSegment +class BezierCurveSegment { private: std::vector _ControlPolygon; @@ -70,7 +70,7 @@ public: #endif }; -class LIB_GEOMETRY_EXPORT BezierCurve +class BezierCurve { private: std::vector _ControlPolygon; diff --git a/source/blender/freestyle/intern/geometry/FastGrid.h b/source/blender/freestyle/intern/geometry/FastGrid.h index 0982c1a7d7c..355a6e53399 100644 --- a/source/blender/freestyle/intern/geometry/FastGrid.h +++ b/source/blender/freestyle/intern/geometry/FastGrid.h @@ -36,7 +36,7 @@ namespace Freestyle { * We don't use a hashtable here. The grid is explicitly stored for faster computations. * However, this might result in significant increase in memory usage (compared to the regular grid) */ -class LIB_GEOMETRY_EXPORT FastGrid : public Grid +class FastGrid : public Grid { public: FastGrid() : Grid() diff --git a/source/blender/freestyle/intern/geometry/FitCurve.h b/source/blender/freestyle/intern/geometry/FitCurve.h index 809ef875c0a..2268f6be1b7 100644 --- a/source/blender/freestyle/intern/geometry/FitCurve.h +++ b/source/blender/freestyle/intern/geometry/FitCurve.h @@ -74,7 +74,7 @@ typedef struct Point2Struct typedef Point2 Vector2; -class LIB_GEOMETRY_EXPORT FitCurveWrapper +class FitCurveWrapper { private: std::vector _vertices; diff --git a/source/blender/freestyle/intern/geometry/GeomCleaner.h b/source/blender/freestyle/intern/geometry/GeomCleaner.h index 0b97614f6ea..d516c5623b9 100644 --- a/source/blender/freestyle/intern/geometry/GeomCleaner.h +++ b/source/blender/freestyle/intern/geometry/GeomCleaner.h @@ -40,7 +40,7 @@ namespace Freestyle { using namespace Geometry; -class LIB_GEOMETRY_EXPORT GeomCleaner +class GeomCleaner { public: inline GeomCleaner() {} diff --git a/source/blender/freestyle/intern/geometry/GeomUtils.h b/source/blender/freestyle/intern/geometry/GeomUtils.h index dbb7a5d4e75..64aa6379e80 100644 --- a/source/blender/freestyle/intern/geometry/GeomUtils.h +++ b/source/blender/freestyle/intern/geometry/GeomUtils.h @@ -83,17 +83,14 @@ typedef enum { COINCIDENT, } intersection_test; -LIB_GEOMETRY_EXPORT intersection_test intersect2dSeg2dSeg(const Vec2r& p1, const Vec2r& p2, // first segment const Vec2r& p3, const Vec2r& p4, // second segment Vec2r& res); // found intersection point -LIB_GEOMETRY_EXPORT intersection_test intersect2dLine2dLine(const Vec2r& p1, const Vec2r& p2, // first segment const Vec2r& p3, const Vec2r& p4, // second segment Vec2r& res); // found intersection point -LIB_GEOMETRY_EXPORT intersection_test intersect2dSeg2dSegParametric(const Vec2r& p1, const Vec2r& p2, // first segment const Vec2r& p3, const Vec2r& p4, // second segment real& t, // I = P1 + t * P1P2) @@ -101,26 +98,21 @@ intersection_test intersect2dSeg2dSegParametric(const Vec2r& p1, const Vec2r& p2 real epsilon = M_EPSILON); /*! check whether a 2D segment intersect a 2D region or not */ -LIB_GEOMETRY_EXPORT bool intersect2dSeg2dArea(const Vec2r& min, const Vec2r& max, const Vec2r& A, const Vec2r& B); /*! check whether a 2D segment is included in a 2D region or not */ -LIB_GEOMETRY_EXPORT bool include2dSeg2dArea(const Vec2r& min, const Vec2r& max, const Vec2r& A, const Vec2r& B); /*! Box-triangle overlap test, adapted from Tomas Akenine-Möller code */ -LIB_GEOMETRY_EXPORT bool overlapTriangleBox(Vec3r& boxcenter, Vec3r& boxhalfsize, Vec3r triverts[3]); /*! Fast, Minimum Storage Ray-Triangle Intersection, adapted from Tomas Möller and Ben Trumbore code. */ -LIB_GEOMETRY_EXPORT bool intersectRayTriangle(const Vec3r& orig, const Vec3r& dir, const Vec3r& v0, const Vec3r& v1, const Vec3r& v2, real& t, // I = orig + t * dir real& u, real& v, // I = (1 - u - v) * v0 + u * v1 + v * v2 const real epsilon = M_EPSILON); // the epsilon to use /*! Intersection between plane and ray adapted from Graphics Gems, Didier Badouel */ -LIB_GEOMETRY_EXPORT intersection_test intersectRayPlane(const Vec3r& orig, const Vec3r& dir, // ray origin and direction // plane's normal and offset (plane = { P / P.N + d = 0 }) const Vec3r& norm, const real d, @@ -130,7 +122,6 @@ intersection_test intersectRayPlane(const Vec3r& orig, const Vec3r& dir, // ray /*! Intersection Ray-Bounding box (axis aligned). * Adapted from Williams et al, "An Efficient Robust Ray-Box Intersection Algorithm", JGT 10:1 (2005), pp. 49-54. */ -LIB_GEOMETRY_EXPORT bool intersectRayBBox(const Vec3r& orig, const Vec3r& dir, // ray origin and direction const Vec3r& boxMin, const Vec3r& boxMax, // the bbox // the interval in which at least on of the intersections must happen @@ -140,16 +131,12 @@ bool intersectRayBBox(const Vec3r& orig, const Vec3r& dir, // ray origin an real epsilon = M_EPSILON); // the epsilon to use /*! Checks whether 3D point P lies inside or outside of the triangle ABC */ -LIB_GEOMETRY_EXPORT bool includePointTriangle(const Vec3r& P, const Vec3r& A, const Vec3r& B, const Vec3r& C); -LIB_GEOMETRY_EXPORT void transformVertex(const Vec3r& vert, const Matrix44r& matrix, Vec3r& res); -LIB_GEOMETRY_EXPORT void transformVertices(const vector& vertices, const Matrix44r& trans, vector& res); -LIB_GEOMETRY_EXPORT Vec3r rotateVector(const Matrix44r& mat, const Vec3r& v); // @@ -171,7 +158,6 @@ Vec3r rotateVector(const Matrix44r& mat, const Vec3r& v); * viewport * The viewport: x,y coordinates followed by width and height (OpenGL like viewport) */ -LIB_GEOMETRY_EXPORT void fromWorldToImage(const Vec3r& p, Vec3r& q, const real model_view_matrix[4][4], const real projection_matrix[4][4], const int viewport[4]); @@ -186,7 +172,6 @@ void fromWorldToImage(const Vec3r& p, Vec3r& q, const real model_view_matrix[4][ * viewport * The viewport: x,y coordinates followed by width and height (OpenGL like viewport) */ -LIB_GEOMETRY_EXPORT void fromWorldToImage(const Vec3r& p, Vec3r& q, const real transform[4][4], const int viewport[4]); /*! Projects from world coordinates to camera coordinates @@ -200,7 +185,6 @@ void fromWorldToImage(const Vec3r& p, Vec3r& q, const real transform[4][4], cons * The model view matrix expressed in line major order (OpenGL * matrices are column major ordered) */ -LIB_GEOMETRY_EXPORT void fromWorldToCamera(const Vec3r& p, Vec3r& q, const real model_view_matrix[4][4]); /*! Projects from World Coordinates to retina coordinates @@ -213,7 +197,6 @@ void fromWorldToCamera(const Vec3r& p, Vec3r& q, const real model_view_matrix[4] * The projection matrix expressed in line major order (OpenGL * matrices are column major ordered) */ -LIB_GEOMETRY_EXPORT void fromCameraToRetina(const Vec3r& p, Vec3r& q, const real projection_matrix[4][4]); /*! From retina to image. @@ -225,7 +208,6 @@ void fromCameraToRetina(const Vec3r& p, Vec3r& q, const real projection_matrix[4 * viewport * The viewport: x,y coordinates followed by width and height (OpenGL like viewport). */ -LIB_GEOMETRY_EXPORT void fromRetinaToImage(const Vec3r& p, Vec3r& q, const int viewport[4]); /*! From image to retina @@ -236,7 +218,6 @@ void fromRetinaToImage(const Vec3r& p, Vec3r& q, const int viewport[4]); * viewport * The viewport: x,y coordinates followed by width and height (OpenGL like viewport). */ -LIB_GEOMETRY_EXPORT void fromImageToRetina(const Vec3r& p, Vec3r& q, const int viewport[4]); /*! computes the coordinates of q in the camera coordinates system, @@ -251,7 +232,6 @@ void fromImageToRetina(const Vec3r& p, Vec3r& q, const int viewport[4]); * The projection matrix expressed in line major order (OpenGL * matrices are column major ordered) */ -LIB_GEOMETRY_EXPORT void fromRetinaToCamera(const Vec3r& p, Vec3r& q, real z, const real projection_matrix[4][4]); /*! Projects from camera coordinates to world coordinates @@ -265,7 +245,6 @@ void fromRetinaToCamera(const Vec3r& p, Vec3r& q, real z, const real projection_ * The model view matrix expressed in line major order (OpenGL * matrices are column major ordered) */ -LIB_GEOMETRY_EXPORT void fromCameraToWorld(const Vec3r& p, Vec3r& q, const real model_view_matrix[4][4]); } // end of namespace GeomUtils diff --git a/source/blender/freestyle/intern/geometry/Grid.h b/source/blender/freestyle/intern/geometry/Grid.h index 25988b3b0f8..c0cab2a05db 100644 --- a/source/blender/freestyle/intern/geometry/Grid.h +++ b/source/blender/freestyle/intern/geometry/Grid.h @@ -62,7 +62,7 @@ typedef vector OccludersSet; // /////////////////////////////////////////////////////////////////////////////// -class LIB_GEOMETRY_EXPORT Cell +class Cell { public: Cell(Vec3r& orig) { @@ -175,7 +175,7 @@ public: // /////////////////////////////////////////////////////////////////////////////// -class LIB_GEOMETRY_EXPORT Grid +class Grid { public: /*! Builds a Grid. Must be followed by a call to configure() */ diff --git a/source/blender/freestyle/intern/geometry/HashGrid.h b/source/blender/freestyle/intern/geometry/HashGrid.h index 7013a969eb5..4ea7c7146a4 100644 --- a/source/blender/freestyle/intern/geometry/HashGrid.h +++ b/source/blender/freestyle/intern/geometry/HashGrid.h @@ -60,7 +60,7 @@ struct GridHasher }; /*! Class to define a regular grid used for ray casting computations */ -class LIB_GEOMETRY_EXPORT HashGrid : public Grid +class HashGrid : public Grid { public: typedef map GridHashTable; diff --git a/source/blender/freestyle/intern/geometry/Noise.h b/source/blender/freestyle/intern/geometry/Noise.h index 8798bc45a93..88994fac0d1 100644 --- a/source/blender/freestyle/intern/geometry/Noise.h +++ b/source/blender/freestyle/intern/geometry/Noise.h @@ -45,7 +45,7 @@ namespace Freestyle { using namespace Geometry; /*! Class to provide Perlin Noise functionalities */ -class LIB_GEOMETRY_EXPORT Noise +class Noise { public: /*! Builds a Noise object */ diff --git a/source/blender/freestyle/intern/geometry/matrix_util.h b/source/blender/freestyle/intern/geometry/matrix_util.h index 162e2f85d3c..d65b0ea803b 100644 --- a/source/blender/freestyle/intern/geometry/matrix_util.h +++ b/source/blender/freestyle/intern/geometry/matrix_util.h @@ -61,7 +61,6 @@ namespace MatrixUtil { * @param eigen_values (return) are in decreasing order * size = n, must be allocated by caller */ - LIB_GEOMETRY_EXPORT void semi_definite_symmetric_eigen(const double *mat, int n, double *eigen_vec, double *eigen_val); } // MatrixUtil namespace diff --git a/source/blender/freestyle/intern/geometry/normal_cycle.h b/source/blender/freestyle/intern/geometry/normal_cycle.h index 7a63acdf52a..53bc23c6eb3 100644 --- a/source/blender/freestyle/intern/geometry/normal_cycle.h +++ b/source/blender/freestyle/intern/geometry/normal_cycle.h @@ -70,7 +70,7 @@ template inline void ogf_swap(T& x, T& y) * D. Cohen-Steiner and J.M. Morvan, * SOCG 2003 */ -class LIB_GEOMETRY_EXPORT NormalCycle { +class NormalCycle { public: NormalCycle(); void begin(); -- cgit v1.2.3