diff options
| author | Krzysztof Kosi??ski <tweenk.pl@gmail.com> | 2010-08-04 21:08:41 +0000 |
|---|---|---|
| committer | Krzysztof Kosiński <tweenk.pl@gmail.com> | 2010-08-04 21:08:41 +0000 |
| commit | 57a6fee4d17b6049b95ccf2ef445ed18c8a2a841 (patch) | |
| tree | f0696d1a5929d1de9e2412ae89dd86c49e8ae6c7 /src/libnrtype | |
| parent | Wholesale cruft removal part 1 (diff) | |
| download | inkscape-57a6fee4d17b6049b95ccf2ef445ed18c8a2a841.tar.gz inkscape-57a6fee4d17b6049b95ccf2ef445ed18c8a2a841.zip | |
Wholesale cruft removal part 2
(bzr r9508.1.45)
Diffstat (limited to 'src/libnrtype')
| -rw-r--r-- | src/libnrtype/Layout-TNG-Output.cpp | 5 | ||||
| -rw-r--r-- | src/libnrtype/Layout-TNG.h | 2 |
2 files changed, 1 insertions, 6 deletions
diff --git a/src/libnrtype/Layout-TNG-Output.cpp b/src/libnrtype/Layout-TNG-Output.cpp index f34b93d6e..836b86939 100644 --- a/src/libnrtype/Layout-TNG-Output.cpp +++ b/src/libnrtype/Layout-TNG-Output.cpp @@ -15,9 +15,6 @@ #include "print.h" #include "extension/print.h" #include "livarot/Path.h" -#include "libnr/nr-matrix-fns.h" -#include "libnr/nr-scale-matrix-ops.h" -#include "libnr/nr-convert2geom.h" #include "font-instance.h" #include "svg/svg-length.h" #include "extension/internal/cairo-render-context.h" @@ -288,7 +285,7 @@ void Layout::showGlyphs(CairoRenderContext *ctx) const } } while (glyph_index < _glyphs.size() && _path_fitted == NULL - && NR::transform_equalp(font_matrix, glyph_matrix, NR_EPSILON) + && (font_matrix * glyph_matrix.inverse()).isIdentity() && _characters[_glyphs[glyph_index].in_character].in_span == this_span_index); // remove vertical flip diff --git a/src/libnrtype/Layout-TNG.h b/src/libnrtype/Layout-TNG.h index 0a2463a56..1f82aab97 100644 --- a/src/libnrtype/Layout-TNG.h +++ b/src/libnrtype/Layout-TNG.h @@ -14,8 +14,6 @@ #ifdef HAVE_CONFIG_H # include "config.h" #endif -#include <libnr/nr-matrix-ops.h> -#include <libnr/nr-rotate-ops.h> #include <libnr/nr-rect.h> #include <2geom/d2.h> #include <2geom/matrix.h> |