diff options
| author | JiHO <jiho-sf@users.sourceforge.net> | 2007-08-20 07:48:49 +0000 |
|---|---|---|
| committer | jiho-sf <jiho-sf@users.sourceforge.net> | 2007-08-20 07:48:49 +0000 |
| commit | 7efb57dde98232297c62af824ff40bf4b638a113 (patch) | |
| tree | 1c508488878005626ba94747ee1ad216b732b12c /src/line-geometry.cpp | |
| parent | gobble motion events when dragging selection - looks like with recent gtk, th... (diff) | |
| download | inkscape-7efb57dde98232297c62af824ff40bf4b638a113.tar.gz inkscape-7efb57dde98232297c62af824ff40bf4b638a113.zip | |
committed patch 1777220 by John Faith to fix compilation of Inkscape on OS X 10.3 (Panther)
g_return_val_if_fail(fabs(denom) > 1e-6, NR::Nothing());
is apparently causing gcc 3.3 to fail (OS X 10.3) with the error:
line-geometry.cpp: In member function `virtual NR::Maybe<NR::Point>
Box3D::Line::intersect(const Box3D::Line&)':
line-geometry.cpp:57: error: parse error before `;' token
If the NR::Nothing() is simply broken out as its own variable instead of
including it in g_return_val_if_fail(), then the file compiles. The root
cause is not known, but I assume this is a gcc bug.
This was the only source change needed for building svn 15634 for OS X
10.3.
(bzr r3548)
Diffstat (limited to 'src/line-geometry.cpp')
| -rw-r--r-- | src/line-geometry.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/line-geometry.cpp b/src/line-geometry.cpp index d7b5fb2ec..f6f411bff 100644 --- a/src/line-geometry.cpp +++ b/src/line-geometry.cpp @@ -54,7 +54,8 @@ Line &Line::operator=(Line const &line) { NR::Maybe<NR::Point> Line::intersect(Line const &line) { NR::Coord denom = NR::dot(v_dir, line.normal); - g_return_val_if_fail(fabs(denom) > 1e-6, NR::Nothing()); + NR::Maybe<NR::Point> no_point = NR::Nothing(); + g_return_val_if_fail(fabs(denom) > 1e-6, no_point ); NR::Coord lambda = (line.d0 - NR::dot(pt, line.normal)) / denom; return pt + lambda * v_dir; |