diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-10-09 18:04:40 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-10-09 18:04:40 +0200 |
| commit | 2696820ac6b307efade30d5d310a69c503555780 (patch) | |
| tree | 85aba794375726c55df59e61b5502eedddccb4c0 | |
| parent | 2253671eee248f42bb3f6979b6ae288c1a065dc4 (diff) | |
| parent | 08f40bc0f00716c3a8cbda70ed00dc2f16515e85 (diff) | |
Merge remote-tracking branch 'origin/5.4' into dev
Change-Id: I7672ca8c233430d2e5e0627f55c782ea123d93fa
| -rw-r--r-- | config.tests/libmng/libmng.cpp | 1 | ||||
| -rw-r--r-- | src/plugins/imageformats/jp2/qjp2handler.cpp | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/config.tests/libmng/libmng.cpp b/config.tests/libmng/libmng.cpp index 850dab1..8d8a27b 100644 --- a/config.tests/libmng/libmng.cpp +++ b/config.tests/libmng/libmng.cpp @@ -31,6 +31,7 @@ ** ****************************************************************************/ +#include <stdio.h> #include <libmng.h> int main(int, char **) diff --git a/src/plugins/imageformats/jp2/qjp2handler.cpp b/src/plugins/imageformats/jp2/qjp2handler.cpp index 39b34b0..85bad97 100644 --- a/src/plugins/imageformats/jp2/qjp2handler.cpp +++ b/src/plugins/imageformats/jp2/qjp2handler.cpp @@ -1204,6 +1204,8 @@ void Jpeg2000JasperReader::printMetadata(jas_image_t *image) jas_image_cmpttlx(image, c), jas_image_cmpttly(image, c), jas_image_cmptbrx(image, c), jas_image_cmptbry(image, c)); } +#else + Q_UNUSED(image); #endif } |