diff options
| author | Mathieu Malaterre <mathieu.malaterre@gmail.com> | 2012-09-28 08:59:10 +0000 |
|---|---|---|
| committer | Mathieu Malaterre <mathieu.malaterre@gmail.com> | 2012-09-28 08:59:10 +0000 |
| commit | a4fa18e92df6592d16dcc18205571aea0ae9c0c9 (patch) | |
| tree | ebf6d5fb39098bbfe350251a068f6f846c6008e6 /src/bin/wx/OPJViewer | |
| parent | f71af2a2ef70a58c10a247cb4693b3c335f674d5 (diff) | |
[trunk] FolderReorgProposal task: Fix Viewer
Update issue 177
Diffstat (limited to 'src/bin/wx/OPJViewer')
| -rw-r--r-- | src/bin/wx/OPJViewer/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | src/bin/wx/OPJViewer/source/OPJViewer.h | 2 | ||||
| -rw-r--r-- | src/bin/wx/OPJViewer/source/imagjpeg2000.cpp | 2 | ||||
| -rw-r--r-- | src/bin/wx/OPJViewer/source/imagjpeg2000.h | 4 |
4 files changed, 8 insertions, 5 deletions
diff --git a/src/bin/wx/OPJViewer/CMakeLists.txt b/src/bin/wx/OPJViewer/CMakeLists.txt index 34442848..1b61c830 100644 --- 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 ecc48b62..f8a7f8df 100644 --- 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 ee2aa74d..c1f0a02e 100644 --- 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 609a3063..6bb31c1b 100644 --- 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 |