Improved success for the linux build; OPJViewer shows all the COM contents

diff --git a/ChangeLog b/ChangeLog
index a5c2a87bbeb2c413b722b96e1a101dd7ded322f3..a16e2d3c6a521b33af1879b7dcac8b6db4783fb9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,9 @@ What's New for OpenJPEG
 ! : changed
 + : added
 
+October 23, 2007
+* [GB] Improved success for the linux build; OPJViewer shows all the COM contents
+ 
 October 18, 2007
 * [FOD] Changed the ROI parameter in the image_to_j2k codec to make it correspond to the documentation (i.e. -ROI c=0,U=25)
 * [FOD] Patch from Callum Lewick. Memset patch. 

diff --git a/OPJViewer/Makefile b/OPJViewer/Makefile
index 1224f421f0dd2f1d0726dbf707f2b25077be857a..c626b06228248e17fc9610b2d531728d3979701d 100644 (file)
--- a/OPJViewer/Makefile
+++ b/OPJViewer/Makefile
@@ -1,41 +1,41 @@
-# Makefile for the main JPWL OpenJPEG codecs: JPWL_ j2k_to_image and JPWL_image_to_j2k
-
-# General configuration variables:
-CC = $(shell wx-config-2.8 --cxx)
-AR = ar
-
-CFLAGS = -DUSE_JPWL -DwxUSE_LIBOPENJPEG -DwxUSE_GUI=1 -DOPJ_STATIC -DOPJ_HTMLABOUT $(shell wx-config-2.8 --cxxflags) # -g -p -pg -DUSE_JPWL
-
-OPJV_SRCS = source/imagj2k.cpp source/imagmj2.cpp source/wxj2kparser.cpp source/imagjp2.cpp source/OPJViewer.cpp source/wxjp2parser.cpp
-
-MODULES = $(OPJV_SRCS:.cpp=.o)
-
-all: opjviewer lib
-
-.cpp.o:
-       $(CC) $(CFLAGS) -c $< -o $@
-
-lib:
-       cd ../jpwl; make
-
-opjviewer: $(OPJV_SRCS) lib
-       $(CC) $(CFLAGS) -I .. $(OPJV_SRCS) -o OPJViewer -L ../jpwl -lopenjpeg_JPWL -lm -lstdc++ -ltiff $(shell wx-config-2.8 --libs)  
-
-
-clean:
-       rm -f OPJViewer *.o *.a
-       cd ../libopenjpeg; rm -f *.o
-
-
-
-
-#.cpp.o :
-#      $(CXX) -g -c `wx-config-2.8 --cxxflags` -I ../.. -D wxUSE_LIBOPENJPEG -D wxHACK_BOOLEAN -o $@ $<
-
-#all:    $(PROGRAM)
-
-#$(PROGRAM):     $(OBJECTS)
-#      $(CXX) -o $(PROGRAM) $(OBJECTS) -lopenjpeg -L ../.. `wx-config-2.8 --libs`
-
-#clean:
-#      rm -f *.o $(PROGRAM)
+# Makefile for OPJViewer\r
+\r
+# General configuration variables:\r
+CC = $(shell wx-config-2.8 --cxx)\r
+AR = ar\r
+\r
+CFLAGS = -DUSE_JPWL -DwxUSE_LIBOPENJPEG -DwxUSE_GUI=1 -DOPJ_STATIC -DOPJ_HTMLABOUT $(shell wx-config-2.8 --cxxflags) # -g -p -pg -DUSE_JPWL\r
+\r
+OPJV_SRCS = source/imagj2k.cpp source/imagmj2.cpp source/wxj2kparser.cpp source/imagjp2.cpp source/OPJViewer.cpp source/wxjp2parser.cpp\r
+\r
+MODULES = $(OPJV_SRCS:.cpp=.o)\r
+\r
+all: opjviewer lib\r
+\r
+.cpp.o:\r
+        $(CC) $(CFLAGS) -c $< -o $@\r
+\r
+lib:\r
+        cd ../jpwl; make\r
+\r
+opjviewer: $(OPJV_SRCS) lib\r
+        $(CC) $(CFLAGS) -I .. $(OPJV_SRCS) -o OPJViewer -L ../jpwl -lopenjpeg_JPWL -lm -lstdc++ -ltiff $(shell wx-config-2.8 --libs)\r
+\r
+\r
+clean:\r
+        rm -f OPJViewer *.o *.a\r
+        cd ../libopenjpeg; rm -f *.o\r
+\r
+\r
+\r
+\r
+#.cpp.o :\r
+#       $(CXX) -g -c `wx-config-2.8 --cxxflags` -I ../.. -D wxUSE_LIBOPENJPEG -D wxHACK_BOOLEAN -o $@ $<\r
+\r
+#all:    $(PROGRAM)\r
+\r
+#$(PROGRAM):     $(OBJECTS)\r
+#       $(CXX) -o $(PROGRAM) $(OBJECTS) -lopenjpeg -L ../.. `wx-config-2.8 --libs`\r
+\r
+#clean:\r
+#       rm -f *.o $(PROGRAM)\r

diff --git a/OPJViewer/OPJViewer.dsp b/OPJViewer/OPJViewer.dsp
index a2415892aef4eff6ba53db41c40dfdac1b441103..99b640e551adef3e7448a01d0faf1f425993bf37 100644 (file)
--- a/OPJViewer/OPJViewer.dsp
+++ b/OPJViewer/OPJViewer.dsp
@@ -42,15 +42,15 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0\r
 # PROP Target_Dir ""\r
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c\r
-# ADD CPP /nologo /G6 /MD /W3 /GX /O2 /I "c:\programmi\wxWidgets-2.8.0\lib\vc_lib\msw" /I "c:\programmi\wxWidgets-2.8.0\include" /I ".." /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "_WINDOWS" /D WINVER=0x400 /D "_MT" /D wxUSE_GUI=1 /D "wxUSE_LIBOPENJPEG" /D "OPJ_STATIC" /D "USE_JPWL" /D "USE_JPSEC" /D "OPJ_HTMLABOUT" /D "OPJ_MANYFORMATS" /D "OPJ_INICONFIG" /FR /FD /c\r
+# ADD CPP /nologo /G6 /MD /W3 /GX /O2 /I "d:\programmi\wxWidgets-2.8.0\lib\vc_lib\msw" /I "d:\programmi\wxWidgets-2.8.0\include" /I ".." /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "_WINDOWS" /D WINVER=0x400 /D "_MT" /D wxUSE_GUI=1 /D "wxUSE_LIBOPENJPEG" /D "OPJ_STATIC" /D "USE_JPWL" /D "USE_JPSEC" /D "OPJ_HTMLABOUT" /D "OPJ_MANYFORMATS" /D "OPJ_INICONFIG" /FR /FD /c\r
 # ADD BASE RSC /l 0x410 /d "NDEBUG"\r
