diff options
| author | Joshua L. Blocher <verbalshadow@gmail.com> | 2008-12-28 22:44:35 +0000 |
|---|---|---|
| committer | verbalshadow <verbalshadow@users.sourceforge.net> | 2008-12-28 22:44:35 +0000 |
| commit | 1e3ef71825fa122062b626937848539cbb62f0ca (patch) | |
| tree | 80c4099e25b93d910b580ebe681cdf11d8957d60 /src/libnrtype | |
| parent | convert NR to Geom (diff) | |
| download | inkscape-1e3ef71825fa122062b626937848539cbb62f0ca.tar.gz inkscape-1e3ef71825fa122062b626937848539cbb62f0ca.zip | |
More NR ==> Geom changes
(bzr r7032)
Diffstat (limited to 'src/libnrtype')
| -rw-r--r-- | src/libnrtype/Layout-TNG-OutIter.cpp | 8 | ||||
| -rw-r--r-- | src/libnrtype/Layout-TNG-Output.cpp | 10 |
2 files changed, 9 insertions, 9 deletions
diff --git a/src/libnrtype/Layout-TNG-OutIter.cpp b/src/libnrtype/Layout-TNG-OutIter.cpp index bbd4aa6fd..8dd61c491 100644 --- a/src/libnrtype/Layout-TNG-OutIter.cpp +++ b/src/libnrtype/Layout-TNG-OutIter.cpp @@ -260,8 +260,8 @@ Geom::Rect Layout::characterBoundingBox(iterator const &it, double *rotation) co int unused = 0; Path::cut_position *midpoint_otp = const_cast<Path*>(_path_fitted)->CurvilignToPosition(1, &midpoint_offset, unused); if (midpoint_offset >= 0.0 && midpoint_otp != NULL && midpoint_otp[0].piece >= 0) { - NR::Point midpoint; - NR::Point tangent; + Geom::Point midpoint; + Geom::Point tangent; Span const &span = _characters[char_index].span(this); const_cast<Path*>(_path_fitted)->PointAndTangentAt(midpoint_otp[0].piece, midpoint_otp[0].t, midpoint, tangent); @@ -415,8 +415,8 @@ void Layout::queryCursorShape(iterator const &it, Geom::Point &position, double } g_free(path_parameter_list); - NR::Point point; - NR::Point tangent; + Geom::Point point; + Geom::Point tangent; const_cast<Path*>(_path_fitted)->PointAndTangentAt(path_parameter.piece, path_parameter.t, point, tangent); if (x < 0.0) point += x * tangent; diff --git a/src/libnrtype/Layout-TNG-Output.cpp b/src/libnrtype/Layout-TNG-Output.cpp index 49967cd59..2003ca26b 100644 --- a/src/libnrtype/Layout-TNG-Output.cpp +++ b/src/libnrtype/Layout-TNG-Output.cpp @@ -436,8 +436,8 @@ void Layout::fitToPathAlign(SVGLength const &startOffset, Path const &path) int unused = 0; Path::cut_position *point_otp = const_cast<Path&>(path).CurvilignToPosition(1, &offset, unused); if (offset >= 0.0 && point_otp != NULL && point_otp[0].piece >= 0) { - NR::Point point; - NR::Point tangent; + Geom::Point point; + Geom::Point tangent; const_cast<Path&>(path).PointAndTangentAt(point_otp[0].piece, point_otp[0].t, point, tangent); _empty_cursor_shape.position = point; _empty_cursor_shape.rotation = atan2(tangent[Geom::Y], tangent[Geom::X]); @@ -477,8 +477,8 @@ void Layout::fitToPathAlign(SVGLength const &startOffset, Path const &path) // as far as I know these functions are const, they're just not marked as such Path::cut_position *midpoint_otp = const_cast<Path&>(path).CurvilignToPosition(1, &midpoint_offset, unused); if (midpoint_offset >= 0.0 && midpoint_otp != NULL && midpoint_otp[0].piece >= 0) { - NR::Point midpoint; - NR::Point tangent; + Geom::Point midpoint; + Geom::Point tangent; const_cast<Path&>(path).PointAndTangentAt(midpoint_otp[0].piece, midpoint_otp[0].t, midpoint, tangent); if (start_offset >= 0.0 && end_offset >= 0.0) { @@ -497,7 +497,7 @@ void Layout::fitToPathAlign(SVGLength const &startOffset, Path const &path) } if (on_same_subpath) { // both points were on the same subpath (without this test the angle is very weird) - NR::Point startpoint, endpoint; + Geom::Point startpoint, endpoint; const_cast<Path&>(path).PointAt(start_otp[0].piece, start_otp[0].t, startpoint); const_cast<Path&>(path).PointAt(end_otp[0].piece, end_otp[0].t, endpoint); if (endpoint != startpoint) { |