walkero
/
openjpeg
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Merge with v2 branch

This commit is contained in:
Mathieu Malaterre 2010-06-22 17:32:19 +00:00
parent f30f4c744e
commit da0d29e4ab
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
codec/convert.c
View File

@ -2121,7 +2121,7 @@ int imagetoraw(opj_image_t * image, const char *outfile)
for (line = 0; line < h; line++) { for (line = 0; line < h; line++) {
for(row = 0; row < w; row++) { for(row = 0; row < w; row++) {
unsigned char temp; unsigned char temp;
curr = (signed short int) (*ptr & mask); curr = (signed short int) (*ptr & mask);
temp = (unsigned char) (curr >> 8); temp = (unsigned char) (curr >> 8);
fwrite(&temp, 1, 1, rawFile); fwrite(&temp, 1, 1, rawFile);
temp = (unsigned char) curr; temp = (unsigned char) curr;
@ -2138,7 +2138,7 @@ int imagetoraw(opj_image_t * image, const char *outfile)
for (line = 0; line < h; line++) { for (line = 0; line < h; line++) {
for(row = 0; row < w; row++) { for(row = 0; row < w; row++) {
unsigned char temp; unsigned char temp;
curr = (unsigned short int) (*ptr & mask); curr = (unsigned short int) (*ptr & mask);
temp = (unsigned char) (curr >> 8); temp = (unsigned char) (curr >> 8);
fwrite(&temp, 1, 1, rawFile); fwrite(&temp, 1, 1, rawFile);
temp = (unsigned char) curr; temp = (unsigned char) curr;

11
codec/image_to_j2k.c
View File

@ -522,6 +522,8 @@ void cinema_setup_encoder(opj_cparameters_t *parameters,opj_image_t *image, img_
} }
parameters->numpocs = initialise_4K_poc(parameters->POC,parameters->numresolution); parameters->numpocs = initialise_4K_poc(parameters->POC,parameters->numresolution);
break; break;
default :
break;
} }
switch (parameters->cp_cinema){ switch (parameters->cp_cinema){
@ -565,6 +567,8 @@ void cinema_setup_encoder(opj_cparameters_t *parameters,opj_image_t *image, img_
} }
parameters->max_comp_size = COMP_48_CS; parameters->max_comp_size = COMP_48_CS;
break; break;
default:
break;
} }
parameters->cp_disto_alloc = 1; parameters->cp_disto_alloc = 1;
} }
@ -1060,7 +1064,7 @@ int parse_cmdline_encoder(int argc, char **argv, opj_cparameters_t *parameters,
int hprot, pprot, sens, addr, size, range; int hprot, pprot, sens, addr, size, range;
/* we need to enable indexing */ /* we need to enable indexing */
if (!indexfilename || !strcmp(indexfilename, "")) { if (!indexfilename || !*indexfilename) {
strncpy(indexfilename, JPWL_PRIVATEINDEX_NAME, OPJ_PATH_LEN); strncpy(indexfilename, JPWL_PRIVATEINDEX_NAME, OPJ_PATH_LEN);
} }
@ -1128,7 +1132,7 @@ int parse_cmdline_encoder(int argc, char **argv, opj_cparameters_t *parameters,
/* search packet error protection method */ /* search packet error protection method */
if (*token == 'p') { if (*token == 'p') {
static int pack = 0, tile = 0, packspec = 0/*, lastpackno = 0*/; static int pack = 0, tile = 0, packspec = 0;
pprot = 1; /* predefined method */ pprot = 1; /* predefined method */
@ -1284,7 +1288,6 @@ int parse_cmdline_encoder(int argc, char **argv, opj_cparameters_t *parameters,
/* search addressing size */ /* search addressing size */
if (*token == 'a') { if (*token == 'a') {
/*static int tile = 0, tilespec = 0, lasttileno = 0*/;
addr = 0; /* predefined: auto */ addr = 0; /* predefined: auto */
@ -1310,7 +1313,6 @@ int parse_cmdline_encoder(int argc, char **argv, opj_cparameters_t *parameters,
/* search sensitivity size */ /* search sensitivity size */
if (*token == 'z') { if (*token == 'z') {
/*static int tile = 0, tilespec = 0, lasttileno = 0;*/
size = 1; /* predefined: 1 byte */ size = 1; /* predefined: 1 byte */
@ -1336,7 +1338,6 @@ int parse_cmdline_encoder(int argc, char **argv, opj_cparameters_t *parameters,
/* search range method */ /* search range method */
if (*token == 'g') { if (*token == 'g') {
/*static int tile = 0, tilespec = 0, lasttileno = 0;*/
range = 0; /* predefined: 0 (packet) */ range = 0; /* predefined: 0 (packet) */