From e4a6c1b52c721147bbda48d623879178a89b7b62 Mon Sep 17 00:00:00 2001 From: Marc Jeanmougin Date: Sun, 29 Apr 2018 14:35:15 +0200 Subject: moved libcroco, libuemf, libdepixelize to 3rdparty folder --- src/extension/internal/emf-inout.cpp | 2 +- src/extension/internal/emf-inout.h | 6 +++--- src/extension/internal/emf-print.cpp | 2 +- src/extension/internal/emf-print.h | 2 +- src/extension/internal/metafile-inout.h | 2 +- src/extension/internal/metafile-print.h | 2 +- src/extension/internal/text_reassemble.c | 2 +- src/extension/internal/wmf-inout.cpp | 2 +- src/extension/internal/wmf-inout.h | 2 +- src/extension/internal/wmf-print.cpp | 2 +- src/extension/internal/wmf-print.h | 2 +- 11 files changed, 13 insertions(+), 13 deletions(-) (limited to 'src/extension') diff --git a/src/extension/internal/emf-inout.cpp b/src/extension/internal/emf-inout.cpp index 8da11fc98..54099271b 100644 --- a/src/extension/internal/emf-inout.cpp +++ b/src/extension/internal/emf-inout.cpp @@ -30,7 +30,7 @@ #include #include #include -#include +#include <3rdparty/libuemf/symbol_convert.h> #include "document.h" #include "object/sp-root.h" diff --git a/src/extension/internal/emf-inout.h b/src/extension/internal/emf-inout.h index dd1d8f9c4..6cc4ceffb 100644 --- a/src/extension/internal/emf-inout.h +++ b/src/extension/internal/emf-inout.h @@ -12,9 +12,9 @@ #ifndef SEEN_EXTENSION_INTERNAL_EMF_H #define SEEN_EXTENSION_INTERNAL_EMF_H -#include -#include -#include // for U_emf_record_sizeok() +#include <3rdparty/libuemf/uemf.h> +#include <3rdparty/libuemf/uemf_safe.h> +#include <3rdparty/libuemf/uemf_endian.h> // for U_emf_record_sizeok() #include "extension/internal/metafile-inout.h" // picks up PNG #include "extension/implementation/implementation.h" #include "style.h" diff --git a/src/extension/internal/emf-print.cpp b/src/extension/internal/emf-print.cpp index 539477a13..0b005f8da 100644 --- a/src/extension/internal/emf-print.cpp +++ b/src/extension/internal/emf-print.cpp @@ -28,7 +28,7 @@ #include #include -#include +#include <3rdparty/libuemf/symbol_convert.h> #include <2geom/sbasis-to-bezier.h> #include <2geom/path.h> #include <2geom/pathvector.h> diff --git a/src/extension/internal/emf-print.h b/src/extension/internal/emf-print.h index 7ca602fec..5e9a67ca1 100644 --- a/src/extension/internal/emf-print.h +++ b/src/extension/internal/emf-print.h @@ -16,7 +16,7 @@ # include "config.h" #endif -#include +#include <3rdparty/libuemf/uemf.h> #include "extension/internal/metafile-print.h" #include "splivarot.h" // pieces for union on shapes diff --git a/src/extension/internal/metafile-inout.h b/src/extension/internal/metafile-inout.h index b3efee2a6..fd6ef28a8 100644 --- a/src/extension/internal/metafile-inout.h +++ b/src/extension/internal/metafile-inout.h @@ -23,7 +23,7 @@ #include #include #include -#include +#include <3rdparty/libuemf/uemf.h> #include <2geom/affine.h> #include <2geom/pathvector.h> diff --git a/src/extension/internal/metafile-print.h b/src/extension/internal/metafile-print.h index 9903cbb98..eac93cbda 100644 --- a/src/extension/internal/metafile-print.h +++ b/src/extension/internal/metafile-print.h @@ -18,7 +18,7 @@ #include #include #include -#include +#include <3rdparty/libuemf/uemf.h> #include <2geom/affine.h> #include <2geom/pathvector.h> diff --git a/src/extension/internal/text_reassemble.c b/src/extension/internal/text_reassemble.c index b191d4ea2..397a0c4d3 100644 --- a/src/extension/internal/text_reassemble.c +++ b/src/extension/internal/text_reassemble.c @@ -79,7 +79,7 @@ extern "C" { #endif #include "text_reassemble.h" -#include /* For a couple of text functions. Exact copy from libUEMF. */ +#include <3rdparty/libuemf/uemf_utf.h> /* For a couple of text functions. Exact copy from libUEMF. */ #include #include diff --git a/src/extension/internal/wmf-inout.cpp b/src/extension/internal/wmf-inout.cpp index a91725f6b..45f59ec03 100644 --- a/src/extension/internal/wmf-inout.cpp +++ b/src/extension/internal/wmf-inout.cpp @@ -31,7 +31,7 @@ #include #include #include -#include +#include <3rdparty/libuemf/symbol_convert.h> #include "document.h" #include "object/sp-root.h" // even though it is included indirectly by wmf-inout.h diff --git a/src/extension/internal/wmf-inout.h b/src/extension/internal/wmf-inout.h index 5a0a760dd..19cf53956 100644 --- a/src/extension/internal/wmf-inout.h +++ b/src/extension/internal/wmf-inout.h @@ -11,7 +11,7 @@ #ifndef SEEN_EXTENSION_INTERNAL_WMF_H #define SEEN_EXTENSION_INTERNAL_WMF_H -#include +#include <3rdparty/libuemf/uwmf.h> #include "extension/internal/metafile-inout.h" // picks up PNG #include "extension/implementation/implementation.h" #include "style.h" diff --git a/src/extension/internal/wmf-print.cpp b/src/extension/internal/wmf-print.cpp index ccf5ddd0b..cdc59298b 100644 --- a/src/extension/internal/wmf-print.cpp +++ b/src/extension/internal/wmf-print.cpp @@ -64,7 +64,7 @@ #include "wmf-print.h" #include -#include +#include <3rdparty/libuemf/symbol_convert.h> namespace Inkscape { namespace Extension { diff --git a/src/extension/internal/wmf-print.h b/src/extension/internal/wmf-print.h index 45b94441c..be35da717 100644 --- a/src/extension/internal/wmf-print.h +++ b/src/extension/internal/wmf-print.h @@ -15,7 +15,7 @@ # include "config.h" #endif -#include +#include <3rdparty/libuemf/uwmf.h> #include "extension/internal/metafile-print.h" #include "splivarot.h" // pieces for union on shapes -- cgit v1.2.3