[Olena-patches] last-svn-commit-793-g6de9b09 Add HAVE_QT guards.

* scribo/convert/from_base64.hh, * scribo/io/xml/save.hh: Here. --- scribo/ChangeLog | 7 +++++++ scribo/scribo/convert/from_base64.hh | 12 ++++++++++++ scribo/scribo/io/xml/save.hh | 13 ++++++++++++- 3 files changed, 31 insertions(+), 1 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 935e5d1..714874c 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,12 @@ 2011-03-11 Guillaume Lazzara &lt;z(a)lrde.epita.fr&gt; + Add HAVE_QT guards. + + * scribo/convert/from_base64.hh, + * scribo/io/xml/save.hh: Here. + +2011-03-11 Guillaume Lazzara &lt;z(a)lrde.epita.fr&gt; + Small fixes in viewer. * demo/viewer/main.cc: Add more includes. diff --git a/scribo/scribo/convert/from_base64.hh b/scribo/scribo/convert/from_base64.hh index 5eeeb53..753883d 100644 --- a/scribo/scribo/convert/from_base64.hh +++ b/scribo/scribo/convert/from_base64.hh @@ -63,6 +63,10 @@ #include <cstdio> #include <cstdlib> +# ifdef HAVE_QT +# include <QString> +# endif // ! HAVE_QT + # include <mln/border/resize.hh> # include <mln/core/image/image2d.hh> # include <mln/util/array.hh> @@ -82,9 +86,13 @@ namespace scribo Image<I>& output); +# ifdef HAVE_QT + template <typename I> void from_base64(const QString& data64, Image<I>& output_); +# endif // ! HAVE_QT + # ifndef MLN_INCLUDE_ONLY @@ -187,6 +195,8 @@ namespace scribo } +# ifdef HAVE_QT + template <typename I> void from_base64(const QString& data64, Image<I>& output_) @@ -199,6 +209,8 @@ namespace scribo trace::exiting("scribo::convert::to_base64"); } +# endif // ! HAVE_QT + # endif // ! MLN_INCLUDE_ONLY diff --git a/scribo/scribo/io/xml/save.hh b/scribo/scribo/io/xml/save.hh index 7428e5d..54afa79 100644 --- a/scribo/scribo/io/xml/save.hh +++ b/scribo/scribo/io/xml/save.hh @@ -39,7 +39,10 @@ # include <scribo/core/document.hh> -# include <scribo/io/xml/internal/full_xml_visitor.hh> +# ifdef HAVE_QT +# include <scribo/io/xml/internal/full_xml_visitor.hh> +# endif // ! HAVE_QT + # include <scribo/io/xml/internal/extended_page_xml_visitor.hh> # include <scribo/io/xml/internal/page_xml_visitor.hh> @@ -66,7 +69,11 @@ namespace scribo { Page, PageExtended, + +# ifdef HAVE_QT Full +# endif // ! HAVE_QT + //Hocr }; @@ -100,12 +107,14 @@ namespace scribo doc.accept(f); } +# ifdef HAVE_QT template <typename L> void save_full(const document<L>& doc, std::ofstream& output) { scribo::io::xml::internal::full_xml_visitor f(output); doc.accept(f); } +# endif // ! HAVE_QT } // end of namespace scribo::io::xml::internal @@ -143,9 +152,11 @@ namespace scribo internal::save_page_extended(doc, output); break; +# ifdef HAVE_QT case Full: internal::save_full(doc, output); break; +# endif // ! HAVE_QT default: trace::warning("scribo::io::xml::save - Invalid XML format! Skip saving..."); -- 1.5.6.5