-# ADD RSC /l 0x409 /i "c:\programmi\wxWidgets-2.8.0\include" /d "NDEBUG"\r
+# ADD RSC /l 0x409 /i "d:\programmi\wxWidgets-2.8.0\include" /d "NDEBUG"\r
 BSC32=bscmake.exe\r
 # ADD BASE BSC32 /nologo\r
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386\r
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib wxzlib.lib wxregex.lib wxpng.lib wxjpeg.lib wxbase28.lib wxmsw28_core.lib wxmsw28_html.lib wxmsw28_adv.lib wxmsw28_core.lib wxbase28.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib LibOpenJPEG_JPWL.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libcmt.lib" /libpath:"c:\programmi\wxWidgets-2.8.0\lib\vc_lib" /libpath:"..\jpwl\Release" /IGNORE:4089\r
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib wxzlib.lib wxregex.lib wxpng.lib wxjpeg.lib wxbase28.lib wxmsw28_core.lib wxmsw28_html.lib wxmsw28_adv.lib wxmsw28_core.lib wxbase28.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib LibOpenJPEG_JPWL.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libcmt.lib" /libpath:"d:\programmi\wxWidgets-2.8.0\lib\vc_lib" /libpath:"..\jpwl\Release" /IGNORE:4089\r
 # SUBTRACT LINK32 /pdb:none\r
 # Begin Special Build Tool\r
 SOURCE="$(InputPath)"\r

diff --git a/OPJViewer/source/OPJViewer.cpp b/OPJViewer/source/OPJViewer.cpp
index 66d47c5d65c008c3838b1cddf0ad1a9a2a5d087e..8783386cc0a5dc273b7c3f162357934168c5c539 100644 (file)
--- a/OPJViewer/source/OPJViewer.cpp
+++ b/OPJViewer/source/OPJViewer.cpp
@@ -306,9 +306,9 @@ bool OPJViewerApp::OnInit(void)
 #endif\r
 \r
 #ifdef USE_JPWL\r
-               m_comment += wxString::Format("%s with JPWL", opj_version());\r
+               m_comment += wxString::Format(wxT("%s with JPWL"), (char *) opj_version());\r
 #else\r
-               m_comment += wxString::Format("%s", opj_version());\r
+               m_comment += wxString::Format(wxT("%s"), (char *) opj_version());\r
 #endif\r
        }\r
 \r
@@ -1245,7 +1245,11 @@ void OPJCanvas::OnDraw(wxDC& dc)
        } else {\r
                dc.SetFont(*wxSWISS_FONT);\r
                dc.SetPen(*wxBLACK_PEN);\r
+#ifdef __WXGTK__\r
+               dc.DrawText(_T("Decoding image, please wait... (press \"Zoom to Fit\" to show the image)"), 40, 50);\r
+#else\r
                dc.DrawText(_T("Decoding image, please wait..."), 40, 50);\r
+#endif\r
        }\r
 }\r
 \r
