[trunk] FolderReorgProposal task: Fix Viewer

Update issue 177

diff --git a/src/bin/CMakeLists.txt b/src/bin/CMakeLists.txt
index 2abada1b9f66b03c40d61a395102c65405e1e8bf..6393404e677ec2af88c933bde27d323221d05170 100644 (file)
--- a/src/bin/CMakeLists.txt
+++ b/src/bin/CMakeLists.txt
@@ -17,6 +17,5 @@ if(BUILD_JP3D)
   add_subdirectory(jp3d)
 endif()
 
-if(BUILD_VIEWER)
-  add_subdirectory(wx)
-endif()
+# wx apps:
+add_subdirectory(wx)

diff --git a/src/bin/wx/CMakeLists.txt b/src/bin/wx/CMakeLists.txt
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..effb5b8d1baab12881167b3e6ae17937e7ab9b68 100644 (file)
--- a/src/bin/wx/CMakeLists.txt
+++ b/src/bin/wx/CMakeLists.txt
@@ -0,0 +1,4 @@
+#
+if(BUILD_VIEWER)
+  add_subdirectory(OPJViewer)
+endif()

diff --git a/src/bin/wx/OPJViewer/CMakeLists.txt b/src/bin/wx/OPJViewer/CMakeLists.txt
index 34442848ac5bb1c1e544f2b5d3054d9a815eafcb..1b61c8300d7a1cd491087c9768f331aecc106fc6 100644 (file)
--- a/src/bin/wx/OPJViewer/CMakeLists.txt
+++ b/src/bin/wx/OPJViewer/CMakeLists.txt
@@ -6,6 +6,9 @@ include(${wxWidgets_USE_FILE})
 include_directories(
   ${CMAKE_CURRENT_SOURCE_DIR}/../..
   ${CMAKE_CURRENT_SOURCE_DIR}/..
+  ${OPENJPEG_SOURCE_DIR}/src/lib
+  ${OPENJPEG_SOURCE_DIR}/src/bin
+  ${OPENJPEG_SOURCE_DIR}/src/lib/openjp2
   )
 
 # original flags:
@@ -19,7 +22,7 @@ set(OPJV_SRCS
   ${CMAKE_CURRENT_SOURCE_DIR}/source/OPJDialogs.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/source/OPJThreads.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/source/OPJAbout.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/../codec/index.c
+  ${OPENJPEG_SOURCE_DIR}/src/bin/jp2/index.c
   )
 add_executable(opjviewer ${OPJV_SRCS})
 target_link_libraries(opjviewer ${wxWidgets_LIBRARIES} openjpeg)

diff --git a/src/bin/wx/OPJViewer/source/OPJViewer.h b/src/bin/wx/OPJViewer/source/OPJViewer.h
index ecc48b62f79c0452b381b67eda401239a3c3b9db..f8a7f8df254ae90e7bcb1566ff33b4fc39ddca62 100644 (file)
--- a/src/bin/wx/OPJViewer/source/OPJViewer.h
+++ b/src/bin/wx/OPJViewer/source/OPJViewer.h
@@ -101,7 +101,7 @@
 #include "wx/toolbar.h"
 #include "wx/artprov.h"
 
-#include "libopenjpeg/openjpeg.h"
+#include "openjp2/openjpeg.h"
 
 //#include "imagj2k.h"
 //#include "imagjp2.h"

diff --git a/src/bin/wx/OPJViewer/source/imagjpeg2000.cpp b/src/bin/wx/OPJViewer/source/imagjpeg2000.cpp
index ee2aa74d320390a7e98956f3143f3fc442edaa02..c1f0a02e23c139268b3b56eaecbfc6aba04e19f9 100644 (file)
--- a/src/bin/wx/OPJViewer/source/imagjpeg2000.cpp
+++ b/src/bin/wx/OPJViewer/source/imagjpeg2000.cpp
@@ -51,7 +51,7 @@
     #include "wx/module.h"
 #endif
 
-#include "libopenjpeg/openjpeg.h"
+#include "openjp2/openjpeg.h"
 
 #include "wx/filefn.h"
 #include "wx/wfstream.h"

diff --git a/src/bin/wx/OPJViewer/source/imagjpeg2000.h b/src/bin/wx/OPJViewer/source/imagjpeg2000.h
index 609a3063dbae38ce9afde39aef9debcddbad19c0..6bb31c1be9e4c794a22c5034741a1bb8aecc6e8a 100644 (file)
--- a/src/bin/wx/OPJViewer/source/imagjpeg2000.h
+++ b/src/bin/wx/OPJViewer/source/imagjpeg2000.h
@@ -44,8 +44,8 @@
 #if wxUSE_LIBOPENJPEG
 
 #include "wx/image.h"
-#include "libopenjpeg/openjpeg.h"
-#include "codec/index.h"
+#include "openjp2/openjpeg.h"
+#include "jp2/index.h"
 
 #define wxBITMAP_TYPE_JPEG2000 50