[Bf-blender-cvs] [1674a04] master: Freestyle: removed unused *_EXPORT qualifiers for building Windows DLLs.
Tamito Kajiyama
noreply at git.blender.org
Thu Apr 17 07:37:43 CEST 2014
Commit: 1674a04488143149b19fda4985193dd8431fcac4
Author: Tamito Kajiyama
Date: Thu Apr 17 14:19:10 2014 +0900
https://developer.blender.org/rB1674a04488143149b19fda4985193dd8431fcac4
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.
===================================================================
M source/blender/freestyle/intern/blender_interface/BlenderFileLoader.h
M source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.h
M source/blender/freestyle/intern/blender_interface/BlenderTextureManager.h
M source/blender/freestyle/intern/geometry/Bezier.h
M source/blender/freestyle/intern/geometry/FastGrid.h
M source/blender/freestyle/intern/geometry/FitCurve.h
M source/blender/freestyle/intern/geometry/GeomCleaner.h
M source/blender/freestyle/intern/geometry/GeomUtils.h
M source/blender/freestyle/intern/geometry/Grid.h
M source/blender/freestyle/intern/geometry/HashGrid.h
M source/blender/freestyle/intern/geometry/Noise.h
M source/blender/freestyle/intern/geometry/matrix_util.h
M source/blender/freestyle/intern/geometry/normal_cycle.h
M source/blender/freestyle/intern/image/GaussianFilter.h
M source/blender/freestyle/intern/image/ImagePyramid.h
M source/blender/freestyle/intern/scene_graph/IndexedFaceSet.h
M source/blender/freestyle/intern/scene_graph/LineRep.h
M source/blender/freestyle/intern/scene_graph/Node.h
M source/blender/freestyle/intern/scene_graph/NodeCamera.h
M source/blender/freestyle/intern/scene_graph/NodeDrawingStyle.h
M source/blender/freestyle/intern/scene_graph/NodeGroup.h
M source/blender/freestyle/intern/scene_graph/NodeLight.h
M source/blender/freestyle/intern/scene_graph/NodeShape.h
M source/blender/freestyle/intern/scene_graph/NodeTransform.h
M source/blender/freestyle/intern/scene_graph/OrientedLineRep.h
M source/blender/freestyle/intern/scene_graph/Rep.h
M source/blender/freestyle/intern/scene_graph/SceneVisitor.h
M source/blender/freestyle/intern/scene_graph/TriangleRep.h
M source/blender/freestyle/intern/scene_graph/VertexRep.h
M source/blender/freestyle/intern/stroke/AdvancedFunctions0D.h
M source/blender/freestyle/intern/stroke/AdvancedFunctions1D.h
M source/blender/freestyle/intern/stroke/AdvancedStrokeShaders.h
M source/blender/freestyle/intern/stroke/BasicStrokeShaders.h
M source/blender/freestyle/intern/stroke/Canvas.cpp
M source/blender/freestyle/intern/stroke/Canvas.h
M source/blender/freestyle/intern/stroke/ChainingIterators.h
M source/blender/freestyle/intern/stroke/ContextFunctions.h
M source/blender/freestyle/intern/stroke/Curve.h
M source/blender/freestyle/intern/stroke/Operators.cpp
M source/blender/freestyle/intern/stroke/Operators.h
M source/blender/freestyle/intern/stroke/PSStrokeRenderer.h
M source/blender/freestyle/intern/stroke/Stroke.h
M source/blender/freestyle/intern/stroke/StrokeIO.h
M source/blender/freestyle/intern/stroke/StrokeRenderer.cpp
M source/blender/freestyle/intern/stroke/StrokeRenderer.h
M source/blender/freestyle/intern/stroke/TextStrokeRenderer.h
M source/blender/freestyle/intern/system/BaseObject.h
M source/blender/freestyle/intern/system/Exception.h
M source/blender/freestyle/intern/system/FreestyleConfig.h
M source/blender/freestyle/intern/system/Interpreter.h
M source/blender/freestyle/intern/system/PseudoNoise.h
M source/blender/freestyle/intern/system/PythonInterpreter.h
M source/blender/freestyle/intern/system/RandGen.h
M source/blender/freestyle/intern/system/StringUtils.h
M source/blender/freestyle/intern/system/TimeStamp.cpp
M source/blender/freestyle/intern/system/TimeStamp.h
M source/blender/freestyle/intern/view_map/FEdgeXDetector.h
M source/blender/freestyle/intern/view_map/Functions0D.h
M source/blender/freestyle/intern/view_map/Functions1D.h
M source/blender/freestyle/intern/view_map/Silhouette.h
M source/blender/freestyle/intern/view_map/SilhouetteGeomEngine.h
M source/blender/freestyle/intern/view_map/SteerableViewMap.h
M source/blender/freestyle/intern/view_map/ViewEdgeXBuilder.h
M source/blender/freestyle/intern/view_map/ViewMap.h
M source/blender/freestyle/intern/view_map/ViewMapBuilder.h
M source/blender/freestyle/intern/view_map/ViewMapIO.h
M source/blender/freestyle/intern/view_map/ViewMapTesselator.h
M source/blender/freestyle/intern/winged_edge/Curvature.h
M source/blender/freestyle/intern/winged_edge/WEdge.cpp
M source/blender/freestyle/intern/winged_edge/WEdge.h
M source/blender/freestyle/intern/winged_edge/WFillGrid.h
M source/blender/freestyle/intern/winged_edge/WSFillGrid.h
M source/blender/freestyle/intern/winged_edge/WXEdge.h
M source/blender/freestyle/intern/winged_edge/WXEdgeBuilder.h
M source/blender/freestyle/intern/winged_edge/WingedEdgeBuilder.h
===================================================================
diff --git a/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.h b/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.h
index 17c0dd0..d16a311 100644
--- a/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.h
+++ b/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.h
@@ -74,7 +74,7 @@ struct LoaderState {
float maxBBox[3];
};
-class LIB_SCENE_GRAPH_EXPORT BlenderFileLoader
+class BlenderFileLoader
{
public:
/*! Builds a MaxFileLoader */
diff --git a/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.h b/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.h
index 96ce8c1..4bedffc 100644
--- a/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.h
+++ b/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.h
@@ -39,7 +39,7 @@ extern "C" {
namespace Freestyle {
-class LIB_STROKE_EXPORT BlenderStrokeRenderer : public StrokeRenderer
+class BlenderStrokeRenderer : public StrokeRenderer
{
public:
BlenderStrokeRenderer(Render *re, int render_count);
diff --git a/source/blender/freestyle/intern/blender_interface/BlenderTextureManager.h b/source/blender/freestyle/intern/blender_interface/BlenderTextureManager.h
index b6cb303..7edbefd 100644
--- a/source/blender/freestyle/intern/blender_interface/BlenderTextureManager.h
+++ b/source/blender/freestyle/intern/blender_interface/BlenderTextureManager.h
@@ -32,7 +32,7 @@
namespace Freestyle {
/*! Class to load textures */
-class LIB_RENDERING_EXPORT BlenderTextureManager : public TextureManager
+class BlenderTextureManager : public TextureManager
{
public:
BlenderTextureManager();
diff --git a/source/blender/freestyle/intern/geometry/Bezier.h b/source/blender/freestyle/intern/geometry/Bezier.h
index 34af31d..ed26803 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<Vec2d> _ControlPolygon;
@@ -70,7 +70,7 @@ public:
#endif
};
-class LIB_GEOMETRY_EXPORT BezierCurve
+class BezierCurve
{
private:
std::vector<Vec2d> _ControlPolygon;
diff --git a/source/blender/freestyle/intern/geometry/FastGrid.h b/source/blender/freestyle/intern/geometry/FastGrid.h
index 0982c1a..355a6e5 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 809ef87..2268f6b 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<Vector2> _vertices;
diff --git a/source/blender/freestyle/intern/geometry/GeomCleaner.h b/source/blender/freestyle/intern/geometry/GeomCleaner.h
index 0b97614..d516c56 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 dbb7a5d..64aa637 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<Vec3r>& vertices, const Matrix44r& trans, vector<Vec3r>& 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
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list