diff --git a/.travis.yml b/.travis.yml index 3852c822..cc454de8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,6 +8,7 @@ before_install: - sudo apt-get install swig libmagick++-dev bc - sudo apt-get install libcfitsio3-dev libgsl0-dev libmatio-dev - sudo apt-get install liborc-0.4-dev liblcms2-dev libpoppler-glib-dev + - sudo apt-get install librsvg2-dev libgif-dev before_script: - ./bootstrap.sh - ./configure diff --git a/configure.ac b/configure.ac index ca07f495..562c297b 100644 --- a/configure.ac +++ b/configure.ac @@ -605,12 +605,12 @@ AC_ARG_WITH([rsvg], AS_HELP_STRING([--without-rsvg], [build without rsvg (default: test)])) if test x"$with_rsvg" != x"no"; then - PKG_CHECK_MODULES(RSVG, [librsvg-2.0 >= 2.40 cairo >= 1.2], - [AC_DEFINE(HAVE_RSVG,1,[define if you have librsvg-2.0 >= 2.40.0 and cairo >= 1.2 installed.]) + PKG_CHECK_MODULES(RSVG, [librsvg-2.0 >= 2.34 cairo >= 1.2], + [AC_DEFINE(HAVE_RSVG,1,[define if you have librsvg-2.0 >= 2.34.0 and cairo >= 1.2 installed.]) with_rsvg=yes PACKAGES_USED="$PACKAGES_USED librsvg-2.0 cairo" ], - [AC_MSG_WARN([librsvg-2.0 >= 2.40.0 or cairo >= 1.2 not found; disabling SVG load via rsvg]) + [AC_MSG_WARN([librsvg-2.0 >= 2.34.0 or cairo >= 1.2 not found; disabling SVG load via rsvg]) with_rsvg=no ] ) @@ -1034,7 +1034,7 @@ file import with matio: $with_matio PDF import with poppler-glib: $with_poppler (requires poppler-glib 0.16.0 or later) SVG import with librsvg-2.0: $with_rsvg - (requires librsvg-2.0 2.40.0 or later) + (requires librsvg-2.0 2.34.0 or later) file import with cfitsio: $with_cfitsio file import/export with libwebp: $with_libwebp (requires libwebp-0.1.3 or later) diff --git a/test/images/blankpage.pdf b/test/images/blankpage.pdf old mode 100755 new mode 100644 diff --git a/test/images/blankpage.svg b/test/images/blankpage.svg new file mode 100644 index 00000000..b0365ff7 --- /dev/null +++ b/test/images/blankpage.svg @@ -0,0 +1,3 @@ + + + diff --git a/test/images/trans-x.png b/test/images/trans-x.png new file mode 100644 index 00000000..627f80be Binary files /dev/null and b/test/images/trans-x.png differ diff --git a/test/test_formats.sh b/test/test_formats.sh index c44ce02e..130f0dcb 100755 --- a/test/test_formats.sh +++ b/test/test_formats.sh @@ -11,6 +11,14 @@ poppler=$test_images/blankpage.pdf poppler_ref=$test_images/blankpage.png +# rsvg / svgload reference image +rsvg=$test_images/blankpage.svg +rsvg_ref=$test_images/blankpage.png + +# giflib / gifload reference image +giflib=$test_images/trans-x.gif +giflib_ref=$test_images/trans-x.png + # the matlab image and reference image matlab=$test_images/sample.mat matlab_ref=$test_images/sample.png @@ -222,6 +230,14 @@ if test_supported pdfload; then test_loader $poppler_ref $poppler pdfload fi +if test_supported svgload; then + test_loader $rsvg_ref $rsvg svgload +fi + +if test_supported gifload; then + test_loader $giflib_ref $giflib gifload +fi + if test_supported matload; then test_loader $matlab_ref $matlab matlab fi