@@ -1793,14 +1797,13 @@ void OPJMarkerTree::OnItemExpanding(wxTreeEvent& event)
 \r
 void OPJMarkerTree::OnSelChanged(wxTreeEvent& event)\r
 {\r
-#define BUNCH_LINESIZE 16\r
-#define BUNCH_NUMLINES 7\r
+       int bunch_linesize = 16;\r
+       int bunch_numlines = 7;\r
 \r
        wxTreeItemId item = event.GetItem();\r
        OPJMarkerData* data = (OPJMarkerData *) GetItemData(item);\r
        wxString text;\r
        int l, c, pos = 0, pre_pos;\r
-       unsigned char buffer[BUNCH_LINESIZE * BUNCH_NUMLINES];\r
 \r
        m_peektextCtrl->Clear();\r
 \r
@@ -1815,19 +1818,25 @@ void OPJMarkerTree::OnSelChanged(wxTreeEvent& event)
        fp->Seek(data->m_start, wxFromStart);\r
 \r
        // read a bunch\r
-       int max_read = wxMin(wxFileOffset(WXSIZEOF(buffer)), data->m_length - data->m_start + 1);\r
+       int max_read = wxMin(wxFileOffset(bunch_linesize * bunch_numlines), data->m_length - data->m_start + 1);\r
+       if (data->m_desc == wxT("MARK (65380)")) {\r
+               /*wxLogMessage(data->m_desc);*/\r
+               max_read = data->m_length - data->m_start + 1;\r
+               bunch_numlines = (int) ceil((float) max_read / (float) bunch_linesize);\r
+       }\r
+       unsigned char *buffer = new unsigned char[bunch_linesize * bunch_numlines];\r
        fp->Read(buffer, max_read);\r
 \r
        // write the file data between start and stop\r
        pos = 0;\r
-       for (l = 0; l < BUNCH_NUMLINES; l++) {\r
+       for (l = 0; l < bunch_numlines; l++) {\r
 \r
                text << wxString::Format(wxT("%010d:"), data->m_start + pos);\r
 \r
                pre_pos = pos;\r
 \r
                // add hex browsing text\r
-               for (c = 0; c < BUNCH_LINESIZE; c++) {\r
+               for (c = 0; c < bunch_linesize; c++) {\r
 \r
                        if (!(c % 8))\r
                                text << wxT(" ");\r
@@ -1842,7 +1851,7 @@ void OPJMarkerTree::OnSelChanged(wxTreeEvent& event)
                text << wxT("    ");\r
 \r
                // add char browsing text\r
-               for (c = 0; c < BUNCH_LINESIZE; c++) {\r
+               for (c = 0; c < bunch_linesize; c++) {\r
 \r
                        if (pre_pos < max_read) {\r
                                if ((buffer[pre_pos] == '\n') ||\r
@@ -1865,6 +1874,8 @@ void OPJMarkerTree::OnSelChanged(wxTreeEvent& event)
        fp->Close();\r
 \r
        m_peektextCtrl->WriteText(text);\r
+\r
+       delete buffer;\r
 }\r
 \r
 /*void LogKeyEvent(const wxChar *name, const wxKeyEvent& event)\r
@@ -2324,7 +2335,7 @@ void *OPJEncoThread::Entry()
        j2kkkhandler->m_comment = wxGetApp().m_comment;\r
 \r
        // save the file\r
-       if (!m_canvas->m_image100.SaveFile(m_canvas->m_savename.GetFullPath(), wxBITMAP_TYPE_J2K)) {\r
+       if (!m_canvas->m_image100.SaveFile(m_canvas->m_savename.GetFullPath(), (wxBitmapType) wxBITMAP_TYPE_J2K)) {\r
                WriteText(wxT("Can't save image"));\r
                return NULL;\r
        }\r
@@ -3185,7 +3196,7 @@ wxPanel* OPJEncoderDialog::CreatePart1_1SettingsPage(wxWindow* parent)
                                // add the value control\r
                                resnumSizer->Add(\r
                                        m_resolutionsCtrl = new wxSpinCtrl(panel, OPJENCO_RESNUMBER,\r
-                                                               wxString::Format("%d", wxGetApp().m_resolutions),\r
+                                                               wxString::Format(wxT("%d"), wxGetApp().m_resolutions),\r
                                                                wxDefaultPosition, wxSize(80, wxDefaultCoord),\r
                                                                wxSP_ARROW_KEYS,\r
                                                                0, 256, 6),\r

diff --git a/OPJViewer/source/OPJViewer.h b/OPJViewer/source/OPJViewer.h
index db28837eb52aa7b3991a44022f4bc9cdaa7c3d41..d861fac59b5329fb08c0048a4fe6a6eb4e4d9cc7 100644 (file)
--- a/OPJViewer/source/OPJViewer.h
+++ b/OPJViewer/source/OPJViewer.h
@@ -272,10 +272,10 @@ class OPJMarkerData : public wxTreeItemData
                const wxChar *GetDesc1() const { return m_desc.c_str(); }\r
                const wxChar *GetDesc2() const { return m_filestring.c_str(); }\r
                wxFileOffset m_start, m_length;\r
+               wxString m_desc;\r
 \r
        // private methods and variables\r
        private:\r
-               wxString m_desc;\r
                wxString m_filestring;\r
 };\r
 \r

diff --git a/OPJViewer/source/about_htm.h b/OPJViewer/source/about_htm.h
index d37db13fc4171da6a0256544652a50a9a649319f..20ec277225fef7a807015372f083a3baeb8f8643 100644 (file)
--- a/OPJViewer/source/about_htm.h
+++ b/OPJViewer/source/about_htm.h
@@ -24,8 +24,8 @@ OPJ_APPLICATION " " OPJ_APPLICATION_VERSION
 "In addition to the basic codec, various other features are under development.</font><br>"\r
 "<font size=-2 color=red>* Build: ")\r
 #include "build.h"\r
-wxT("</font><br>")\r
-wxT("<font size=-2 color=red>* " wxVERSION_STRING ", " __DATE__ ", " __TIME__ "</font><br>")\r
+wxT(", " __DATE__ ", " __TIME__ "</font><br>")\r
+wxT("<font size=-2 color=red>* " wxVERSION_STRING "</font><br>")\r
 #ifdef USE_JPWL\r
 wxT("<font size=-2 color=green>- Compiled with JPWL support</font><br>")\r
 #endif // USE_JPWL\r

diff --git a/OPJViewer/source/build.h b/OPJViewer/source/build.h
index 4d7baa6b7084ddecfe60b8fee6de445dce865831..f23c5e96ae9376ee5fb47effaac65b7e8f0b1f32 100644 (file)
--- a/OPJViewer/source/build.h
+++ b/OPJViewer/source/build.h
@@ -1 +1 @@
-wxT("219") \r
+wxT("242") \r

diff --git a/OPJViewer/source/imagj2k.cpp b/OPJViewer/source/imagj2k.cpp
index 9ce142df9317a842efebe3082f9414fd63ababd8..85b9acd55627594e806d774907ff6f722a75c50c 100644 (file)
--- a/OPJViewer/source/imagj2k.cpp
+++ b/OPJViewer/source/imagj2k.cpp
@@ -189,7 +189,7 @@ bool wxJ2KHandler::LoadFile(wxImage *image, wxInputStream& stream, bool verbose,
        cio = opj_cio_open((opj_common_ptr)dinfo, src, file_length);\r
 \r
        /* decode the stream and fill the image structure */\r
-       opjimage = opj_decode(dinfo, cio, &cstr_info);\r
+       opjimage = opj_decode_with_info(dinfo, cio, &cstr_info);\r
        if (!opjimage) {\r
 #ifndef __WXGTK__ \r
                wxMutexGuiEnter();\r
@@ -261,15 +261,15 @@ bool wxJ2KHandler::SaveFile( wxImage *wimage, wxOutputStream& stream, bool verbo
        parameters.cp_cinema = OFF;\r
 \r
        /* subsampling */\r
-       if (sscanf(m_subsampling.c_str(), wxT("%d,%d"), &(parameters.subsampling_dx), &(parameters.subsampling_dy)) != 2) {\r
+       if (sscanf(m_subsampling.ToAscii(), "%d,%d", &(parameters.subsampling_dx), &(parameters.subsampling_dy)) != 2) {\r
                wxLogError(wxT("Wrong sub-sampling encoder setting: dx,dy"));\r
                return false;\r
        }\r
 \r
        /* compression rates */\r
        if (m_rates != wxT("")) {\r
-               char *s1 = (char *) m_rates.c_str();\r
-               wxLogMessage("rates %s", s1);\r
+               const char *s1 = m_rates.ToAscii();\r
+               wxLogMessage(wxT("rates %s"), s1);\r
                while (sscanf(s1, "%f", &(parameters.tcp_rates[parameters.tcp_numlayers])) == 1) {\r
                        parameters.tcp_numlayers++;\r
                        while (*s1 && *s1 != ',') {\r
@@ -279,14 +279,14 @@ bool wxJ2KHandler::SaveFile( wxImage *wimage, wxOutputStream& stream, bool verbo
                                break;\r
                        s1++;\r
                }\r
-               wxLogMessage("%d layers", parameters.tcp_numlayers);\r
+               wxLogMessage(wxT("%d layers"), parameters.tcp_numlayers);\r
                parameters.cp_disto_alloc = 1;\r
        }\r
 \r
        /* image quality, dB */\r
        if (m_rates == wxT("")) {\r
-               char *s2 = (char *) m_quality.c_str();\r
-               wxLogMessage("qualities %s", s2);\r
+               const char *s2 = m_quality.ToAscii();\r
+               wxLogMessage(wxT("qualities %s"), s2);\r
                while (sscanf(s2, "%f", &parameters.tcp_distoratio[parameters.tcp_numlayers]) == 1) {\r
                        parameters.tcp_numlayers++;\r
                        while (*s2 && *s2 != ',') {\r
@@ -296,21 +296,21 @@ bool wxJ2KHandler::SaveFile( wxImage *wimage, wxOutputStream& stream, bool verbo
                                break;\r
                        s2++;\r
                }\r
-               wxLogMessage("%d layers", parameters.tcp_numlayers);\r
+               wxLogMessage(wxT("%d layers"), parameters.tcp_numlayers);\r
                parameters.cp_fixed_quality = 1;\r
        }\r
 \r
        /* image origin */\r
-       if (sscanf(m_origin.c_str(), "%d,%d", &parameters.image_offset_x0, &parameters.image_offset_y0) != 2) {\r
+       if (sscanf(m_origin.ToAscii(), "%d,%d", &parameters.image_offset_x0, &parameters.image_offset_y0) != 2) {\r
                wxLogError(wxT("bad coordinate of the image origin: x0,y0"));\r
                return false;\r
        }\r
                                \r
        /* Create comment for codestream */\r
        if(m_enablecomm) {\r
-               parameters.cp_comment = (char *) malloc(strlen(m_comment.c_str()) + 1);\r
+               parameters.cp_comment = (char *) malloc(strlen(m_comment.ToAscii()) + 1);\r
                if(parameters.cp_comment) {\r
-                       strcpy(parameters.cp_comment, m_comment.c_str());\r
+                       strcpy(parameters.cp_comment, m_comment.ToAscii());\r
                }\r
        } else {\r
                parameters.cp_comment = NULL;\r
@@ -318,8 +318,8 @@ bool wxJ2KHandler::SaveFile( wxImage *wimage, wxOutputStream& stream, bool verbo
 \r
        /* indexing file */\r
        if (m_enableidx) {\r
-               strncpy(indexfilename, m_index.c_str(), OPJ_PATH_LEN);\r
-               wxLogMessage("index file is %s", indexfilename);\r
+               strncpy(indexfilename, m_index.ToAscii(), OPJ_PATH_LEN);\r
+               wxLogMessage(wxT("index file is %s"), indexfilename);\r
        }\r
 \r
        /* if no rate entered, lossless by default */\r
@@ -338,9 +338,9 @@ bool wxJ2KHandler::SaveFile( wxImage *wimage, wxOutputStream& stream, bool verbo
        /* codeblocks size */\r
        if (m_cbsize != wxT("")) {\r
                int cblockw_init = 0, cblockh_init = 0;\r
-               sscanf(m_cbsize.c_str(), "%d,%d", &cblockw_init, &cblockh_init);\r
+               sscanf(m_cbsize.ToAscii(), "%d,%d", &cblockw_init, &cblockh_init);\r
                if (cblockw_init * cblockh_init > 4096 || cblockw_init > 1024 || cblockw_init < 4 || cblockh_init > 1024 || cblockh_init < 4) {\r
-                       wxLogError("!! Size of code_block error !! Restrictions:\n  width*height<=4096\n  4<=width,height<= 1024");\r
+                       wxLogError(wxT("!! Size of code_block error !! Restrictions:\n  width*height<=4096\n  4<=width,height<= 1024"));\r
                        return false;\r
                }\r
                parameters.cblockw_init = cblockw_init;\r
@@ -364,13 +364,13 @@ bool wxJ2KHandler::SaveFile( wxImage *wimage, wxOutputStream& stream, bool verbo
 \r
        /* tiles */\r
        if (m_tsize != wxT("")) {\r
-               sscanf(m_tsize.c_str(), "%d,%d", &parameters.cp_tdx, &parameters.cp_tdy);\r
+               sscanf(m_tsize.ToAscii(), "%d,%d", &parameters.cp_tdx, &parameters.cp_tdy);\r
                parameters.tile_size_on = true;\r
        }\r
 \r
        /* tile origin */\r
-       if (sscanf(m_torigin.c_str(), "%d,%d", &parameters.cp_tx0, &parameters.cp_ty0) != 2) {\r
-               wxLogError("tile offset setting error: X0,Y0");\r
+       if (sscanf(m_torigin.ToAscii(), "%d,%d", &parameters.cp_tx0, &parameters.cp_ty0) != 2) {\r
+               wxLogError(wxT("tile offset setting error: X0,Y0"));\r
                return false;\r
        }\r
 \r
@@ -443,7 +443,7 @@ bool wxJ2KHandler::SaveFile( wxImage *wimage, wxOutputStream& stream, bool verbo
        cio = opj_cio_open((opj_common_ptr)cinfo, NULL, 0);\r
 \r
        /* encode the image */\r
-       bSuccess = opj_encode(cinfo, cio, oimage, &cstr_info);\r
+       bSuccess = opj_encode_with_info(cinfo, cio, oimage, &cstr_info);\r
        if (!bSuccess) {\r
 \r
                opj_cio_close(cio);\r
@@ -526,24 +526,25 @@ bool wxJ2KHandler::DoCanRead( wxInputStream& stream )
     return hdr[0] == 0xFF && hdr[1] == 0x4F;\r
 }\r
 \r
-/**\r
-Create an index and write it to a file\r
-@param cstr_info Codestream information \r
-@param index Index filename\r
-@return Returns 0 if successful, returns 1 otherwise\r
-*/\r
+// write the index file\r
 bool wxJ2KHandler::write_index_file(opj_codestream_info_t *cstr_info, char *index) {\r
        int tileno, compno, layno, resno, precno, pack_nb, x, y;\r
        FILE *stream = NULL;\r
+       double total_disto = 0;\r
        int tilepartno;\r
 \r
+#ifdef USE_JPWL\r
+       if (!strcmp(index, JPWL_PRIVATEINDEX_NAME))\r
+               return true;\r
+#endif // USE_JPWL\r
+\r
        if (!cstr_info)         \r
                return 1;\r
 \r
        stream = fopen(index, "w");\r
        if (!stream) {\r
                fprintf(stderr, "failed to open index file [%s] for writing\n", index);\r
-               return 1;\r
+               return false;\r
        }\r
        \r
        fprintf(stream, "%d %d\n", cstr_info->image_w, cstr_info->image_h);\r
@@ -553,54 +554,70 @@ bool wxJ2KHandler::write_index_file(opj_codestream_info_t *cstr_info, char *inde
        fprintf(stream, "%d\n", cstr_info->numcomps);\r
        fprintf(stream, "%d\n", cstr_info->numlayers);\r
        fprintf(stream, "%d\n", cstr_info->numdecompos);\r
-       \r
-       for (resno = cstr_info->numdecompos; resno >= 0; resno--) {\r
+\r
+       for (resno = cstr_info->numdecompos[0]; resno >= 0; resno--) {\r
                fprintf(stream, "[%d,%d] ", \r
-                       (1 << cstr_info->tile[0].pdx[resno]), (1 << cstr_info->tile[0].pdx[resno]));    /* based on tile 0 */\r
+                       (1 << cstr_info->tile[0].pdx[resno]), (1 << cstr_info->tile[0].pdx[resno]));    /* based on tile 0 and component 0 */\r
        }\r
+\r
        fprintf(stream, "\n");\r
        fprintf(stream, "%d\n", cstr_info->main_head_start);\r
        fprintf(stream, "%d\n", cstr_info->main_head_end);\r
        fprintf(stream, "%d\n", cstr_info->codestream_size);\r
        \r
        fprintf(stream, "\nINFO ON TILES\n");\r
-       fprintf(stream, "tileno start_pos  end_hd  end_tile   nbparts\n");\r
+       fprintf(stream, "tileno start_pos  end_hd  end_tile   nbparts         disto     nbpix   disto/nbpix\n");\r
        for (tileno = 0; tileno < cstr_info->tw * cstr_info->th; tileno++) {\r
-               fprintf(stream, "%4d %9d %9d %9d %9d\n",\r
+               fprintf(stream, "%4d %9d %9d %9d %9d %9e %9d %9e\n",\r
                        cstr_info->tile[tileno].tileno,\r
                        cstr_info->tile[tileno].start_pos,\r
                        cstr_info->tile[tileno].end_header,\r
                        cstr_info->tile[tileno].end_pos,\r
-                       cstr_info->tile[tileno].num_tps);\r
+                       cstr_info->tile[tileno].num_tps,\r
+                       cstr_info->tile[tileno].distotile, cstr_info->tile[tileno].numpix,\r
+                       cstr_info->tile[tileno].distotile / cstr_info->tile[tileno].numpix);\r
        }\r
                \r
        for (tileno = 0; tileno < cstr_info->tw * cstr_info->th; tileno++) {\r
                int start_pos, end_ph_pos, end_pos;\r
+               double disto = 0;\r
+               int max_numdecompos = 0;\r
                pack_nb = 0;\r
 \r
+               for (compno = 0; compno < cstr_info->numcomps; compno++) {\r
+                       if (max_numdecompos < cstr_info->numdecompos[compno])\r
+                               max_numdecompos = cstr_info->numdecompos[compno];\r
+               }       \r
+\r
                fprintf(stream, "\nTILE %d DETAILS\n", tileno); \r
-               fprintf(stream, "part_nb tileno  num_packs  start_pos end_tph_pos   end_pos\n");\r
+               fprintf(stream, "part_nb tileno  start_pack num_packs  start_pos end_tph_pos   end_pos\n");\r
                for (tilepartno = 0; tilepartno < cstr_info->tile[tileno].num_tps; tilepartno++)\r
-                       fprintf(stream, "%4d %9d  %9d  %9d %11d %9d\n",\r
+                       fprintf(stream, "%4d %9d   %9d %9d  %9d %11d %9d\n",\r
                                tilepartno, tileno,\r
+                               cstr_info->tile[tileno].tp[tilepartno].tp_start_pack,\r
                                cstr_info->tile[tileno].tp[tilepartno].tp_numpacks,\r
                                cstr_info->tile[tileno].tp[tilepartno].tp_start_pos,\r
                                cstr_info->tile[tileno].tp[tilepartno].tp_end_header,\r
                                cstr_info->tile[tileno].tp[tilepartno].tp_end_pos\r
                                );\r
                if (cstr_info->prog == LRCP) {  /* LRCP */\r
-                       fprintf(stream, "LRCP\npack_nb tileno layno resno compno precno start_pos end_ph_pos end_pos\n");\r
+                       fprintf(stream, "LRCP\npack_nb tileno layno resno compno precno start_pos end_ph_pos end_pos disto\n");\r
 \r
                        for (layno = 0; layno < cstr_info->numlayers; layno++) {\r
-                               for (resno = 0; resno < cstr_info->numdecompos + 1; resno++) {\r
+                               for (resno = 0; resno < max_numdecompos + 1; resno++) {\r
                                        for (compno = 0; compno < cstr_info->numcomps; compno++) {\r
-                                               int prec_max = cstr_info->tile[tileno].pw[resno] * cstr_info->tile[tileno].ph[resno];\r
+                                               int prec_max;\r
+                                               if (resno > cstr_info->numdecompos[compno])\r
+                                                       break;\r
+                                               prec_max = cstr_info->tile[tileno].pw[resno] * cstr_info->tile[tileno].ph[resno];\r
                                                for (precno = 0; precno < prec_max; precno++) {\r
                                                        start_pos = cstr_info->tile[tileno].packet[pack_nb].start_pos;\r
                                                        end_ph_pos = cstr_info->tile[tileno].packet[pack_nb].end_ph_pos;\r
                                                        end_pos = cstr_info->tile[tileno].packet[pack_nb].end_pos;\r
-                                                       fprintf(stream, "%4d %6d %7d %5d %6d  %6d    %6d     %6d %7d\n",\r
-                                                               pack_nb, tileno, layno, resno, compno, precno, start_pos, end_ph_pos, end_pos);\r
+                                                       disto = cstr_info->tile[tileno].packet[pack_nb].disto;\r
+                                                       fprintf(stream, "%4d %6d %7d %5d %6d  %6d    %6d     %6d %7d %8e\n",\r
+                                                               pack_nb, tileno, layno, resno, compno, precno, start_pos, end_ph_pos, end_pos, disto);\r
+                                                       total_disto += disto;\r
                                                        pack_nb++;\r
                                                }\r
                                        }\r
@@ -609,18 +626,23 @@ bool wxJ2KHandler::write_index_file(opj_codestream_info_t *cstr_info, char *inde
                } /* LRCP */\r
                else if (cstr_info->prog == RLCP) {     /* RLCP */\r
 \r
-                       fprintf(stream, "RLCP\npack_nb tileno resno layno compno precno start_pos end_ph_pos end_pos\n");\r
+                       fprintf(stream, "RLCP\npack_nb tileno resno layno compno precno start_pos end_ph_pos end_pos disto\n");\r
 \r
-                       for (resno = 0; resno < cstr_info->numdecompos + 1; resno++) {\r
+                       for (resno = 0; resno < max_numdecompos + 1; resno++) {\r
                                for (layno = 0; layno < cstr_info->numlayers; layno++) {\r
                                        for (compno = 0; compno < cstr_info->numcomps; compno++) {\r
-                                               int prec_max = cstr_info->tile[tileno].pw[resno] * cstr_info->tile[tileno].ph[resno];\r
+                                               int prec_max; \r
+                                               if (resno > cstr_info->numdecompos[compno])\r
+                                                       break;\r
+                                               prec_max = cstr_info->tile[tileno].pw[resno] * cstr_info->tile[tileno].ph[resno];\r
                                                for (precno = 0; precno < prec_max; precno++) {\r
                                                        start_pos = cstr_info->tile[tileno].packet[pack_nb].start_pos;\r
                                                        end_ph_pos = cstr_info->tile[tileno].packet[pack_nb].end_ph_pos;\r
                                                        end_pos = cstr_info->tile[tileno].packet[pack_nb].end_pos;\r
-                                                       fprintf(stream, "%4d %6d %5d %7d %6d %6d %9d   %9d %7d\n",\r
-                                                               pack_nb, tileno, resno, layno, compno, precno, start_pos, end_ph_pos, end_pos);\r
+                                                       disto = cstr_info->tile[tileno].packet[pack_nb].disto;\r
+                                                       fprintf(stream, "%4d %6d %5d %7d %6d %6d %9d   %9d %7d %8e\n",\r
+                                                               pack_nb, tileno, resno, layno, compno, precno, start_pos, end_ph_pos, end_pos, disto);\r
+                                                       total_disto += disto;\r
                                                        pack_nb++;\r
                                                }\r
                                        }\r
@@ -629,9 +651,9 @@ bool wxJ2KHandler::write_index_file(opj_codestream_info_t *cstr_info, char *inde
                } /* RLCP */\r
                else if (cstr_info->prog == RPCL) {     /* RPCL */\r
 \r
-                       fprintf(stream, "RPCL\npack_nb tileno resno precno compno layno start_pos end_ph_pos end_pos\n"); \r
+                       fprintf(stream, "RPCL\npack_nb tileno resno precno compno layno start_pos end_ph_pos end_pos disto\n"); \r
 \r
-                       for (resno = 0; resno < cstr_info->numdecompos + 1; resno++) {\r
+                       for (resno = 0; resno < max_numdecompos + 1; resno++) {\r
                                /* I suppose components have same XRsiz, YRsiz */\r
                                int x0 = cstr_info->tile_Ox + tileno - (int)floor((float)tileno/(float)cstr_info->tw ) * cstr_info->tw * cstr_info->tile_x;\r
                                int y0 = cstr_info->tile_Ox + (int)floor( (float)tileno/(float)cstr_info->tw ) * cstr_info->tile_y;\r
@@ -639,10 +661,12 @@ bool wxJ2KHandler::write_index_file(opj_codestream_info_t *cstr_info, char *inde
                                int y1 = y0 + cstr_info->tile_y;\r
                                for (compno = 0; compno < cstr_info->numcomps; compno++) {\r
                                        int prec_max = cstr_info->tile[tileno].pw[resno] * cstr_info->tile[tileno].ph[resno];\r
+                                       if (resno > cstr_info->numdecompos[compno])\r
+                                                       break;\r
                                        for (precno = 0; precno < prec_max; precno++) {\r
                                                int pcnx = cstr_info->tile[tileno].pw[resno];\r
-                                               int pcx = (int) pow( 2, cstr_info->tile[tileno].pdx[resno] + cstr_info->numdecompos - resno );\r
-                                               int pcy = (int) pow( 2, cstr_info->tile[tileno].pdy[resno] + cstr_info->numdecompos - resno );\r
+                                               int pcx = (int) pow( 2, cstr_info->tile[tileno].pdx[resno] + cstr_info->numdecompos[compno] - resno );\r
+                                               int pcy = (int) pow( 2, cstr_info->tile[tileno].pdy[resno] + cstr_info->numdecompos[compno] - resno );\r
                                                int precno_x = precno - (int) floor( (float)precno/(float)pcnx ) * pcnx;\r
                                                int precno_y = (int) floor( (float)precno/(float)pcnx );\r
                                                for(y = y0; y < y1; y++) {                                                      \r
@@ -653,8 +677,10 @@ bool wxJ2KHandler::write_index_file(opj_codestream_info_t *cstr_info, char *inde
                                                                                        start_pos = cstr_info->tile[tileno].packet[pack_nb].start_pos;\r
                                                                                        end_ph_pos = cstr_info->tile[tileno].packet[pack_nb].end_ph_pos;\r
                                                                                        end_pos = cstr_info->tile[tileno].packet[pack_nb].end_pos;\r
-                                                                                       fprintf(stream, "%4d %6d %5d %6d %6d %7d %9d   %9d %7d\n",\r
-                                                                                               pack_nb, tileno, resno, precno, compno, layno, start_pos, end_ph_pos, end_pos); \r
+                                                                                       disto = cstr_info->tile[tileno].packet[pack_nb].disto;\r
+                                                                                       fprintf(stream, "%4d %6d %5d %6d %6d %7d %9d   %9d %7d %8e\n",\r
+                                                                                               pack_nb, tileno, resno, precno, compno, layno, start_pos, end_ph_pos, end_pos, disto); \r
+                                                                                       total_disto += disto;\r
                                                                                        pack_nb++; \r
                                                                                }\r
                                                                        }\r
@@ -672,15 +698,15 @@ bool wxJ2KHandler::write_index_file(opj_codestream_info_t *cstr_info, char *inde
                        int x1 = x0 + cstr_info->tile_x;\r
                        int y1 = y0 + cstr_info->tile_y;\r
 \r
-                       fprintf(stream, "PCRL\npack_nb tileno precno compno resno layno start_pos end_ph_pos end_pos\n"); \r
+                       fprintf(stream, "PCRL\npack_nb tileno precno compno resno layno start_pos end_ph_pos end_pos disto\n"); \r
 \r
                        for (compno = 0; compno < cstr_info->numcomps; compno++) {\r
-                               for (resno = 0; resno < cstr_info->numdecompos + 1; resno++) {\r
+                               for (resno = 0; resno < cstr_info->numdecompos[compno] + 1; resno++) {\r
                                        int prec_max = cstr_info->tile[tileno].pw[resno] * cstr_info->tile[tileno].ph[resno];\r
                                        for (precno = 0; precno < prec_max; precno++) {\r
                                                int pcnx = cstr_info->tile[tileno].pw[resno];\r
-                                               int pcx = (int) pow( 2, cstr_info->tile[tileno].pdx[resno] + cstr_info->numdecompos - resno );\r
-                                               int pcy = (int) pow( 2, cstr_info->tile[tileno].pdy[resno] + cstr_info->numdecompos - resno );\r
+                                               int pcx = (int) pow( 2, cstr_info->tile[tileno].pdx[resno] + cstr_info->numdecompos[compno] - resno );\r
+                                               int pcy = (int) pow( 2, cstr_info->tile[tileno].pdy[resno] + cstr_info->numdecompos[compno] - resno );\r
                                                int precno_x = precno - (int) floor( (float)precno/(float)pcnx ) * pcnx;\r
                                                int precno_y = (int) floor( (float)precno/(float)pcnx );\r
                                                for(y = y0; y < y1; y++) {                                                      \r
@@ -691,8 +717,10 @@ bool wxJ2KHandler::write_index_file(opj_codestream_info_t *cstr_info, char *inde
                                                                                        start_pos = cstr_info->tile[tileno].packet[pack_nb].start_pos;\r
                                                                                        end_ph_pos = cstr_info->tile[tileno].packet[pack_nb].end_ph_pos;\r
                                                                                        end_pos = cstr_info->tile[tileno].packet[pack_nb].end_pos;\r
-                                                                                       fprintf(stream, "%4d %6d %6d %6d %5d %7d %9d   %9d %7d\n",\r
-                                                                                               pack_nb, tileno, precno, compno, resno, layno, start_pos, end_ph_pos, end_pos); \r
+                                                                                       disto = cstr_info->tile[tileno].packet[pack_nb].disto;\r
+                                                                                       fprintf(stream, "%4d %6d %6d %6d %5d %7d %9d   %9d %7d %8e\n",\r
+                                                                                               pack_nb, tileno, precno, compno, resno, layno, start_pos, end_ph_pos, end_pos, disto); \r
+                                                                                       total_disto += disto;\r
                                                                                        pack_nb++; \r
                                                                                }\r
                                                                        }\r
@@ -705,7 +733,7 @@ bool wxJ2KHandler::write_index_file(opj_codestream_info_t *cstr_info, char *inde
                } /* PCRL */\r
                else {  /* CPRL */\r
 \r
-                       fprintf(stream, "CPRL\npack_nb tileno compno precno resno layno start_pos end_ph_pos end_pos\n"); \r
+                       fprintf(stream, "CPRL\npack_nb tileno compno precno resno layno start_pos end_ph_pos end_pos disto\n"); \r
 \r
                        for (compno = 0; compno < cstr_info->numcomps; compno++) {\r
                                /* I suppose components have same XRsiz, YRsiz */\r
@@ -714,12 +742,12 @@ bool wxJ2KHandler::write_index_file(opj_codestream_info_t *cstr_info, char *inde
                                int x1 = x0 + cstr_info->tile_x;\r
                                int y1 = y0 + cstr_info->tile_y;\r
                                \r
-                               for (resno = 0; resno < cstr_info->numdecompos + 1; resno++) {\r
+                               for (resno = 0; resno < cstr_info->numdecompos[compno] + 1; resno++) {\r
                                        int prec_max = cstr_info->tile[tileno].pw[resno] * cstr_info->tile[tileno].ph[resno];\r
                                        for (precno = 0; precno < prec_max; precno++) {\r
                                                int pcnx = cstr_info->tile[tileno].pw[resno];\r
-                                               int pcx = (int) pow( 2, cstr_info->tile[tileno].pdx[resno] + cstr_info->numdecompos - resno );\r
-                                               int pcy = (int) pow( 2, cstr_info->tile[tileno].pdy[resno] + cstr_info->numdecompos - resno );\r
+                                               int pcx = (int) pow( 2, cstr_info->tile[tileno].pdx[resno] + cstr_info->numdecompos[compno] - resno );\r
+                                               int pcy = (int) pow( 2, cstr_info->tile[tileno].pdy[resno] + cstr_info->numdecompos[compno] - resno );\r
                                                int precno_x = precno - (int) floor( (float)precno/(float)pcnx ) * pcnx;\r
                                                int precno_y = (int) floor( (float)precno/(float)pcnx );\r
                                                for(y = y0; y < y1; y++) {\r
@@ -730,8 +758,10 @@ bool wxJ2KHandler::write_index_file(opj_codestream_info_t *cstr_info, char *inde
                                                                                        start_pos = cstr_info->tile[tileno].packet[pack_nb].start_pos;\r
                                                                                        end_ph_pos = cstr_info->tile[tileno].packet[pack_nb].end_ph_pos;\r
                                                                                        end_pos = cstr_info->tile[tileno].packet[pack_nb].end_pos;\r
-                                                                                       fprintf(stream, "%4d %6d %6d %6d %5d %7d %9d   %9d %7d\n",\r
-                                                                                               pack_nb, tileno, compno, precno, resno, layno, start_pos, end_ph_pos, end_pos); \r
+                                                                                       disto = cstr_info->tile[tileno].packet[pack_nb].disto;\r
+                                                                                       fprintf(stream, "%4d %6d %6d %6d %5d %7d %9d   %9d %7d %8e\n",\r
+                                                                                               pack_nb, tileno, compno, precno, resno, layno, start_pos, end_ph_pos, end_pos, disto); \r
+                                                                                       total_disto += disto;\r
                                                                                        pack_nb++; \r
                                                                                }\r
                                                                        }\r
@@ -744,6 +774,13 @@ bool wxJ2KHandler::write_index_file(opj_codestream_info_t *cstr_info, char *inde
                } /* CPRL */   \r
        } /* tileno */\r
        \r
+       fprintf(stream, "%8e\n", cstr_info->D_max); /* SE max */\r
+       fprintf(stream, "%.8e\n", total_disto); /* SE totale */\r
+       fprintf(stream, "\nMARKER LIST\n");\r
+       fprintf(stream, "%d\n", cstr_info->marknum);\r
+       fprintf(stream, "type\tstart_pos    length\n");\r
+       for (x = 0; x < cstr_info->marknum; x++)\r
+               fprintf(stream, "%X\t%9d %9d\n", cstr_info->marker[x].type, cstr_info->marker[x].pos, cstr_info->marker[x].len);\r
        fclose(stream);\r
 \r
        fprintf(stderr,"Generated index file %s\n", index);\r

diff --git a/OPJViewer/source/imagj2k.h b/OPJViewer/source/imagj2k.h
index 898eeaf3e6574f7d29eaa732d1d6561f1f4895dd..be1c913927b72526c04be92a0b7f4f208d905363 100644 (file)
--- a/OPJViewer/source/imagj2k.h
+++ b/OPJViewer/source/imagj2k.h
@@ -108,9 +108,9 @@ public:
 #endif\r
 \r
 #ifdef USE_JPWL\r
-               m_comment += wxString::Format("%s with JPWL", opj_version());\r
+               m_comment += wxString::Format(wxT("%s with JPWL"), (char *) opj_version());\r
 #else\r
-               m_comment += wxString::Format("%s", opj_version());\r
+               m_comment += wxString::Format(wxT("%s"), (char *) opj_version());\r
 #endif\r
 \r
     }\r

diff --git a/OPJViewer/source/imagjp2.cpp b/OPJViewer/source/imagjp2.cpp
index 7328e8074225a037056712879d4b03e52aded821..3c61905bc97c9f391190d5e0f860926fa5153998 100644 (file)
--- a/OPJViewer/source/imagjp2.cpp
+++ b/OPJViewer/source/imagjp2.cpp
@@ -194,7 +194,7 @@ bool wxJP2Handler::LoadFile(wxImage *image, wxInputStream& stream, bool verbose,
        cio = opj_cio_open((opj_common_ptr)dinfo, src, file_length);\r
 \r
        /* decode the stream and fill the image structure */\r
-       opjimage = opj_decode(dinfo, cio, &cstr_info);\r
+       opjimage = opj_decode_with_info(dinfo, cio, &cstr_info);\r
        if (!opjimage) {\r
 #ifndef __WXGTK__ \r
                wxMutexGuiEnter();\r

diff --git a/OPJViewer/source/imagmj2.cpp b/OPJViewer/source/imagmj2.cpp
index e2862916ad5dc8922e414c572fb7b5e9fd9be20d..83ed8e1db4eb1c4b66608333999338eade611cf3 100644 (file)
--- a/OPJViewer/source/imagmj2.cpp
+++ b/OPJViewer/source/imagmj2.cpp
@@ -700,7 +700,7 @@ bool wxMJ2Handler::LoadFile(wxImage *image, wxInputStream& stream, bool verbose,
        cio = opj_cio_open((opj_common_ptr)dinfo, src, my_jPheadSIZE + jp2hboxlen + jp2cboxlen);\r
 \r
        /* decode the stream and fill the image structure */\r
-       opjimage = opj_decode(dinfo, cio, &cstr_info);\r
+       opjimage = opj_decode_with_info(dinfo, cio, &cstr_info);\r
        if (!opjimage) {\r
                wxMutexGuiEnter();\r
                wxLogError(wxT("MJ2: failed to decode image!"));\r

diff --git a/OPJViewer/source/wxj2kparser.cpp b/OPJViewer/source/wxj2kparser.cpp
index a82ecab1313c1878136b2412002d21c5e8c4b2a0..600fd65e2212ce1a80c7b9fe12275b6bc7d559c0 100644 (file)
--- a/OPJViewer/source/wxj2kparser.cpp
+++ b/OPJViewer/source/wxj2kparser.cpp
@@ -255,7 +255,8 @@ void OPJParseThread::ParseJ2KFile(wxFile *m_file, wxFileOffset offset, wxFileOff
                        wxString::FromAscii(marker_name[m]) + \r
                        wxString::Format(wxT(" (0x%04X)"), marker_val[m]),\r
                        image, imageSel,\r
-                       new OPJMarkerData(wxT("MARK"), m_tree->m_fname.GetFullPath(), offset, offset + currlen + 1)\r
+                       new OPJMarkerData(wxT("MARK") + wxString::Format(wxT(" (%d)"), marker_val[m]),\r
+                               m_tree->m_fname.GetFullPath(), offset, offset + currlen + 1)\r
                        );\r
 \r
                // append some info\r

diff --git a/jpwl/Makefile b/jpwl/Makefile
index 626b35583f16f98b070c702aa9af2b79a1c9e5ac..9dc17bff065af3ee8a98e6086e7ed91051fb0a12 100755 (executable)
--- a/jpwl/Makefile
+++ b/jpwl/Makefile
@@ -1,33 +1,92 @@
-# Makefile for the main JPWL OpenJPEG codecs: JPWL_ j2k_to_image and JPWL_image_to_j2k
-
-# General configuration variables:
-CC = gcc
-AR = ar
-
-CFLAGS = -O3 -DUSE_JPWL # -g -p -pg -DUSE_JPWL
-
-OPJ_SRCS = ../libopenjpeg/bio.c ../libopenjpeg/cio.c ../libopenjpeg/dwt.c ../libopenjpeg/event.c ../libopenjpeg/image.c ../libopenjpeg/j2k.c ../libopenjpeg/j2k_lib.c ../libopenjpeg/jp2.c ../libopenjpeg/jpt.c ../libopenjpeg/mct.c ../libopenjpeg/mqc.c ../libopenjpeg/openjpeg.c ../libopenjpeg/pi.c ../libopenjpeg/raw.c ../libopenjpeg/t1.c ../libopenjpeg/t2.c ../libopenjpeg/tcd.c ../libopenjpeg/tgt.c
-JPWL_SRCS = crc.c jpwl.c jpwl_lib.c rs.c
-
-TARGET  = openjpeg_JPWL
-STATICLIB = lib$(TARGET).a
-
-MODULES = $(OPJ_SRCS:.c=.o) $(JPWL_SRCS:.c=.o)
-
-all: JPWL_image_to_j2k JPWL_j2k_to_image
-
-.c.o:
-       $(CC) $(CFLAGS) -c $< -o $@
-
-$(STATICLIB): $(MODULES)
-       $(AR) r $@ $(MODULES)
-
-JPWL_j2k_to_image: ../codec/j2k_to_image.c $(STATICLIB)
-       gcc $(CFLAGS) ../codec/convert.c ../codec/j2k_to_image.c -o JPWL_j2k_to_image -I ../libopenjpeg/ -L . -lopenjpeg_JPWL -lm -lstdc++ 
-
-JPWL_image_to_j2k: ../codec/image_to_j2k.c $(STATICLIB)
-       gcc $(CFLAGS) ../codec/convert.c ../codec/image_to_j2k.c -o JPWL_image_to_j2k -I ../libopenjpeg/ -L . -lopenjpeg_JPWL -lm -lstdc++ 
-
-clean:
-       rm -f JPWL_j2k_to_image JPWL_image_to_j2k *.o *.a
-       cd ../libopenjpeg; rm -f *.o
+# Linux makefile for OpenJPEG + JPWL\r
+\r
+VER_MAJOR = 2\r
+VER_MINOR = 1.2.0\r
+\r
+JPWL_SRCS = ./crc.c ./jpwl.c ./jpwl_lib.c ./rs.c\r
+SRCS = ../libopenjpeg/bio.c ../libopenjpeg/cio.c ../libopenjpeg/dwt.c ../libopenjpeg/event.c ../libopenjpeg/image.c ../libopenjpeg/j2k.c ../libopenjpeg/j2k_lib.c ../libopenjpeg/jp2.c ../libopenjpeg/jpt.c ../libopenjpeg/mct.c ../libopenjpeg/mqc.c ../libopenjpeg/openjpeg.c ../libopenjpeg/pi.c ../libopenjpeg/raw.c ../libopenjpeg/t1.c ../libopenjpeg/t2.c ../libopenjpeg/tcd.c ../libopenjpeg/tgt.c $(JPWL_SRCS)\r
+INCLS = ../libopenjpeg/bio.h ../libopenjpeg/cio.h ../libopenjpeg/dwt.h ../libopenjpeg/event.h ../libopenjpeg/fix.h ../libopenjpeg/image.h ../libopenjpeg/int.h ../libopenjpeg/j2k.h ../libopenjpeg/j2k_lib.h ../libopenjpeg/jp2.h ../libopenjpeg/jpt.h ../libopenjpeg/mct.h ../libopenjpeg/mqc.h ../libopenjpeg/openjpeg.h ../libopenjpeg/pi.h ../libopenjpeg/raw.h ../libopenjpeg/t1.h ../libopenjpeg/t2.h ../libopenjpeg/tcd.h ../libopenjpeg/tgt.h ../libopenjpeg/opj_malloc.h ../libopenjpeg/opj_includes.h\r
+INCLUDE = -Ilibopenjpeg_JPWL\r
+\r
+# General configuration variables:\r
+CC = gcc\r
+AR = ar\r
+\r
+PREFIX = /usr\r
+INSTALL_LIBDIR = $(PREFIX)/lib\r
+INSTALL_INCLUDE = $(PREFIX)/include\r
+\r
+# Converts cr/lf to just lf\r
+DOS2UNIX = dos2unix\r
+\r
+COMPILERFLAGS = -O3 -fPIC\r
+LIBRARIES = -lstdc++\r
+\r
+MODULES = $(SRCS:.c=.o)\r
+CFLAGS = $(COMPILERFLAGS) $(INCLUDE) -DUSE_JPWL\r
+\r
+TARGET  = openjpeg_JPWL\r
+STATICLIB = lib$(TARGET).a\r
+SHAREDLIB = lib$(TARGET)-$(VER_MAJOR).$(VER_MINOR).so\r
+LIBNAME = lib$(TARGET).so.$(VER_MAJOR)\r
+\r
+\r
+\r
+default: all\r
+\r
+all: OpenJPEG_JPWL JPWL_image_to_j2k JPWL_j2k_to_image\r
+\r
+dist: OpenJPEG_JPWL\r
+        install -d dist\r
+        install -m 644 $(STATICLIB) dist\r
+        install -m 755 $(SHAREDLIB) dist\r
+        ln -sf $(SHAREDLIB) dist/$(LIBNAME)\r
+        install libopenjpeg/openjpeg.h dist\r
+\r
+dos2unix:\r
+        @$(DOS2UNIX) $(SRCS) $(INCLS)\r
+\r
+OpenJPEG_JPWL: $(STATICLIB) $(SHAREDLIB)\r
+\r
+JPWL_codec: JPWL_j2k_to_image JPWL_image_to_j2k $(STATICLIB)\r
+\r
+.c.o:\r
+        $(CC) $(CFLAGS) -c $< -o $@\r
+\r
+$(STATICLIB): $(MODULES)\r
+        $(AR) r $@ $(MODULES)\r
+\r
+$(SHAREDLIB): $(MODULES)\r
+        $(CC) -s -shared -Wl,-soname,$(LIBNAME) -o $@ $(MODULES) $(LIBRARIES)\r
+\r
+JPWL_j2k_to_image: ../codec/j2k_to_image.c\r
+        gcc $(CFLAGS) ../codec/convert.c ../codec/j2k_to_image.c -o JPWL_j2k_to_image -I ../libopenjpeg/ -L . -lopenjpeg_JPWL -lm -ltiff\r
+\r
+JPWL_image_to_j2k: ../codec/image_to_j2k.c\r
+        gcc $(CFLAGS) ../codec/convert.c ../codec/image_to_j2k.c -o JPWL_image_to_j2k -I ../libopenjpeg/ -L . -lopenjpeg_JPWL -lm -ltiff\r
+\r
+install: OpenJPEG\r
+        install -d '$(DESTDIR)$(INSTALL_LIBDIR)' '$(DESTDIR)$(INSTALL_INCLUDE)'\r
+        install -m 644 -o root -g root $(STATICLIB) '$(DESTDIR)$(INSTALL_LIBDIR)'\r
+        ranlib '$(DESTDIR)$(INSTALL_LIBDIR)/$(STATICLIB)'\r
+        install -m 755 -o root -g root $(SHAREDLIB) '$(DESTDIR)$(INSTALL_LIBDIR)'\r
+        ln -sf $(SHAREDLIB) '$(DESTDIR)$(INSTALL_LIBDIR)/$(LIBNAME)'\r
+        install -m 644 -o root -g root libopenjpeg/openjpeg.h '$(DESTDIR)$(INSTALL_INCLUDE)'\r
+        -ldconfig\r
+\r
+cleanlib:\r
+        rm -rf core dist/ u2dtmp* $(MODULES) $(STATICLIB) $(SHAREDLIB) $(LIBNAME)\r
+\r
+cleancodec:\r
+        rm -f JPWL_j2k_to_image JPWL_image_to_j2k JPWL_j2k_to_image.o JPWL_image_to_j2k.o\r
+\r
+clean: cleanlib cleancodec\r
+\r
+osx:\r
+        make -f Makefile.osx\r
+\r
+osxinstall:\r
+        make -f Makefile.osx install\r
+\r
+osxclean:\r
+        make -f Makefile.osx clean\r