diff options
| author | Emmanuele Bassi <ebassi@gmail.com> | 2018-05-30 14:49:14 +0000 |
|---|---|---|
| committer | Emmanuele Bassi <ebassi@gmail.com> | 2018-05-30 14:49:14 +0000 |
| commit | f3abd2426d6a4e77798fb911fd5a3592c5ef64c8 (patch) | |
| tree | beb587f3c8e308cdc4495a79b1db14ba88de1950 | |
| parent | 58164dcdc9e3c7e5ca377d935290f645ee1718ff (diff) | |
| parent | 7f41e0bbee0f4b94c5774411d99644144b94e3cd (diff) | |
| download | gdk-pixbuf-f3abd2426d6a4e77798fb911fd5a3592c5ef64c8.tar.gz | |
Merge branch 'issue-73' into 'master'
jasper: Avoid a deprecation warning
Closes #73
See merge request GNOME/gdk-pixbuf!4
| -rw-r--r-- | .gitlab-ci.yml | 2 | ||||
| -rwxr-xr-x | .gitlab/ci/test-docker.sh | 2 | ||||
| -rw-r--r-- | gdk-pixbuf/io-jasper.c | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2c3d8dbac..464d2aaad 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -8,6 +8,8 @@ stages: meson-fedora-x86_64: image: registry.gitlab.gnome.org/gnome/gdk-pixbuf/master:v1 stage: build + variables: + BUILD_OPTS: "-Dpng=true -Djpeg=true -Dtiff=true -Djasper=true" script: - bash -x ./.gitlab/ci/test-docker.sh artifacts: diff --git a/.gitlab/ci/test-docker.sh b/.gitlab/ci/test-docker.sh index 5c2ecd688..f99a25c8c 100755 --- a/.gitlab/ci/test-docker.sh +++ b/.gitlab/ci/test-docker.sh @@ -14,7 +14,7 @@ ccache --show-stats # Disable ccache while running Meson, to avoid cached compiler tests export CCACHE_DISABLE=true -meson ${builddir} ${srcdir} || exit $? +meson ${BUILD_OPTS} ${builddir} ${srcdir} || exit $? unset CCACHE_DISABLE cd ${builddir} diff --git a/gdk-pixbuf/io-jasper.c b/gdk-pixbuf/io-jasper.c index d3b26bb5e..b495f652b 100644 --- a/gdk-pixbuf/io-jasper.c +++ b/gdk-pixbuf/io-jasper.c @@ -67,7 +67,7 @@ jasper_image_begin_load (GdkPixbufModuleSizeFunc size_func, jas_init (); - stream = jas_stream_memopen (NULL, -1); + stream = jas_stream_memopen (NULL, 0); if (!stream) { g_set_error_literal (error, GDK_PIXBUF_ERROR, GDK_PIXBUF_ERROR_INSUFFICIENT_MEMORY, _("Couldn’t allocate memory for stream")); |