OPJViewer should now work under Linux, at least with not big j2k files. Tested under Suse 10.1 64 bit.

This commit is contained in:
Giuseppe Baruffa
2007-03-30 09:27:08 +00:00
parent 9ba672366e
commit 7dd3a5bf22
8 changed files with 131 additions and 39 deletions

View File

@@ -85,27 +85,27 @@ void j2k_error_callback(const char *msg, void *client_data) {
int message_len = strlen(msg) - 1;
if (msg[message_len] != '\n')
message_len = MAX_MESSAGE_LEN;
wxMutexGuiEnter();
/*wxMutexGuiEnter();
wxLogMessage(wxT("[ERROR] %.*s"), message_len, msg);
wxMutexGuiLeave();
wxMutexGuiLeave();*/
}
/* sample warning callback expecting a FILE* client object */
void j2k_warning_callback(const char *msg, void *client_data) {
int message_len = strlen(msg) - 1;
if (msg[message_len] != '\n')
message_len = MAX_MESSAGE_LEN;
wxMutexGuiEnter();
/*wxMutexGuiEnter();
wxLogMessage(wxT("[WARNING] %.*s"), message_len, msg);
wxMutexGuiLeave();
wxMutexGuiLeave();*/
}
/* sample debug callback expecting no client object */
void j2k_info_callback(const char *msg, void *client_data) {
int message_len = strlen(msg) - 1;
if (msg[message_len] != '\n')
message_len = MAX_MESSAGE_LEN;
wxMutexGuiEnter();
/*wxMutexGuiEnter();
wxLogMessage(wxT("[INFO] %.*s"), message_len, msg);
wxMutexGuiLeave();
wxMutexGuiLeave();*/
}
// load the j2k codestream
@@ -126,6 +126,7 @@ bool wxJ2KHandler::LoadFile(wxImage *image, wxInputStream& stream, bool verbose,
opj_dinfo_t* dinfo = NULL;
opj_cio_t *cio = NULL;
/* configure the event callbacks (not required) */
memset(&event_mgr, 0, sizeof(opj_event_mgr_t));
event_mgr.error_handler = j2k_error_callback;