Reactivate the opjviewer in cmake

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2847a4dcb416418d2964ae6d157fe42321a04ecb..b1f27de5aac8314cf1a8034e8d9cf6dd1db12c4e 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -179,6 +179,8 @@ ADD_SUBDIRECTORY(libopenjpeg)
 OPTION(BUILD_CODEC "Build the CODEC executables" ON)
 OPTION(BUILD_MJ2 "Build the MJ2 executables." OFF)
 OPTION(BUILD_JPIP "Build the JPIP library and executables." OFF)
+OPTION(BUILD_VIEWER "Build the OPJViewer executable (C++)" OFF)
+MARK_AS_ADVANCED(BUILD_VIEWER)
 
 IF(BUILD_JPIP)
  FIND_PACKAGE(CURL)

diff --git a/applications/CMakeLists.txt b/applications/CMakeLists.txt
index d26e26db8c04d7f4e9f5665360753ed13b316494..9c0bbb20ede03186e890d3c504005c1d83af77f1 100644 (file)
--- a/applications/CMakeLists.txt
+++ b/applications/CMakeLists.txt
@@ -11,3 +11,7 @@ ENDIF(BUILD_MJ2)
 IF(BUILD_JPIP)
  ADD_SUBDIRECTORY(jpip)
 ENDIF(BUILD_JPIP)
+
+IF(BUILD_VIEWER)
+ ADD_SUBDIRECTORY(OPJViewer)
+ENDIF(BUILD_VIEWER)

diff --git a/applications/OPJViewer/CMakeLists.txt b/applications/OPJViewer/CMakeLists.txt
new file mode 100644 (file)
index 0000000..a03b370
--- /dev/null
+++ b/applications/OPJViewer/CMakeLists.txt
@@ -0,0 +1,23 @@
+PROJECT(viewer CXX)\r
+\r
+FIND_PACKAGE(wxWidgets REQUIRED)\r
+INCLUDE(${wxWidgets_USE_FILE})\r
+\r
+INCLUDE_DIRECTORIES(\r
+  ${CMAKE_CURRENT_SOURCE_DIR}/../..\r
+  ${CMAKE_CURRENT_SOURCE_DIR}/..\r
+  )\r
+\r
+ADD_DEFINITIONS(-DwxUSE_LIBOPENJPEG -DOPENJPEG_VERSION="1.5.0")\r
+SET(OPJV_SRCS\r
+  ${CMAKE_CURRENT_SOURCE_DIR}/source/imagjpeg2000.cpp\r
+  ${CMAKE_CURRENT_SOURCE_DIR}/source/wxj2kparser.cpp\r
+  ${CMAKE_CURRENT_SOURCE_DIR}/source/OPJViewer.cpp\r
+  ${CMAKE_CURRENT_SOURCE_DIR}/source/wxjp2parser.cpp\r
+  ${CMAKE_CURRENT_SOURCE_DIR}/source/OPJDialogs.cpp\r
+  ${CMAKE_CURRENT_SOURCE_DIR}/source/OPJThreads.cpp\r
+  ${CMAKE_CURRENT_SOURCE_DIR}/source/OPJAbout.cpp\r
+  ${CMAKE_CURRENT_SOURCE_DIR}/../codec/index.c\r
+  )\r
+ADD_EXECUTABLE(opjviewer ${OPJV_SRCS})\r
+TARGET_LINK_LIBRARIES(opjviewer ${wxWidgets_LIBRARIES} openjpeg)\r

diff --git a/applications/OPJViewer/source/OPJDialogs.cpp b/applications/OPJViewer/source/OPJDialogs.cpp
index ed68ef3f5c550e21c4d2402e4f647c7182843d3b..36490d40c588364c00d2668dcc06c63c13eb04f4 100644 (file)
--- a/applications/OPJViewer/source/OPJDialogs.cpp
+++ b/applications/OPJViewer/source/OPJDialogs.cpp
@@ -360,6 +360,22 @@ wxPanel* OPJDecoderDialog::CreatePart11SettingsPage(wxWindow* parent)
     return panel;\r
 }\r
 \r
