diff options
| author | Even Rouault <even.rouault@spatialys.com> | 2024-02-28 14:29:42 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-02-28 14:29:42 +0100 |
| commit | 61309d7f66f6c6d6381c529b84931e9a7531c1b6 (patch) | |
| tree | c8dd5de1dbfb092d0299563339b23b4e5a5a8887 | |
| parent | d2ba1021c1239103c5d53e437ed7edde206cc3ff (diff) | |
| parent | f19c21309ee996a752e35ff299cb2d2a6fd8b6cd (diff) | |
Merge pull request #1515 from rouault/fix_1514
openjpeg.h: make sure to include opj_config.h (fixes #1514)
| -rw-r--r-- | src/lib/openjp2/openjpeg.h | 2 | ||||
| -rw-r--r-- | src/lib/openjp2/opj_config.h.cmake.in | 5 |
2 files changed, 7 insertions, 0 deletions
diff --git a/src/lib/openjp2/openjpeg.h b/src/lib/openjp2/openjpeg.h index a421143a..67d168bb 100644 --- a/src/lib/openjp2/openjpeg.h +++ b/src/lib/openjp2/openjpeg.h @@ -138,6 +138,8 @@ typedef int64_t OPJ_OFF_T; /* 64-bit file offset type */ #include <stdio.h> typedef size_t OPJ_SIZE_T; +#include "opj_config.h" + /* Avoid compile-time warning because parameter is not used */ #define OPJ_ARG_NOT_USED(x) (void)(x) diff --git a/src/lib/openjp2/opj_config.h.cmake.in b/src/lib/openjp2/opj_config.h.cmake.in index 50015fb9..64884b65 100644 --- a/src/lib/openjp2/opj_config.h.cmake.in +++ b/src/lib/openjp2/opj_config.h.cmake.in @@ -1,3 +1,6 @@ +#ifndef OPJ_CONFIG_H_INCLUDED +#define OPJ_CONFIG_H_INCLUDED + /* create opj_config.h for CMake */ /*--------------------------------------------------------------------------*/ @@ -7,3 +10,5 @@ #define OPJ_VERSION_MAJOR @OPENJPEG_VERSION_MAJOR@ #define OPJ_VERSION_MINOR @OPENJPEG_VERSION_MINOR@ #define OPJ_VERSION_BUILD @OPENJPEG_VERSION_BUILD@ + +#endif |