minor bugs fixed (see issue 31 on googlecode - Thanks to winfried)
This commit is contained in:
parent
dea5c48227
commit
287be4e683
|
@ -1335,7 +1335,7 @@ const opj_dec_memory_marker_handler_t j2k_memory_marker_handler_tab [] =
|
||||||
{J2K_MS_MCT, J2K_DEC_STATE_MH | J2K_DEC_STATE_TPH, j2k_read_mct},
|
{J2K_MS_MCT, J2K_DEC_STATE_MH | J2K_DEC_STATE_TPH, j2k_read_mct},
|
||||||
{J2K_MS_CBD, J2K_DEC_STATE_MH , j2k_read_cbd},
|
{J2K_MS_CBD, J2K_DEC_STATE_MH , j2k_read_cbd},
|
||||||
{J2K_MS_MCC, J2K_DEC_STATE_MH | J2K_DEC_STATE_TPH, j2k_read_mcc},
|
{J2K_MS_MCC, J2K_DEC_STATE_MH | J2K_DEC_STATE_TPH, j2k_read_mcc},
|
||||||
{J2K_MS_MCO, J2K_DEC_STATE_MH | J2K_DEC_STATE_TPH, j2k_read_mco}
|
{J2K_MS_MCO, J2K_DEC_STATE_MH | J2K_DEC_STATE_TPH, j2k_read_mco},
|
||||||
#ifdef USE_JPWL
|
#ifdef USE_JPWL
|
||||||
{J2K_MS_EPC, J2K_DEC_STATE_MH | J2K_DEC_STATE_TPH, j2k_read_epc},
|
{J2K_MS_EPC, J2K_DEC_STATE_MH | J2K_DEC_STATE_TPH, j2k_read_epc},
|
||||||
{J2K_MS_EPB, J2K_DEC_STATE_MH | J2K_DEC_STATE_TPH, j2k_read_epb},
|
{J2K_MS_EPB, J2K_DEC_STATE_MH | J2K_DEC_STATE_TPH, j2k_read_epb},
|
||||||
|
|
|
@ -32,6 +32,8 @@
|
||||||
#include "stdlib.h"
|
#include "stdlib.h"
|
||||||
#ifdef WIN32
|
#ifdef WIN32
|
||||||
#include <malloc.h>
|
#include <malloc.h>
|
||||||
|
#else
|
||||||
|
#include <stdlib.h>
|
||||||
#endif
|
#endif
|
||||||
#define DA_X0 0
|
#define DA_X0 0
|
||||||
#define DA_Y0 0
|
#define DA_Y0 0
|
||||||
|
|
|
@ -34,6 +34,8 @@
|
||||||
|
|
||||||
#ifdef WIN32
|
#ifdef WIN32
|
||||||
#include "windows.h" // needed for rand() function
|
#include "windows.h" // needed for rand() function
|
||||||
|
#else
|
||||||
|
#include <stdlib.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue