summaryrefslogtreecommitdiff
path: root/OPJViewer/source/OPJViewer.h
diff options
context:
space:
mode:
authorGiuseppe Baruffa <gbaruffa@users.noreply.github.com>2008-01-31 14:36:06 +0000
committerGiuseppe Baruffa <gbaruffa@users.noreply.github.com>2008-01-31 14:36:06 +0000
commite21d8654402fc9e35e9fe18c68da63ce5a731140 (patch)
treed7760b1eddc754ee1570d3d64f7389a014aa3aa4 /OPJViewer/source/OPJViewer.h
parent04966097fc1d92fbfb6650d43b115447d5370c2c (diff)
In opjviewer, unification of JPEG 2000 family handlers (*.jp2, *.mj2, *.j2k) in a single file
Diffstat (limited to 'OPJViewer/source/OPJViewer.h')
-rw-r--r--OPJViewer/source/OPJViewer.h12
1 files changed, 7 insertions, 5 deletions
diff --git a/OPJViewer/source/OPJViewer.h b/OPJViewer/source/OPJViewer.h
index d44f7e48..8d36bcc2 100644
--- a/OPJViewer/source/OPJViewer.h
+++ b/OPJViewer/source/OPJViewer.h
@@ -103,9 +103,10 @@
#include "libopenjpeg/openjpeg.h"
-#include "imagj2k.h"
-#include "imagjp2.h"
-#include "imagmj2.h"
+//#include "imagj2k.h"
+//#include "imagjp2.h"
+//#include "imagmj2.h"
+#include "imagjpeg2000.h"
#ifdef USE_MXF
#include "imagmxf.h"
#endif // USE_MXF
@@ -131,9 +132,9 @@ typedef unsigned long long int8byte;
#define OPJ_APPLICATION wxT("OPJViewer")
#define OPJ_APPLICATION_NAME wxT("OpenJPEG Viewer")
-#define OPJ_APPLICATION_VERSION wxT("0.3 alpha")
+#define OPJ_APPLICATION_VERSION wxT("0.4 beta")
#define OPJ_APPLICATION_TITLEBAR OPJ_APPLICATION_NAME wxT(" ") OPJ_APPLICATION_VERSION
-#define OPJ_APPLICATION_COPYRIGHT wxT("(C) 2007, Giuseppe Baruffa")
+#define OPJ_APPLICATION_COPYRIGHT wxT("(C) 2007-2008, Giuseppe Baruffa")
#define OPJ_APPLICATION_VENDOR wxT("OpenJPEG")
#ifdef __WXMSW__
@@ -442,6 +443,7 @@ class OPJFrame: public wxMDIParentFrame
void SaveFile(wxArrayString paths, wxArrayString filenames);
void OnNotebook(wxNotebookEvent& event);
void Rescale(int scale, OPJChildFrame *child);
+ void OnLogmsgEvent(wxCommandEvent &event);
OPJMarkerTreeHash m_treehash;
OPJChildFrameHash m_childhash;