summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 78fc9e5)
raw | patch | inline | side by side (parent: 78fc9e5)
author | johanengelen <johanengelen@users.sourceforge.net> | |
Thu, 26 Jun 2008 15:06:10 +0000 (15:06 +0000) | ||
committer | johanengelen <johanengelen@users.sourceforge.net> | |
Thu, 26 Jun 2008 15:06:10 +0000 (15:06 +0000) |
src/helper/geom.cpp | patch | blob | history | |
src/helper/geom.h | patch | blob | history |
diff --git a/src/helper/geom.cpp b/src/helper/geom.cpp
index 190a52b5d642b3c033fcabf4fa752f4a3cbda7dc..283e4a3b278ce05c2fee51123622d609aece62e6 100644 (file)
--- a/src/helper/geom.cpp
+++ b/src/helper/geom.cpp
geom_curve_bbox_wind_distance(Geom::Curve const * c, Geom::Matrix const &m,\r
Geom::Point const &pt,\r
Geom::Rect *bbox, int *wind, Geom::Coord *dist,\r
- Geom::Coord tolerance, Geom::Rect *viewbox,\r
+ Geom::Coord tolerance, Geom::Rect const *viewbox,\r
Geom::Point &p0) // pass p0 through as it represents the last endpoint added (the finalPoint of last curve)\r
{\r
if(Geom::LineSegment const *line_segment = dynamic_cast<Geom::LineSegment const *>(c)) { // TODO: make it work for HLineSegment too! (use finalPoint)\r
void\r
pathv_matrix_point_bbox_wind_distance (Geom::PathVector const & pathv, Geom::Matrix const &m, Geom::Point const &pt,\r
Geom::Rect *bbox, int *wind, Geom::Coord *dist,\r
- Geom::Coord tolerance, Geom::Rect *viewbox)\r
+ Geom::Coord tolerance, Geom::Rect const *viewbox)\r
{\r
if (pathv.empty()) {\r
if (wind) *wind = 0;\r
@@ -450,7 +450,7 @@ pathv_matrix_point_bbox_wind_distance (Geom::PathVector const & pathv, Geom::Mat
void\r
pathv_matrix_point_bbox_wind_distance (Geom::PathVector const & pathv, NR::Matrix const &m, NR::Point const &pt,\r
NR::Rect *bbox, int *wind, NR::Coord *dist,\r
- NR::Coord tolerance, NR::Rect *viewbox)\r
+ NR::Coord tolerance, NR::Rect const *viewbox)\r
{\r
Geom::Rect _bbox;\r
if (bbox)\r
@@ -473,8 +473,6 @@ pathv_matrix_point_bbox_wind_distance (Geom::PathVector const & pathv, NR::Matri
*bbox = from_2geom(_bbox);\r
if (dist)\r
*dist = _dist;\r
- if (viewbox)\r
- *viewbox = from_2geom(_viewbox);\r
}\r
//#################################################################################\r
\r
diff --git a/src/helper/geom.h b/src/helper/geom.h
index 95e735f6c48afe2a0fc3a74ac32ad069d7cd7881..a271ae3f064bdccb4f401e9c5b12109133976a60 100644 (file)
--- a/src/helper/geom.h
+++ b/src/helper/geom.h
@@ -21,10 +21,10 @@ Geom::Rect bounds_exact_transformed(Geom::PathVector const & pv, Geom::Matrix co
\r
void pathv_matrix_point_bbox_wind_distance ( Geom::PathVector const & pathv, NR::Matrix const &m, NR::Point const &pt,\r
NR::Rect *bbox, int *wind, NR::Coord *dist,\r
- NR::Coord tolerance, NR::Rect *viewbox) __attribute__ ((deprecated));\r
+ NR::Coord tolerance, NR::Rect const *viewbox) __attribute__ ((deprecated));\r
void pathv_matrix_point_bbox_wind_distance ( Geom::PathVector const & pathv, Geom::Matrix const &m, Geom::Point const &pt,\r
Geom::Rect *bbox, int *wind, Geom::Coord *dist,\r
- Geom::Coord tolerance, Geom::Rect *viewbox);\r
+ Geom::Coord tolerance, Geom::Rect const *viewbox);\r
\r
#endif // INKSCAPE_HELPER_GEOM_H\r
\r