From 2de4d78077354eaee0b19956e0b5d2a6e3663719 Mon Sep 17 00:00:00 2001 From: Thomas Holder Date: Fri, 18 Jan 2019 20:58:23 +0000 Subject: fix compilation with HAVE_CAIRO_PDF=0 --- src/libnrtype/Layout-TNG-Output.cpp | 10 ---------- src/libnrtype/Layout-TNG.h | 4 ---- 2 files changed, 14 deletions(-) (limited to 'src/libnrtype') diff --git a/src/libnrtype/Layout-TNG-Output.cpp b/src/libnrtype/Layout-TNG-Output.cpp index 6ff52f2a7..2a7c835f3 100644 --- a/src/libnrtype/Layout-TNG-Output.cpp +++ b/src/libnrtype/Layout-TNG-Output.cpp @@ -29,14 +29,6 @@ #include <3rdparty/libuemf/symbol_convert.h> -namespace Inkscape { - namespace Extension { - namespace Internal { - class CairoRenderContext; - } - } -} - using Inkscape::Extension::Internal::CairoRenderContext; using Inkscape::Extension::Internal::CairoGlyphInfo; @@ -424,7 +416,6 @@ std:: cout << "DEBUG Layout::print in while --- " } -#ifdef HAVE_CAIRO_PDF void Layout::showGlyphs(CairoRenderContext *ctx) const { if (_input_stream.empty()) return; @@ -519,7 +510,6 @@ void Layout::showGlyphs(CairoRenderContext *ctx) const } } } -#endif #if DEBUG_TEXTLAYOUT_DUMPASTEXT // these functions are for dumpAsText() only. No need to translate diff --git a/src/libnrtype/Layout-TNG.h b/src/libnrtype/Layout-TNG.h index e5317b501..c09fc27ca 100644 --- a/src/libnrtype/Layout-TNG.h +++ b/src/libnrtype/Layout-TNG.h @@ -28,7 +28,6 @@ #include #include "style-enums.h" -#ifdef HAVE_CAIRO_PDF namespace Inkscape { namespace Extension { namespace Internal { @@ -38,7 +37,6 @@ namespace Inkscape { } using Inkscape::Extension::Internal::CairoRenderContext; -#endif class SPStyle; class Shape; @@ -403,12 +401,10 @@ public: */ void print(SPPrintContext *ctx, Geom::OptRect const &pbox, Geom::OptRect const &dbox, Geom::OptRect const &bbox, Geom::Affine const &ctm) const; -#ifdef HAVE_CAIRO_PDF /** Renders all the glyphs to the given Cairo rendering context. \param ctx The Cairo rendering context to be used */ void showGlyphs(CairoRenderContext *ctx) const; -#endif /** Returns the font family of the indexed span */ Glib::ustring getFontFamily(unsigned span_index) const; -- cgit v1.2.3