Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of git://github.com/TighMacFanatic/SingularityViewer

Browse Source
This commit is contained in:
Siana Gearz
2011-12-25 03:37:03 +01:00
parent 8c4a52e58d d69f00741f
commit 2f5caa27fd
3 changed files with 3 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
indra/libopenjpeg/CMakeLists.txt
View File

@@ -60,19 +60,7 @@ set(openjpeg_HEADER_FILES
)
IF(WINDOWS)
# On Visual Studio 8 MS deprecated C. This removes all 1.276E1265 security warnings
add_definitions(
-d_crt_far_mappings_no_deprecate
-d_crt_is_wctype_no_deprecate
-d_crt_managed_fp_no_deprecate
-d_crt_nonstdc_no_deprecate
-d_crt_secure_no_deprecate
-d_crt_secure_no_deprecate_globals
-d_crt_seterrormode_beep_sleep_no_deprecate
-d_crt_time_functions_no_deprecate
-d_crt_vcclrit_no_deprecate
-d_scl_secure_no_deprecate
)
add_definitions(-D_CRT_SECURE_NO_WARNINGS)
add_definitions(-DOPJ_STATIC)
ENDIF(WINDOWS)

2
indra/libopenjpeg/dwt.c
View File

@@ -527,7 +527,7 @@ static void dwt_decode_tile(opj_tcd_tilecomp_t* tilec, int numres, DWT1DFN dwt_1
int w = tilec->x1 - tilec->x0;
h.mem = opj_aligned_malloc(dwt_decode_max_resolution(tr, numres) * sizeof(int));
h.mem = (int *)opj_aligned_malloc(dwt_decode_max_resolution(tr, numres) * sizeof(int));
v.mem = h.mem;
while( --numres) {

2
indra/libopenjpeg/j2k.c
View File

@@ -236,7 +236,7 @@ static void j2k_read_unk(opj_j2k_t *j2k);
/* ----------------------------------------------------------------------- */
typedef struct j2k_prog_order{
OPJ_PROG_ORDER enum_prog;
char str_prog[4];
char str_prog[5];
}j2k_prog_order_t;
j2k_prog_order_t j2k_prog_order_list[] = {