From aa8ce7acb145af76fb270800babd8bffc61865e1 Mon Sep 17 00:00:00 2001 From: Maarten Bent Date: Sat, 17 Nov 2018 15:28:29 +0100 Subject: [PATCH] Include minor version in jpeg library version info --- src/common/imagjpeg.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/common/imagjpeg.cpp b/src/common/imagjpeg.cpp index df9893c44d..7fbb97ce5e 100644 --- a/src/common/imagjpeg.cpp +++ b/src/common/imagjpeg.cpp @@ -505,7 +505,11 @@ bool wxJPEGHandler::DoCanRead( wxInputStream& stream ) /*static*/ wxVersionInfo wxJPEGHandler::GetLibraryVersionInfo() { - return wxVersionInfo("libjpeg", JPEG_LIB_VERSION/10, JPEG_LIB_VERSION%10); +#if defined(JPEG_LIB_VERSION_MAJOR) && defined(JPEG_LIB_VERSION_MINOR) + return wxVersionInfo("libjpeg", JPEG_LIB_VERSION_MAJOR, JPEG_LIB_VERSION_MINOR); +#else + return wxVersionInfo("libjpeg", JPEG_LIB_VERSION / 10, JPEG_LIB_VERSION % 10); +#endif } #endif // wxUSE_LIBJPEG