reverted 'include "../opj_config.h"' to 'include "opj_config.h"'

diff --git a/CHANGES b/CHANGES
index 7e3c2dbeea32827d5b08c6e275c52ec409ec215b..df7fafaf9fed4f2a015eabfde21d441abb3e1cf8 100644 (file)
--- 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 788934a6b7419cb3fdcaf8ab11bdbc2aa6f3e265..45cf2563c91a7b520d7a5004fe6a16eeb76debc7 100644 (file)
--- 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 d4b87e985f7947b7fd6fa803121d4b6c53773806..a223adb895c696b4d94f4b5ded50dd1422255604 100644 (file)
--- 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 20b65d735848fad37d3cd90901b9ee2b70867e02..83fc1c94d5daa018fb0072a855bb25dd5141c523 100644 (file)
--- 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 62b33e3b44f26a522fe87af56d5763ea60a315d2..bbf40ad90c0bd8d4406b3209ad9cbccc7489068c 100644 (file)
--- 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 518e4f121a822280592e4f7e0366efc577bb7431..61b22cf17378946654cb13d396ce051a7ad8b636 100644 (file)
--- 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 a7bcf13624bbf0cf210c3054b7033c09710db5e5..56c82f81db28f5830ba281fdc028dfe4c4ccfe3b 100644 (file)
--- 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"
 
 /* ---------------------------------------------------------------------- */