diff options
| author | Giuseppe Baruffa <gbaruffa@users.noreply.github.com> | 2007-03-30 09:27:08 +0000 |
|---|---|---|
| committer | Giuseppe Baruffa <gbaruffa@users.noreply.github.com> | 2007-03-30 09:27:08 +0000 |
| commit | 7dd3a5bf22f149d3ea3797ab01d3d5cf206b4d31 (patch) | |
| tree | b6fb88702317ffeb5d019baabbcb58bb60a5017d /OPJViewer/source/imagj2k.cpp | |
| parent | 9ba672366e5dfc2151544b0ef9c51f1a81ae3194 (diff) | |
OPJViewer should now work under Linux, at least with not big j2k files. Tested under Suse 10.1 64 bit.
Diffstat (limited to 'OPJViewer/source/imagj2k.cpp')
| -rw-r--r-- | OPJViewer/source/imagj2k.cpp | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/OPJViewer/source/imagj2k.cpp b/OPJViewer/source/imagj2k.cpp index 4a7ed492..65f9a42b 100644 --- a/OPJViewer/source/imagj2k.cpp +++ b/OPJViewer/source/imagj2k.cpp @@ -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;
|