diff options
| author | Mickael Savinaud <savmickael@users.noreply.github.com> | 2012-10-30 08:12:32 +0000 |
|---|---|---|
| committer | Mickael Savinaud <savmickael@users.noreply.github.com> | 2012-10-30 08:12:32 +0000 |
| commit | 7bf09734d767d0756be2d64676a9d827bd6843d3 (patch) | |
| tree | 7ac9647b2b8dc0302ad632cd1e01a601ebb9f2e4 | |
| parent | 853bcb3c648ca0e6c2dafd95b8f257fffd15fc85 (diff) | |
[trunk] remove old structure from testempty
| -rw-r--r-- | tests/unit/testempty1.c | 8 | ||||
| -rw-r--r-- | tests/unit/testempty2.c | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/tests/unit/testempty1.c b/tests/unit/testempty1.c index 19daa67d..110b8c6b 100644 --- a/tests/unit/testempty1.c +++ b/tests/unit/testempty1.c @@ -69,7 +69,6 @@ int main(int argc, char *argv[]) opj_image_cmptparm_t cmptparm; opj_image_t *image; - opj_event_mgr_t event_mgr; opj_codec_t* l_codec = 00; opj_bool bSuccess; FILE *f; @@ -100,9 +99,10 @@ int main(int argc, char *argv[]) } } - event_mgr.error_handler = error_callback; - event_mgr.warning_handler = warning_callback; - event_mgr.info_handler = info_callback; + /* catch events using our callbacks and give a local context */
+ opj_set_info_handler(l_codec, info_callback,00);
+ opj_set_warning_handler(l_codec, warning_callback,00);
+ opj_set_error_handler(l_codec, error_callback,00); l_codec = opj_create_compress(CODEC_J2K); opj_set_info_handler(l_codec, info_callback,00); diff --git a/tests/unit/testempty2.c b/tests/unit/testempty2.c index 3c961a89..6e317755 100644 --- a/tests/unit/testempty2.c +++ b/tests/unit/testempty2.c @@ -71,7 +71,6 @@ int main(int argc, char *argv[]) opj_image_cmptparm_t cmptparm; opj_image_t *image; - opj_event_mgr_t event_mgr; opj_codec_t* l_codec = 00; opj_bool bSuccess; FILE *f; @@ -102,9 +101,10 @@ int main(int argc, char *argv[]) } } - event_mgr.error_handler = error_callback; - event_mgr.warning_handler = warning_callback; - event_mgr.info_handler = info_callback; + /* catch events using our callbacks and give a local context */
+ opj_set_info_handler(l_codec, info_callback,00);
+ opj_set_warning_handler(l_codec, warning_callback,00);
+ opj_set_error_handler(l_codec, error_callback,00); l_codec = opj_create_compress(CODEC_J2K); opj_set_info_handler(l_codec, info_callback,00); |