From d5b44a98bc4a289690ae668655439b17b604ab58 Mon Sep 17 00:00:00 2001
From: Antonin Descampe <antonin@gmail.com>
Date: Mon, 22 Nov 2010 11:48:19 +0000
Subject: [PATCH] reverted 'include "../opj_config.h"' to 'include
 "opj_config.h"'

---
 CHANGES                | 3 +++
 codec/convert.c        | 2 +-
 codec/image_to_j2k.c   | 2 +-
 codec/j2k_dump.c       | 2 +-
 codec/j2k_to_image.c   | 2 +-
 libopenjpeg/jp2.c      | 2 +-
 libopenjpeg/openjpeg.c | 2 +-
 7 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/CHANGES b/CHANGES
index 7e3c2dbe..df7fafaf 100644
--- a/CHANGES
+++ b/CHANGES
@@ -5,6 +5,9 @@ What's New for OpenJPEG
 ! : changed
 + : added
 
+November 22, 2010
+! [antonin] reverted 'include "../opj_config.h"' to 'include "opj_config.h"'
+
 November 17, 2010
 ! [antonin] install man pages by default. install CHANGES and LICENSE
 ! [antonin] minor changes in cmake files (from winfried)
diff --git a/codec/convert.c b/codec/convert.c
index 788934a6..45cf2563 100644
--- a/codec/convert.c
+++ b/codec/convert.c
@@ -29,7 +29,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"
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/codec/image_to_j2k.c b/codec/image_to_j2k.c
index d4b87e98..a223adb8 100644
--- a/codec/image_to_j2k.c
+++ b/codec/image_to_j2k.c
@@ -35,7 +35,7 @@
 #include <stdlib.h>
 #include <math.h>
 
-#include "../opj_config.h"
+#include "opj_config.h"
 #include "openjpeg.h"
 #include "compat/getopt.h"
 #include "convert.h"
diff --git a/codec/j2k_dump.c b/codec/j2k_dump.c
index 20b65d73..83fc1c94 100644
--- a/codec/j2k_dump.c
+++ b/codec/j2k_dump.c
@@ -29,7 +29,7 @@
 #include <stdlib.h>
 #include <math.h>
 
-#include "../opj_config.h"
+#include "opj_config.h"
 #include "openjpeg.h"
 #include "../libopenjpeg/j2k.h"
 #include "../libopenjpeg/jp2.h"
diff --git a/codec/j2k_to_image.c b/codec/j2k_to_image.c
index 62b33e3b..bbf40ad9 100644
--- a/codec/j2k_to_image.c
+++ b/codec/j2k_to_image.c
@@ -35,7 +35,7 @@
 #include <stdlib.h>
 #include <math.h>
 
-#include "../opj_config.h"
+#include "opj_config.h"
 #include "openjpeg.h"
 #include "compat/getopt.h"
 #include "convert.h"
diff --git a/libopenjpeg/jp2.c b/libopenjpeg/jp2.c
index 518e4f12..61b22cf1 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>
diff --git a/libopenjpeg/openjpeg.c b/libopenjpeg/openjpeg.c
index a7bcf136..56c82f81 100644
--- a/libopenjpeg/openjpeg.c
+++ b/libopenjpeg/openjpeg.c
@@ -28,7 +28,7 @@
 #include <windows.h>
 #endif /* WIN32 */
 
-#include "../opj_config.h"
+#include "opj_config.h"
 #include "opj_includes.h"
 
 /* ---------------------------------------------------------------------- */