core
/
eccodes
mirror of https://github.com/ecmwf/eccodes.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Openjpeg 2.5.1: Try again

This commit is contained in:
shahramn 2024-02-28 19:35:25 +00:00
parent 24e13c4f8a
commit 66e39ad3e8
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bamboo/flags.cmake
View File

@ -1,4 +1,4 @@
SET(ENABLE_EXTRA_TESTS ON CACHE BOOL "Enable extra tests") SET(ENABLE_EXTRA_TESTS ON CACHE BOOL "Enable extra tests")
SET(ENABLE_ECCODES_THREADS ON CACHE BOOL "Enable POSIX threads") SET(ENABLE_ECCODES_THREADS ON CACHE BOOL "Enable POSIX threads")
SET(ENABLE_MEMFS ON CACHE BOOL "Enable MEMFS") SET(ENABLE_MEMFS ON CACHE BOOL "Enable MEMFS")
SET(ENABLE_JPG_LIBOPENJPEG OFF CACHE BOOL "Disable OpenJPEG") # SET(ENABLE_JPG_LIBOPENJPEG OFF CACHE BOOL "Disable OpenJPEG")

6
src/grib_openjpeg_encoding.cc
View File

@ -13,7 +13,11 @@
#if HAVE_LIBOPENJPEG #if HAVE_LIBOPENJPEG
#include "openjpeg.h" #include "openjpeg.h"
#include "opj_config.h" // The older versions did not have the opj_config.h file
// So we use a more recent macro to detect whether it is there
#if defined(OPJ_IMG_INFO)
#include "opj_config.h"
#endif
static void openjpeg_warning(const char* msg, void* client_data) static void openjpeg_warning(const char* msg, void* client_data)
{ {