summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 43dbab3)
raw | patch | inline | side by side (parent: 43dbab3)
author | johanengelen <johanengelen@users.sourceforge.net> | |
Thu, 26 Jun 2008 15:02:43 +0000 (15:02 +0000) | ||
committer | johanengelen <johanengelen@users.sourceforge.net> | |
Thu, 26 Jun 2008 15:02:43 +0000 (15:02 +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 9916a633355467c6b8f557c628c6f09f461fb200..190a52b5d642b3c033fcabf4fa752f4a3cbda7dc 100644 (file)
--- a/src/helper/geom.cpp
+++ b/src/helper/geom.cpp
\r
\r
static void\r
-geom_line_wind_distance (Geom::Coord x0, Geom::Coord y0, Geom::Coord x1, Geom::Coord y1, Geom::Point &pt, int *wind, Geom::Coord *best)\r
+geom_line_wind_distance (Geom::Coord x0, Geom::Coord y0, Geom::Coord x1, Geom::Coord y1, Geom::Point const &pt, int *wind, Geom::Coord *best)\r
{\r
Geom::Coord Ax, Ay, Bx, By, Dx, Dy, s;\r
Geom::Coord dist2;\r
Geom::Coord x001, Geom::Coord y001,\r
Geom::Coord x011, Geom::Coord y011,\r
Geom::Coord x111, Geom::Coord y111,\r
- Geom::Point &pt,\r
+ Geom::Point const &pt,\r
Geom::Rect *bbox, int *wind, Geom::Coord *best,\r
Geom::Coord tolerance)\r
{\r
\r
static void\r
geom_curve_bbox_wind_distance(Geom::Curve const * c, Geom::Matrix const &m,\r
- Geom::Point &pt,\r
+ Geom::Point const &pt,\r
Geom::Rect *bbox, int *wind, Geom::Coord *dist,\r
Geom::Coord tolerance, Geom::Rect *viewbox,\r
Geom::Point &p0) // pass p0 through as it represents the last endpoint added (the finalPoint of last curve)\r
Returns bounding box in *bbox if bbox!=NULL.\r
*/\r
void\r
-pathv_matrix_point_bbox_wind_distance (Geom::PathVector const & pathv, Geom::Matrix const &m, Geom::Point &pt,\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
{\r
@@ -448,11 +448,10 @@ pathv_matrix_point_bbox_wind_distance (Geom::PathVector const & pathv, Geom::Mat
\r
// temporary wrapper\r
void\r
-pathv_matrix_point_bbox_wind_distance (Geom::PathVector const & pathv, NR::Matrix const &m, NR::Point &pt,\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
{\r
- Geom::Point _pt(to_2geom(pt));\r
Geom::Rect _bbox;\r
if (bbox)\r
_bbox = to_2geom(*bbox);\r
@@ -463,7 +462,7 @@ pathv_matrix_point_bbox_wind_distance (Geom::PathVector const & pathv, NR::Matri
if (viewbox)\r
_viewbox = to_2geom(*viewbox);\r
\r
- pathv_matrix_point_bbox_wind_distance( pathv, to_2geom(m), _pt,\r
+ pathv_matrix_point_bbox_wind_distance( pathv, to_2geom(m), to_2geom(pt),\r
bbox ? &_bbox : NULL,\r
wind,\r
dist ? &_dist : NULL,\r
diff --git a/src/helper/geom.h b/src/helper/geom.h
index 1096c6ba178a836ae639281cea61f7128bfdc9fe..95e735f6c48afe2a0fc3a74ac32ad069d7cd7881 100644 (file)
--- a/src/helper/geom.h
+++ b/src/helper/geom.h
Geom::Rect bounds_fast_transformed(Geom::PathVector const & pv, Geom::Matrix const & t);\r
Geom::Rect bounds_exact_transformed(Geom::PathVector const & pv, Geom::Matrix const & t);\r
\r
-void pathv_matrix_point_bbox_wind_distance ( Geom::PathVector const & pathv, NR::Matrix const &m, NR::Point &pt,\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
-void pathv_matrix_point_bbox_wind_distance ( Geom::PathVector const & pathv, Geom::Matrix const &m, Geom::Point &pt,\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
\r