mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-19 18:47:48 +08:00
6df1629d4d
* Bump GDAL version wherever necessary * Update download package and checksum. * Remove 0001-Add-support-for-MSVC1900-backported-from-GDAL2.patch no longer necessary. * Recalculate 000N prefix in patche filenames after the removal. * Update 0002-Ensures-inclusion-of-PDB-in-release-dll-if-so-reques.patch * Patch pushed upstream https://trac.osgeo.org/gdal/ticket/7055 and should no longer be necessary in GDAL 2.2.3 or later * Update 0003-Fix-openjpeg-include.patch
21 lines
651 B
Diff
21 lines
651 B
Diff
diff --git a/frmts/openjpeg/openjpegdataset.cpp b/frmts/openjpeg/openjpegdataset.cpp
|
|
index 5978882bc9..72cc7b9559 100644
|
|
--- a/frmts/openjpeg/openjpegdataset.cpp
|
|
+++ b/frmts/openjpeg/openjpegdataset.cpp
|
|
@@ -34,14 +34,8 @@
|
|
#pragma clang diagnostic ignored "-Wdocumentation"
|
|
#endif
|
|
|
|
-#if defined(OPENJPEG_VERSION) && OPENJPEG_VERSION >= 20200
|
|
-#include <openjpeg-2.2/openjpeg.h>
|
|
-#elif defined(OPENJPEG_VERSION) && OPENJPEG_VERSION >= 20100
|
|
-#include <openjpeg-2.1/openjpeg.h>
|
|
-#else
|
|
#include <stdio.h> /* openjpeg.h needs FILE* */
|
|
-#include <openjpeg-2.0/openjpeg.h>
|
|
-#endif
|
|
+#include <openjpeg.h>
|
|
|
|
#ifdef __clang__
|
|
#pragma clang diagnostic pop
|