diff options
| -rw-r--r-- | build-x64.xml | 35 | ||||
| -rw-r--r-- | src/sp-pattern.cpp | 5 |
2 files changed, 19 insertions, 21 deletions
diff --git a/build-x64.xml b/build-x64.xml index af233d335..24168e039 100644 --- a/build-x64.xml +++ b/build-x64.xml @@ -198,16 +198,16 @@ #define HAVE_JPEG 1 /* Allow reading WordPerfect? */ - //#define WITH_LIBWPG 1 + #define WITH_LIBWPG 1 /* Default to libwpg 0.2.x */ - //#define WITH_LIBWPG02 1 + #define WITH_LIBWPG02 1 /* Visio import filter */ - //#define WITH_LIBVISIO 1 + #define WITH_LIBVISIO 1 /* Corel Draw import filter */ - //#define WITH_LIBCDR 1 + #define WITH_LIBCDR 1 /* Do we support SVG Fonts? */ #define ENABLE_SVG_FONTS 1 @@ -370,7 +370,7 @@ The errors can be restored by removing these flags after updating to a newer compiler (soon after 0.91 release hopefully) --> -Wno-error=format -Wno-error=format-extra-args -Wno-unused-local-typedefs <!-- triggers ton of warnings in (too old?) Boost with newer gcc --> - -O3 + -O2 -mms-bitfields -fopenmp </flags> @@ -410,7 +410,7 @@ ${pcc.cairo} ${pcc.poppler} -I${devlibs}/include/gc - <!-- ${pcc.libwpg-0.2} ${pcc.libvisio-0.0} ${pcc.libcdr-0.0} --> + ${pcc.libwpg-0.2} ${pcc.libvisio-0.0} ${pcc.libcdr-0.0} -I${cxxtest} <!-- PERL --> <!-- -Wno-comment -I${devlibs}/perl/lib/CORE --> @@ -486,7 +486,7 @@ ${devlibs}/bin/libxslt-1.dll ${devlibs}/bin/libexslt-0.dll ${pcl.cairo} ${pcl.cairomm-1.0} - <!-- ${pcl.libwpg-0.2} ${pcl.libvisio-0.0} ${pcl.libcdr-0.0} --> + ${pcl.libwpg-0.2} ${pcl.libvisio-0.0} ${pcl.libcdr-0.0} ${pcl.glibmm-2.4} ${pcl.gtk+-2.0} ${pcl.gdkmm-2.4} @@ -574,7 +574,7 @@ ${devlibs}/bin/libxslt-1.dll ${devlibs}/bin/libexslt-0.dll ${pcl.cairo} ${pcl.cairomm-1.0} - <!-- ${pcl.libwpg-0.2} ${pcl.libvisio-0.0} ${pcl.libcdr-0.0} --> + ${pcl.libwpg-0.2} ${pcl.libvisio-0.0} ${pcl.libcdr-0.0} ${pcl.glibmm-2.4} ${pcl.gtk+-2.0} ${pcl.gdkmm-2.4} @@ -630,7 +630,7 @@ ${devlibs}/bin/libxslt-1.dll ${devlibs}/bin/libexslt-0.dll ${pcl.cairo} ${pcl.cairomm-1.0} - <!-- ${pcl.libwpg-0.2} ${pcl.libvisio-0.0} ${pcl.libcdr-0.0} --> + ${pcl.libwpg-0.2} ${pcl.libvisio-0.0} ${pcl.libcdr-0.0} -liconv ${pcl.Magick++} ${pcl.fontconfig} ${pcl.freetype2} @@ -700,20 +700,17 @@ <copy todir="${dist}" file="${devlibs}/bin/libxml2-2.dll"/> <copy todir="${dist}" file="${devlibs}/bin/libxslt-1.dll"/> <copy todir="${dist}" file="${devlibs}/bin/libexslt-0.dll"/> -<!-- - <copy todir="${dist}" file="${devlibs}/bin/libexpat-1.dll"/> - <!-- + <!-- <copy todir="${dist}" file="${devlibs}/bin/libexpat-1.dll"/> --> + <copy todir="${dist}" file="${devlibs}/bin/libwpg-0.2.dll"/> <copy todir="${dist}" file="${devlibs}/bin/libwpd-0.9.dll"/> <copy todir="${dist}" file="${devlibs}/bin/libwpd-stream-0.9.dll"/> <copy todir="${dist}" file="${devlibs}/bin/libvisio-0.0.dll"/> <copy todir="${dist}" file="${devlibs}/bin/libcdr-0.0.dll"/> - --> - <!-- - <copy todir="${dist}" file="${devlibs}/bin/icui18n50.dll"/> - <copy todir="${dist}" file="${devlibs}/bin/icudata50.dll"/> - <copy todir="${dist}" file="${devlibs}/bin/icuuc50.dll"/> - --> + <copy todir="${dist}" file="${devlibs}/bin/icuin53.dll"/> + <copy todir="${dist}" file="${devlibs}/bin/icudt53.dll"/> + <copy todir="${dist}" file="${devlibs}/bin/icuuc53.dll"/> + <copy todir="${dist}" file="${devlibs}/bin/libjpeg-9.dll"/> <copy todir="${dist}" file="${devlibs}/bin/libpng16-16.dll"/> <copy todir="${dist}" file="${devlibs}/bin/libtiff-5.dll"/> @@ -774,7 +771,7 @@ </fileset> </copy> <!-- <copy todir="${dist}/share"> <fileset dir="${devlibs}/share/poppler"/> </copy> --> - <copy todir="${dist}" file="${mingw_bin}/gdb.exe"/> + <copy todir="${dist}" file="${devlibs}/bin/gdb.exe"/> <!-- Aspell dictionaries --> <!-- <copy todir="${dist}/lib"> <fileset dir="${devlibs}/lib/aspell-0.60"/> </copy> --> diff --git a/src/sp-pattern.cpp b/src/sp-pattern.cpp index 9aa54eadf..9b7330a24 100644 --- a/src/sp-pattern.cpp +++ b/src/sp-pattern.cpp @@ -615,9 +615,10 @@ cairo_pattern_t* SPPattern::pattern_new(cairo_t *base_ct, Geom::OptRect const &b // Content to tile (pattern space) Geom::Affine content2ps; - if (this->viewBox_set) { + Geom::OptRect effective_view_box = pattern_viewBox(this); + if (effective_view_box) { // viewBox to pattern server (using SPViewBox) - viewBox = *pattern_viewBox(this); + viewBox = *effective_view_box; c2p.setIdentity(); apply_viewbox( pattern_tile ); content2ps = c2p; |