walkero
/
openjpeg
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Reformat src/bin/wx/OPJViewer/source/OPJThreads.cpp src/bin/wx/OPJViewer/source/imagjpeg2000.cpp wrapping/java/openjp2/JavaOpenJPEG.c

This commit is contained in:
Even Rouault 2017-07-26 21:04:01 +02:00
parent 94cc97c58a
commit 2be20ce7d9
3 changed files with 3660 additions and 3347 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

120
src/bin/wx/OPJViewer/source/OPJThreads.cpp
View File

@ -68,8 +68,7 @@ void OPJEncoThread::OnExit()
wxArrayThread& ethreads = wxGetApp().m_enco_threads; wxArrayThread& ethreads = wxGetApp().m_enco_threads;
ethreads.Remove(this); ethreads.Remove(this);
if (ethreads.IsEmpty() ) if (ethreads.IsEmpty()) {
{
// signal the main thread that there are no more threads left if it is // signal the main thread that there are no more threads left if it is
// waiting for us // waiting for us
if (wxGetApp().m_enco_waitingUntilAllDone) { if (wxGetApp().m_enco_waitingUntilAllDone) {
@ -91,7 +90,8 @@ void *OPJEncoThread::Entry()
WriteText(text); WriteText(text);
// set handler properties // set handler properties
wxJPEG2000Handler *jpeg2000handler = (wxJPEG2000Handler *) wxImage::FindHandler(wxBITMAP_TYPE_JPEG2000); wxJPEG2000Handler *jpeg2000handler = (wxJPEG2000Handler *) wxImage::FindHandler(
wxBITMAP_TYPE_JPEG2000);
jpeg2000handler->m_subsampling = wxGetApp().m_subsampling; jpeg2000handler->m_subsampling = wxGetApp().m_subsampling;
jpeg2000handler->m_origin = wxGetApp().m_origin; jpeg2000handler->m_origin = wxGetApp().m_origin;
jpeg2000handler->m_rates = wxGetApp().m_rates; jpeg2000handler->m_rates = wxGetApp().m_rates;
@ -114,19 +114,22 @@ void *OPJEncoThread::Entry()
jpeg2000handler->m_enableerterm = wxGetApp().m_enableerterm; jpeg2000handler->m_enableerterm = wxGetApp().m_enableerterm;
jpeg2000handler->m_enablevsc = wxGetApp().m_enablevsc; jpeg2000handler->m_enablevsc = wxGetApp().m_enablevsc;
jpeg2000handler->m_enableidx = wxGetApp().m_enableidx; jpeg2000handler->m_enableidx = wxGetApp().m_enableidx;
jpeg2000handler->m_index = m_canvas->m_savename.GetPath(wxPATH_GET_VOLUME | wxPATH_GET_SEPARATOR) + wxGetApp().m_index; jpeg2000handler->m_index = m_canvas->m_savename.GetPath(
wxPATH_GET_VOLUME | wxPATH_GET_SEPARATOR) + wxGetApp().m_index;
jpeg2000handler->m_enablecomm = wxGetApp().m_enablecomm; jpeg2000handler->m_enablecomm = wxGetApp().m_enablecomm;
jpeg2000handler->m_comment = wxGetApp().m_comment; jpeg2000handler->m_comment = wxGetApp().m_comment;
jpeg2000handler->m_enablepoc = wxGetApp().m_enablepoc; jpeg2000handler->m_enablepoc = wxGetApp().m_enablepoc;
jpeg2000handler->m_poc = wxGetApp().m_poc; jpeg2000handler->m_poc = wxGetApp().m_poc;
// save the file // save the file
if (!m_canvas->m_image100.SaveFile(m_canvas->m_savename.GetFullPath(), (wxBitmapType) wxBITMAP_TYPE_JPEG2000)) { if (!m_canvas->m_image100.SaveFile(m_canvas->m_savename.GetFullPath(),
(wxBitmapType) wxBITMAP_TYPE_JPEG2000)) {
WriteText(wxT("Can't save image")); WriteText(wxT("Can't save image"));
return NULL; return NULL;
} }
text.Printf(wxT("Enco thread %d finished"), m_canvas->m_childframe->m_winnumber); text.Printf(wxT("Enco thread %d finished"),
m_canvas->m_childframe->m_winnumber);
WriteText(text); WriteText(text);
return NULL; return NULL;
} }
@ -153,21 +156,21 @@ void OPJDecoThread::WriteText(const wxString& text)
event.SetString(msg); event.SetString(msg);
wxPostEvent(this->m_canvas->m_childframe->m_frame, event); wxPostEvent(this->m_canvas->m_childframe->m_frame, event);
/* /*
// before doing any GUI calls we must ensure that this thread is the only // before doing any GUI calls we must ensure that this thread is the only
// one doing it! // one doing it!
#ifndef __WXGTK__ #ifndef __WXGTK__
wxMutexGuiEnter(); wxMutexGuiEnter();
#endif // __WXGTK__ #endif // __WXGTK__
msg << text; msg << text;
m_canvas->WriteText(msg); m_canvas->WriteText(msg);
#ifndef __WXGTK__ #ifndef __WXGTK__
wxMutexGuiLeave(); wxMutexGuiLeave();
#endif // __WXGTK__ #endif // __WXGTK__
*/ */
} }
void OPJDecoThread::OnExit() void OPJDecoThread::OnExit()
@ -177,8 +180,7 @@ void OPJDecoThread::OnExit()
wxArrayThread& dthreads = wxGetApp().m_deco_threads; wxArrayThread& dthreads = wxGetApp().m_deco_threads;
dthreads.Remove(this); dthreads.Remove(this);
if (dthreads.IsEmpty() ) if (dthreads.IsEmpty()) {
{
// signal the main thread that there are no more threads left if it is // signal the main thread that there are no more threads left if it is
// waiting for us // waiting for us
if (wxGetApp().m_deco_waitingUntilAllDone) { if (wxGetApp().m_deco_waitingUntilAllDone) {
@ -211,7 +213,8 @@ void *OPJDecoThread::Entry()
WriteText(m_canvas->m_fname.GetFullPath()); WriteText(m_canvas->m_fname.GetFullPath());
// set handler properties // set handler properties
wxJPEG2000Handler *jpeg2000handler = (wxJPEG2000Handler *) wxImage::FindHandler(wxBITMAP_TYPE_JPEG2000); wxJPEG2000Handler *jpeg2000handler = (wxJPEG2000Handler *) wxImage::FindHandler(
wxBITMAP_TYPE_JPEG2000);
jpeg2000handler->m_reducefactor = wxGetApp().m_reducefactor; jpeg2000handler->m_reducefactor = wxGetApp().m_reducefactor;
jpeg2000handler->m_qualitylayers = wxGetApp().m_qualitylayers; jpeg2000handler->m_qualitylayers = wxGetApp().m_qualitylayers;
jpeg2000handler->m_components = wxGetApp().m_components; jpeg2000handler->m_components = wxGetApp().m_components;
@ -223,7 +226,8 @@ void *OPJDecoThread::Entry()
#endif // USE_JPWL #endif // USE_JPWL
#ifdef USE_MXF #ifdef USE_MXF
wxMXFHandler *mxfffhandler = (wxMXFHandler *) wxImage::FindHandler(wxBITMAP_TYPE_MXF); wxMXFHandler *mxfffhandler = (wxMXFHandler *) wxImage::FindHandler(
wxBITMAP_TYPE_MXF);
mxfffhandler->m_reducefactor = wxGetApp().m_reducefactor; mxfffhandler->m_reducefactor = wxGetApp().m_reducefactor;
mxfffhandler->m_qualitylayers = wxGetApp().m_qualitylayers; mxfffhandler->m_qualitylayers = wxGetApp().m_qualitylayers;
mxfffhandler->m_components = wxGetApp().m_components; mxfffhandler->m_components = wxGetApp().m_components;
@ -281,7 +285,8 @@ void *OPJDecoThread::Entry()
//m_canvas->SetScrollbars(20, 20, (int)(0.5 + (double) image.GetWidth() / 20.0), (int)(0.5 + (double) image.GetHeight() / 20.0)); //m_canvas->SetScrollbars(20, 20, (int)(0.5 + (double) image.GetWidth() / 20.0), (int)(0.5 + (double) image.GetHeight() / 20.0));
//text.Printf(wxT("Deco thread 0x%lx finished."), GetId()); //text.Printf(wxT("Deco thread 0x%lx finished."), GetId());
text.Printf(wxT("Deco thread %d finished"), m_canvas->m_childframe->m_winnumber); text.Printf(wxT("Deco thread %d finished"),
m_canvas->m_childframe->m_winnumber);
WriteText(text); WriteText(text);
return NULL; return NULL;
@ -310,19 +315,19 @@ void OPJParseThread::WriteText(const wxString& text)
event.SetString(msg); event.SetString(msg);
wxPostEvent(this->m_tree->m_childframe->m_frame, event); wxPostEvent(this->m_tree->m_childframe->m_frame, event);
/* // before doing any GUI calls we must ensure that this thread is the only /* // before doing any GUI calls we must ensure that this thread is the only
// one doing it! // one doing it!
#ifndef __WXGTK__ #ifndef __WXGTK__
wxMutexGuiEnter(); wxMutexGuiEnter();
#endif // __WXGTK #endif // __WXGTK
msg << text; msg << text;
m_tree->WriteText(msg); m_tree->WriteText(msg);
#ifndef __WXGTK__ #ifndef __WXGTK__
wxMutexGuiLeave(); wxMutexGuiLeave();
#endif // __WXGTK*/ #endif // __WXGTK*/
} }
void OPJParseThread::OnExit() void OPJParseThread::OnExit()
@ -393,7 +398,7 @@ void *OPJParseThread::Entry()
#if USE_GENERIC_TREECTRL #if USE_GENERIC_TREECTRL
BEGIN_EVENT_TABLE(OPJMarkerTree, wxGenericTreeCtrl) BEGIN_EVENT_TABLE(OPJMarkerTree, wxGenericTreeCtrl)
#else #else
BEGIN_EVENT_TABLE(OPJMarkerTree, wxTreeCtrl) BEGIN_EVENT_TABLE(OPJMarkerTree, wxTreeCtrl)
#endif #endif
/*EVT_TREE_BEGIN_DRAG(TreeTest_Ctrl, OPJMarkerTree::OnBeginDrag) /*EVT_TREE_BEGIN_DRAG(TreeTest_Ctrl, OPJMarkerTree::OnBeginDrag)
EVT_TREE_BEGIN_RDRAG(TreeTest_Ctrl, OPJMarkerTree::OnBeginRDrag) EVT_TREE_BEGIN_RDRAG(TreeTest_Ctrl, OPJMarkerTree::OnBeginRDrag)
@ -435,14 +440,16 @@ IMPLEMENT_DYNAMIC_CLASS(OPJMarkerTree, wxGenericTreeCtrl)
IMPLEMENT_DYNAMIC_CLASS(OPJMarkerTree, wxTreeCtrl) IMPLEMENT_DYNAMIC_CLASS(OPJMarkerTree, wxTreeCtrl)
#endif #endif
OPJMarkerTree::OPJMarkerTree(wxWindow *parent, OPJChildFrame *subframe, wxFileName fname, wxString name, const wxWindowID id, OPJMarkerTree::OPJMarkerTree(wxWindow *parent, OPJChildFrame *subframe,
wxFileName fname, wxString name, const wxWindowID id,
const wxPoint& pos, const wxSize& size, long style) const wxPoint& pos, const wxSize& size, long style)
: wxTreeCtrl(parent, id, pos, size, style) : wxTreeCtrl(parent, id, pos, size, style)
{ {
m_reverseSort = false; m_reverseSort = false;
m_fname = fname; m_fname = fname;
m_peektextCtrl = ((OPJFrame *) (parent->GetParent()->GetParent()))->m_textCtrlbrowse; m_peektextCtrl = ((OPJFrame *)(
parent->GetParent()->GetParent()))->m_textCtrlbrowse;
CreateImageList(); CreateImageList();
// Add some items to the tree // Add some items to the tree
@ -453,10 +460,11 @@ OPJMarkerTree::OPJMarkerTree(wxWindow *parent, OPJChildFrame *subframe, wxFileNa
new OPJMarkerData(name)); new OPJMarkerData(name));
OPJParseThread *pthread = CreateParseThread(0x00, subframe); OPJParseThread *pthread = CreateParseThread(0x00, subframe);
if (pthread->Run() != wxTHREAD_NO_ERROR) if (pthread->Run() != wxTHREAD_NO_ERROR) {
wxLogMessage(wxT("Can't start parse thread!")); wxLogMessage(wxT("Can't start parse thread!"));
else } else {
wxLogMessage(wxT("New parse thread started.")); wxLogMessage(wxT("New parse thread started."));
}
m_childframe = subframe; m_childframe = subframe;
} }
@ -467,10 +475,11 @@ void OPJMarkerTree::CreateImageList(int size)
SetImageList(NULL); SetImageList(NULL);
return; return;
} }
if (size == 0) if (size == 0) {
size = m_imageSize; size = m_imageSize;
else } else {
m_imageSize = size; m_imageSize = size;
}
// Make an image list containing small icons // Make an image list containing small icons
wxImageList *images = new wxImageList(size, size, true); wxImageList *images = new wxImageList(size, size, true);
@ -499,7 +508,7 @@ void OPJMarkerTree::CreateImageList(int size)
#if USE_GENERIC_TREECTRL || !defined(__WXMSW__) #if USE_GENERIC_TREECTRL || !defined(__WXMSW__)
void OPJMarkerTree::CreateButtonsImageList(int size) void OPJMarkerTree::CreateButtonsImageList(int size)
{ {
if ( size == -1 ) { if (size == -1) {
SetButtonsImageList(NULL); SetButtonsImageList(NULL);
return; return;
} }
@ -515,9 +524,9 @@ void OPJMarkerTree::CreateButtonsImageList(int size)
icons[2] = wxIcon(icon5_xpm); // open icons[2] = wxIcon(icon5_xpm); // open
icons[3] = wxIcon(icon5_xpm); // open, selected icons[3] = wxIcon(icon5_xpm); // open, selected
for ( size_t i = 0; i < WXSIZEOF(icons); i++ ) { for (size_t i = 0; i < WXSIZEOF(icons); i++) {
int sizeOrig = icons[i].GetWidth(); int sizeOrig = icons[i].GetWidth();
if ( size == sizeOrig ) { if (size == sizeOrig) {
images->Add(icons[i]); images->Add(icons[i]);
} else { } else {
images->Add(wxBitmap(wxBitmap(icons[i]).ConvertToImage().Rescale(size, size))); images->Add(wxBitmap(wxBitmap(icons[i]).ConvertToImage().Rescale(size, size)));
@ -594,11 +603,13 @@ void OPJParseThread::LoadFile(wxFileName fname)
} }
// this is the root node // this is the root node
if (this->m_parentid) if (this->m_parentid) {
m_tree->SetItemText(rootid, wxT("Codestream")); m_tree->SetItemText(rootid, wxT("Codestream"));
else } else
//m_tree->SetItemText(rootid, wxString::Format(wxT("%s (%d B)"), fname.GetFullName(), m_file.Length())); //m_tree->SetItemText(rootid, wxString::Format(wxT("%s (%d B)"), fname.GetFullName(), m_file.Length()));
{
m_tree->SetItemText(rootid, fname.GetFullName()); m_tree->SetItemText(rootid, fname.GetFullName());
}
// close the file // close the file
m_file.Close(); m_file.Close();
@ -738,19 +749,22 @@ void OPJMarkerTree::LogEvent(const wxChar *name, const wxTreeEvent& event)
{ {
wxTreeItemId item = event.GetItem(); wxTreeItemId item = event.GetItem();
wxString text; wxString text;
if ( item.IsOk() ) if (item.IsOk()) {
text << wxT('"') << GetItemText(item).c_str() << wxT('"'); text << wxT('"') << GetItemText(item).c_str() << wxT('"');
else } else {
text = wxT("invalid item"); text = wxT("invalid item");
}
wxLogMessage(wxT("%s(%s)"), name, text.c_str()); wxLogMessage(wxT("%s(%s)"), name, text.c_str());
} }
OPJParseThread *OPJMarkerTree::CreateParseThread(wxTreeItemId parentid, OPJChildFrame *subframe) OPJParseThread *OPJMarkerTree::CreateParseThread(wxTreeItemId parentid,
OPJChildFrame *subframe)
{ {
OPJParseThread *pthread = new OPJParseThread(this, parentid); OPJParseThread *pthread = new OPJParseThread(this, parentid);
if (pthread->Create() != wxTHREAD_NO_ERROR) if (pthread->Create() != wxTHREAD_NO_ERROR) {
wxLogError(wxT("Can't create parse thread!")); wxLogError(wxT("Can't create parse thread!"));
}
wxCriticalSectionLocker enter(wxGetApp().m_parse_critsect); wxCriticalSectionLocker enter(wxGetApp().m_parse_critsect);
wxGetApp().m_parse_threads.Add(pthread); wxGetApp().m_parse_threads.Add(pthread);
@ -786,13 +800,15 @@ void OPJMarkerTree::OnItemExpanding(wxTreeEvent& event)
OPJMarkerData* data = (OPJMarkerData *) GetItemData(item); OPJMarkerData* data = (OPJMarkerData *) GetItemData(item);
wxString text; wxString text;
if (item.IsOk()) if (item.IsOk()) {
text << wxT('"') << GetItemText(item).c_str() << wxT('"'); text << wxT('"') << GetItemText(item).c_str() << wxT('"');
else } else {
text = wxT("invalid item"); text = wxT("invalid item");
}
if (wxStrcmp(data->GetDesc1(), wxT("INFO-CSTREAM"))) if (wxStrcmp(data->GetDesc1(), wxT("INFO-CSTREAM"))) {
return; return;
}
wxLogMessage(wxT("Expanding... (%s -> %s, %s, %d, %d)"), wxLogMessage(wxT("Expanding... (%s -> %s, %s, %d, %d)"),
text.c_str(), data->GetDesc1(), data->GetDesc2(), text.c_str(), data->GetDesc1(), data->GetDesc2(),
@ -802,11 +818,12 @@ void OPJMarkerTree::OnItemExpanding(wxTreeEvent& event)
wxTreeItemIdValue cookie; wxTreeItemIdValue cookie;
if (!GetFirstChild(item, cookie).IsOk()) { if (!GetFirstChild(item, cookie).IsOk()) {
OPJParseThread *pthread = CreateParseThread(item); OPJParseThread *pthread = CreateParseThread(item);
if (pthread->Run() != wxTHREAD_NO_ERROR) if (pthread->Run() != wxTHREAD_NO_ERROR) {
wxLogMessage(wxT("Can't start parse thread!")); wxLogMessage(wxT("Can't start parse thread!"));
else } else {
wxLogMessage(wxT("New parse thread started.")); wxLogMessage(wxT("New parse thread started."));
} }
}
} }
void OPJMarkerTree::OnSelChanged(wxTreeEvent& event) void OPJMarkerTree::OnSelChanged(wxTreeEvent& event)
@ -832,7 +849,8 @@ void OPJMarkerTree::OnSelChanged(wxTreeEvent& event)
fp->Seek(data->m_start, wxFromStart); fp->Seek(data->m_start, wxFromStart);
// read a bunch // read a bunch
int max_read = wxMin(wxFileOffset(bunch_linesize * bunch_numlines), data->m_length - data->m_start + 1); int max_read = wxMin(wxFileOffset(bunch_linesize * bunch_numlines),
data->m_length - data->m_start + 1);
if (data->m_desc == wxT("MARK (65380)")) { if (data->m_desc == wxT("MARK (65380)")) {
/*wxLogMessage(data->m_desc);*/ /*wxLogMessage(data->m_desc);*/
max_read = data->m_length - data->m_start + 1; max_read = data->m_length - data->m_start + 1;
@ -852,13 +870,15 @@ void OPJMarkerTree::OnSelChanged(wxTreeEvent& event)
// add hex browsing text // add hex browsing text
for (c = 0; c < bunch_linesize; c++) { for (c = 0; c < bunch_linesize; c++) {
if (!(c % 8)) if (!(c % 8)) {
text << wxT(" "); text << wxT(" ");
}
if (pos < max_read) { if (pos < max_read) {
text << wxString::Format(wxT("%02X "), buffer[pos]); text << wxString::Format(wxT("%02X "), buffer[pos]);
} else } else {
text << wxT(" "); text << wxT(" ");
}
pos++; pos++;
} }
@ -872,11 +892,13 @@ void OPJMarkerTree::OnSelChanged(wxTreeEvent& event)
(buffer[pre_pos] == '\t') || (buffer[pre_pos] == '\t') ||
(buffer[pre_pos] == '\0') || (buffer[pre_pos] == '\0') ||
(buffer[pre_pos] == 0x0D) || (buffer[pre_pos] == 0x0D) ||
(buffer[pre_pos] == 0x0B)) (buffer[pre_pos] == 0x0B)) {
buffer[pre_pos] = ' '; buffer[pre_pos] = ' ';
}
text << wxString::FromAscii((char) buffer[pre_pos]) << wxT("."); text << wxString::FromAscii((char) buffer[pre_pos]) << wxT(".");
} else } else {
text << wxT(" "); text << wxT(" ");
}
pre_pos++; pre_pos++;
} }
@ -1269,5 +1291,3 @@ void OPJMarkerData::ShowInfo(wxTreeCtrl *tree)
unsigned(tree->GetChildrenCount(GetId())), unsigned(tree->GetChildrenCount(GetId())),
unsigned(tree->GetChildrenCount(GetId(), false))); unsigned(tree->GetChildrenCount(GetId(), false)));
} }

622
src/bin/wx/OPJViewer/source/imagjpeg2000.cpp
View File

File diff suppressed because it is too large Load Diff

1223
wrapping/java/openjp2/JavaOpenJPEG.c
View File

File diff suppressed because it is too large Load Diff