diff options
| author | Carl Hetherington <cth@carlh.net> | 2015-11-03 10:30:31 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2015-11-03 10:30:31 +0000 |
| commit | 4d225c4772e160131c914258655492b9cb2e466b (patch) | |
| tree | 2e01359c8923ae68ff50d9c1e29c0c5cc7e4741b /src | |
| parent | 914bd98baa57c6f2c117e33b21a9ee3d25d0fdc2 (diff) | |
Trim openjpeg.h includes.
Diffstat (limited to 'src')
| -rw-r--r-- | src/openjpeg_image.cc | 1 | ||||
| -rw-r--r-- | src/openjpeg_image.h | 4 | ||||
| -rw-r--r-- | src/picture_asset.h | 1 | ||||
| -rw-r--r-- | src/util.cc | 1 | ||||
| -rw-r--r-- | src/util.h | 1 |
5 files changed, 5 insertions, 3 deletions
diff --git a/src/openjpeg_image.cc b/src/openjpeg_image.cc index 4d5b12e2..b7a9c0d0 100644 --- a/src/openjpeg_image.cc +++ b/src/openjpeg_image.cc @@ -23,6 +23,7 @@ #include "openjpeg_image.h" #include "dcp_assert.h" +#include <openjpeg.h> #include <stdexcept> using namespace dcp; diff --git a/src/openjpeg_image.h b/src/openjpeg_image.h index 9d6615a2..42cdb065 100644 --- a/src/openjpeg_image.h +++ b/src/openjpeg_image.h @@ -22,7 +22,9 @@ */ #include "util.h" -#include <openjpeg.h> + +struct opj_image; +typedef struct opj_image opj_image_t; namespace dcp { diff --git a/src/picture_asset.h b/src/picture_asset.h index 2c3917a4..19a3322e 100644 --- a/src/picture_asset.h +++ b/src/picture_asset.h @@ -27,7 +27,6 @@ #include "mxf.h" #include "util.h" #include "metadata.h" -#include <openjpeg.h> namespace ASDCP { namespace JP2K { diff --git a/src/util.cc b/src/util.cc index 569eb9fb..d5ba6fab 100644 --- a/src/util.cc +++ b/src/util.cc @@ -31,6 +31,7 @@ #include "KM_util.h" #include "KM_fileio.h" #include "AS_DCP.h" +#include <openjpeg.h> #include <xmlsec/xmldsig.h> #include <xmlsec/dl.h> #include <xmlsec/app.h> @@ -29,7 +29,6 @@ #include <boost/function.hpp> #include <boost/filesystem.hpp> #include <boost/optional.hpp> -#include <openjpeg.h> #include <string> #include <stdint.h> |