Minor fixes.

mdboom · mdboom · commit 535d15cabc0a · 2008-05-02T16:57:45.000Z
svn path=/trunk/matplotlib/; revision=5105
diff --git a/src/_path.cpp b/src/_path.cpp
@@ -657,7 +657,8 @@ struct bisectx
 
     bisectx(double x) : m_x(x) {}
 
-    void bisect(double sx, double sy, double px, double py, double* bx, double* by) const
+    inline void bisect(double sx, double sy, double px, double py,
+                       double* bx, double* by) const
     {
         *bx = m_x;
         double dx = px - sx;
@@ -670,7 +671,7 @@ struct xlt : public bisectx
 {
     xlt(double x) : bisectx(x) {}
 
-    bool is_inside(double x, double y) const
+    inline bool is_inside(double x, double y) const
     {
         return x <= m_x;
     }
@@ -680,7 +681,7 @@ struct xgt : public bisectx
 {
     xgt(double x) : bisectx(x) {}
 
-    bool is_inside(double x, double y) const
+    inline bool is_inside(double x, double y) const
     {
         return x >= m_x;
     }
@@ -692,7 +693,7 @@ struct bisecty
 
     bisecty(double y) : m_y(y) {}
 
-    void bisect(double sx, double sy, double px, double py, double* bx, double* by) const
+    inline void bisect(double sx, double sy, double px, double py, double* bx, double* by) const
     {
         *by = m_y;
         double dx = px - sx;
@@ -705,7 +706,7 @@ struct ylt : public bisecty
 {
     ylt(double y) : bisecty(y) {}
 
-    bool is_inside(double x, double y) const
+    inline bool is_inside(double x, double y) const
     {
         return y <= m_y;
     }
@@ -715,15 +716,15 @@ struct ygt : public bisecty
 {
     ygt(double y) : bisecty(y) {}
 
-    bool is_inside(double x, double y) const
+    inline bool is_inside(double x, double y) const
     {
         return y >= m_y;
     }
 };
 }
 
 template<class Filter>
-void clip_to_rect_one_step(const Polygon& polygon, Polygon& result, const Filter& filter)
+inline void clip_to_rect_one_step(const Polygon& polygon, Polygon& result, const Filter& filter)
 {
     double sx, sy, px, py, bx, by;
     bool sinside, pinside;
@@ -899,8 +900,9 @@ Py::Object _path_module::affine_transform(const Py::Tuple& args)
 
         transform = (PyArrayObject*) PyArray_FromObject
                     (transform_obj.ptr(), PyArray_DOUBLE, 2, 2);
-        if (!transform || PyArray_NDIM(transform) != 2 ||
-	    PyArray_DIM(transform, 0) != 3 || PyArray_DIM(transform, 1) != 3)
+        if (!transform ||
+	    PyArray_DIM(transform, 0) != 3 ||
+            PyArray_DIM(transform, 1) != 3)
             throw Py::ValueError("Invalid transform.");
 
         double a, b, c, d, e, f;
@@ -964,6 +966,7 @@ Py::Object _path_module::affine_transform(const Py::Tuple& args)
         Py_XDECREF(vertices);
         Py_XDECREF(transform);
         Py_XDECREF(result);
+        throw;
     }
 
     Py_XDECREF(vertices);
@@ -1020,10 +1023,10 @@ Py::Object _path_module::count_bboxes_overlapping_bbox(const Py::Tuple& args)
     return Py::Int(count);
 }
 
-bool segments_intersect(const double& x1, const double& y1,
-                        const double& x2, const double& y2,
-                        const double& x3, const double& y3,
-                        const double& x4, const double& y4)
+inline bool segments_intersect(const double& x1, const double& y1,
+                               const double& x2, const double& y2,
+                               const double& x3, const double& y3,
+                               const double& x4, const double& y4)
 {
     double den = ((y4-y3)*(x2-x1)) - ((x4-x3)*(y2-y1));
     if (den == 0.0)

Original file line number	Diff line number	Diff line change
`@@ -657,7 +657,8 @@ struct bisectx`
`657`	`657`
`658`	`658`	`bisectx(double x) : m_x(x) {}`
`659`	`659`
`660`		`- void bisect(double sx, double sy, double px, double py, double* bx, double* by) const`
	`660`	`+ inline void bisect(double sx, double sy, double px, double py,`
	`661`	`+ double* bx, double* by) const`
`661`	`662`	`{`
`662`	`663`	`*bx = m_x;`
`663`	`664`	`double dx = px - sx;`
`@@ -670,7 +671,7 @@ struct xlt : public bisectx`
`670`	`671`	`{`
`671`	`672`	`xlt(double x) : bisectx(x) {}`
`672`	`673`
`673`		`- bool is_inside(double x, double y) const`
	`674`	`+ inline bool is_inside(double x, double y) const`
`674`	`675`	`{`
`675`	`676`	`return x <= m_x;`
`676`	`677`	`}`
`@@ -680,7 +681,7 @@ struct xgt : public bisectx`
`680`	`681`	`{`
`681`	`682`	`xgt(double x) : bisectx(x) {}`
`682`	`683`
`683`		`- bool is_inside(double x, double y) const`
	`684`	`+ inline bool is_inside(double x, double y) const`
`684`	`685`	`{`
`685`	`686`	`return x >= m_x;`
`686`	`687`	`}`
`@@ -692,7 +693,7 @@ struct bisecty`
`692`	`693`
`693`	`694`	`bisecty(double y) : m_y(y) {}`
`694`	`695`
`695`		`- void bisect(double sx, double sy, double px, double py, double* bx, double* by) const`
	`696`	`+ inline void bisect(double sx, double sy, double px, double py, double* bx, double* by) const`
`696`	`697`	`{`
`697`	`698`	`*by = m_y;`
`698`	`699`	`double dx = px - sx;`
`@@ -705,7 +706,7 @@ struct ylt : public bisecty`
`705`	`706`	`{`
`706`	`707`	`ylt(double y) : bisecty(y) {}`
`707`	`708`
`708`		`- bool is_inside(double x, double y) const`
	`709`	`+ inline bool is_inside(double x, double y) const`
`709`	`710`	`{`
`710`	`711`	`return y <= m_y;`
`711`	`712`	`}`
`@@ -715,15 +716,15 @@ struct ygt : public bisecty`
`715`	`716`	`{`
`716`	`717`	`ygt(double y) : bisecty(y) {}`
`717`	`718`
`718`		`- bool is_inside(double x, double y) const`
	`719`	`+ inline bool is_inside(double x, double y) const`
`719`	`720`	`{`
`720`	`721`	`return y >= m_y;`
`721`	`722`	`}`
`722`	`723`	`};`
`723`	`724`	`}`
`724`	`725`
`725`	`726`	`template<class Filter>`
`726`		`-void clip_to_rect_one_step(const Polygon& polygon, Polygon& result, const Filter& filter)`
	`727`	`+inline void clip_to_rect_one_step(const Polygon& polygon, Polygon& result, const Filter& filter)`
`727`	`728`	`{`
`728`	`729`	`double sx, sy, px, py, bx, by;`
`729`	`730`	`bool sinside, pinside;`
`@@ -899,8 +900,9 @@ Py::Object _path_module::affine_transform(const Py::Tuple& args)`
`899`	`900`
`900`	`901`	`transform = (PyArrayObject*) PyArray_FromObject`
`901`	`902`	`(transform_obj.ptr(), PyArray_DOUBLE, 2, 2);`
`902`		`- if (!transform \|\| PyArray_NDIM(transform) != 2 \|\|`
`903`		`- PyArray_DIM(transform, 0) != 3 \|\| PyArray_DIM(transform, 1) != 3)`
	`903`	`+ if (!transform \|\|`
	`904`	`+ PyArray_DIM(transform, 0) != 3 \|\|`
	`905`	`+ PyArray_DIM(transform, 1) != 3)`
`904`	`906`	`throw Py::ValueError("Invalid transform.");`
`905`	`907`
`906`	`908`	`double a, b, c, d, e, f;`
`@@ -964,6 +966,7 @@ Py::Object _path_module::affine_transform(const Py::Tuple& args)`
`964`	`966`	`Py_XDECREF(vertices);`
`965`	`967`	`Py_XDECREF(transform);`
`966`	`968`	`Py_XDECREF(result);`
	`969`	`+ throw;`
`967`	`970`	`}`
`968`	`971`
`969`	`972`	`Py_XDECREF(vertices);`
`@@ -1020,10 +1023,10 @@ Py::Object _path_module::count_bboxes_overlapping_bbox(const Py::Tuple& args)`
`1020`	`1023`	`return Py::Int(count);`
`1021`	`1024`	`}`
`1022`	`1025`
`1023`		`-bool segments_intersect(const double& x1, const double& y1,`
`1024`		`- const double& x2, const double& y2,`
`1025`		`- const double& x3, const double& y3,`
`1026`		`- const double& x4, const double& y4)`
	`1026`	`+inline bool segments_intersect(const double& x1, const double& y1,`
	`1027`	`+ const double& x2, const double& y2,`
	`1028`	`+ const double& x3, const double& y3,`
	`1029`	`+ const double& x4, const double& y4)`
`1027`	`1030`	`{`
`1028`	`1031`	`double den = ((y4-y3)(x2-x1)) - ((x4-x3)(y2-y1));`
`1029`	`1032`	`if (den == 0.0)`