+void OPJDecoderDialog::OnEnableJPWL(wxCommandEvent& event)\r
+{\r
+       if (event.IsChecked()) {\r
+               wxLogMessage(wxT("JPWL enabled"));\r
+               m_expcompsCtrl->Enable(true);\r
+               m_maxtilesCtrl->Enable(true);\r
+       } else {\r
+               wxLogMessage(wxT("JPWL disabled"));\r
+               m_expcompsCtrl->Enable(false);\r
+               m_maxtilesCtrl->Enable(false);\r
+       }\r
+\r
+}\r
+\r
+#endif // USE_JPWL\r
+\r
 void OPJDecoderDialog::OnEnableDeco(wxCommandEvent& event)\r
 {\r
        size_t pp;\r
@@ -384,22 +400,6 @@ void OPJDecoderDialog::OnEnableDeco(wxCommandEvent& event)
 \r
 }\r
 \r
-void OPJDecoderDialog::OnEnableJPWL(wxCommandEvent& event)\r
-{\r
-       if (event.IsChecked()) {\r
-               wxLogMessage(wxT("JPWL enabled"));\r
-               m_expcompsCtrl->Enable(true);\r
-               m_maxtilesCtrl->Enable(true);\r
-       } else {\r
-               wxLogMessage(wxT("JPWL disabled"));\r
-               m_expcompsCtrl->Enable(false);\r
-               m_maxtilesCtrl->Enable(false);\r
-       }\r
-\r
-}\r
-\r
-#endif // USE_JPWL\r
-\r
 \r
 \r
 \r

diff --git a/applications/OPJViewer/source/OPJViewer.cpp b/applications/OPJViewer/source/OPJViewer.cpp
index 8f2c86e8572b774be0ca4a31b0484dd00f59f64f..1bc170b4717a3aed9087e7902ae2c38347a51ab9 100644 (file)
--- a/applications/OPJViewer/source/OPJViewer.cpp
+++ b/applications/OPJViewer/source/OPJViewer.cpp
@@ -1373,6 +1373,8 @@ void OPJFrame::OnFileSaveAs(wxCommandEvent& WXUNUSED(event))
        wxT("JPEG 2000 codestream (*.j2k)|*.j2k")\r
        wxT("|JPEG 2000 file format (*.jp2)|*.jp2");\r
 #endif\r
+#else\r
+       wxT("Houston we have a problem");\r
 #endif\r
 \r
     wxFileDialog dialog(this, _T("Save image file"),\r

diff --git a/applications/OPJViewer/source/OPJViewer.h b/applications/OPJViewer/source/OPJViewer.h
index 3574dac1dd24cfef282899ef4537aee7e2d9a16c..e0e615bfdc05e709446ee4cd6f4ae10b7e5e08b5 100644 (file)
--- a/applications/OPJViewer/source/OPJViewer.h
+++ b/applications/OPJViewer/source/OPJViewer.h
@@ -214,8 +214,8 @@ class OPJViewerApp: public wxApp
 #ifdef USE_JPWL\r
                bool m_enablejpwl, m_enablejpwle;\r
                int m_expcomps, m_maxtiles;\r
-               int m_framewidth, m_frameheight;\r
 #endif // USE_JPWL\r
+               int m_framewidth, m_frameheight;\r
 \r
                // encoding engine parameters\r
                wxString m_subsampling, m_origin, m_rates, m_comment, m_index, m_quality;\r
@@ -782,9 +782,10 @@ public:
 #ifdef USE_JPWL\r
        void OnEnableJPWL(wxCommandEvent& event);\r
     wxPanel* CreatePart11SettingsPage(wxWindow* parent);\r
-       wxSpinCtrl *m_expcompsCtrl, *m_framenumCtrl, *m_maxtilesCtrl;\r
+       wxSpinCtrl *m_expcompsCtrl, *m_maxtilesCtrl;\r
        wxCheckBox *m_enablejpwlCheck;\r
 #endif // USE_JPWL\r
+       wxSpinCtrl *m_framenumCtrl;\r
 \r
 \r
 protected:\r