summaryrefslogtreecommitdiff
path: root/libopenjpeg
diff options
context:
space:
mode:
authorAntonin Descampe <antonin@gmail.com>2010-11-15 11:08:03 +0000
committerAntonin Descampe <antonin@gmail.com>2010-11-15 11:08:03 +0000
commit709068ef5bf76b13948be4dffa03cc513f2e4abd (patch)
tree707f3bb19b6fecdee1b5cf090f3d4dc8d2e96c8f /libopenjpeg
parent2b7f6f82bece95a79adeffa1c731fdf6383e60cf (diff)
minor changes in header inclusions
Diffstat (limited to 'libopenjpeg')
-rw-r--r--libopenjpeg/jp2.c3
-rw-r--r--libopenjpeg/openjpeg.c2
-rw-r--r--libopenjpeg/opj_includes.h1
3 files changed, 3 insertions, 3 deletions
diff --git a/libopenjpeg/jp2.c b/libopenjpeg/jp2.c
index 48a1f8d0..518e4f12 100644
--- a/libopenjpeg/jp2.c
+++ b/libopenjpeg/jp2.c
@@ -28,7 +28,7 @@
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
*/
-#include <opj_config.h>
+#include "../opj_config.h"
#ifdef HAVE_LIBLCMS2
#include <math.h>
#include <lcms2.h>
@@ -38,7 +38,6 @@
#include <lcms.h>
#endif
#include "opj_includes.h"
-#include "opj_convert.h"
/** @defgroup JP2 JP2 - JPEG-2000 file format reader/writer */
/*@{*/
diff --git a/libopenjpeg/openjpeg.c b/libopenjpeg/openjpeg.c
index 99866b8a..a7bcf136 100644
--- a/libopenjpeg/openjpeg.c
+++ b/libopenjpeg/openjpeg.c
@@ -1,4 +1,3 @@
-#include <opj_config.h>
/*
* Copyright (c) 2005, Hervé Drolon, FreeImage Team
* All rights reserved.
@@ -29,6 +28,7 @@
#include <windows.h>
#endif /* WIN32 */
+#include "../opj_config.h"
#include "opj_includes.h"
/* ---------------------------------------------------------------------- */
diff --git a/libopenjpeg/opj_includes.h b/libopenjpeg/opj_includes.h
index 53739abf..7ec641bc 100644
--- a/libopenjpeg/opj_includes.h
+++ b/libopenjpeg/opj_includes.h
@@ -104,6 +104,7 @@ static INLINE long lrintf(float f){
}
#endif
+#include "opj_convert.h"
#include "j2k_lib.h"
#include "opj_malloc.h"
#include "event.h"