From 1ae24d44779b675dfb80d5e52b73932ece9fe49e Mon Sep 17 00:00:00 2001 From: Marc Jeanmougin Date: Thu, 17 Jan 2019 11:37:34 +0100 Subject: Remove confusing and broken save as PNG option --- src/extension/init.cpp | 2 -- 1 file changed, 2 deletions(-) (limited to 'src/extension/init.cpp') diff --git a/src/extension/init.cpp b/src/extension/init.cpp index 8e3c757f8..49ac2e802 100644 --- a/src/extension/init.cpp +++ b/src/extension/init.cpp @@ -38,7 +38,6 @@ # include "internal/wmf-print.h" #ifdef HAVE_CAIRO_PDF # include "internal/cairo-renderer-pdf-out.h" -# include "internal/cairo-png-out.h" # include "internal/cairo-ps-out.h" #endif #include "internal/pov-out.h" @@ -155,7 +154,6 @@ init() #ifdef HAVE_CAIRO_PDF //g_print ("Using CairoRendererPdfOutput: new pdf exporter\n"); Internal::CairoRendererPdfOutput::init(); - Internal::CairoRendererOutput::init(); Internal::CairoPsOutput::init(); Internal::CairoEpsOutput::init(); -- cgit v1.2.3 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/extension/init.cpp | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'src/extension/init.cpp') diff --git a/src/extension/init.cpp b/src/extension/init.cpp index 49ac2e802..6626ff20d 100644 --- a/src/extension/init.cpp +++ b/src/extension/init.cpp @@ -36,8 +36,12 @@ # include "internal/emf-print.h" # include "internal/wmf-inout.h" # include "internal/wmf-print.h" -#ifdef HAVE_CAIRO_PDF + +#include +#ifdef CAIRO_HAS_PDF_SURFACE # include "internal/cairo-renderer-pdf-out.h" +#endif +#ifdef CAIRO_HAS_PS_SURFACE # include "internal/cairo-ps-out.h" #endif #include "internal/pov-out.h" @@ -151,10 +155,10 @@ init() Internal::Svg::init(); Internal::Svgz::init(); -#ifdef HAVE_CAIRO_PDF - //g_print ("Using CairoRendererPdfOutput: new pdf exporter\n"); +#ifdef CAIRO_HAS_PDF_SURFACE Internal::CairoRendererPdfOutput::init(); - +#endif +#ifdef CAIRO_HAS_PS_SURFACE Internal::CairoPsOutput::init(); Internal::CairoEpsOutput::init(); #endif -- cgit v1.2.3