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

Better indentation

This commit is contained in:
Antonin Descampe 2004-08-03 14:14:44 +00:00
parent 26a630dad2
commit d116ca5d10
3 changed files with 2821 additions and 3350 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

296
codec/image_to_j2k.c
View File

@ -38,8 +38,7 @@
#endif #endif
#include "convert.h" #include "convert.h"
void void help_display()
help_display ()
{ {
printf("HELP\n----\n\n"); printf("HELP\n----\n\n");
printf("- the option -help displays the readme.txt file on screen\n\n"); printf("- the option -help displays the readme.txt file on screen\n\n");
@ -106,9 +105,11 @@ help_display ()
printf printf
("-p : progression order (-p LRCP) [LRCP, RLCP, RPCL, PCRL, CPRL] optional\n"); ("-p : progression order (-p LRCP) [LRCP, RLCP, RPCL, PCRL, CPRL] optional\n");
printf("\n"); printf("\n");
printf ("-s : subsampling factor (-s 2,2) [-s X,Y] optional\n"); printf
("-s : subsampling factor (-s 2,2) [-s X,Y] optional\n");
printf("\n"); printf("\n");
printf ("-SOP : write SOP marker before each packet optional\n"); printf
("-SOP : write SOP marker before each packet optional\n");
printf("\n"); printf("\n");
printf printf
("-EPH : write EPH marker after each header packet optional\n"); ("-EPH : write EPH marker after each header packet optional\n");
@ -162,44 +163,28 @@ help_display ()
printf("Tpacket_M '' '' '' '' '' '' ''\n"); printf("Tpacket_M '' '' '' '' '' '' ''\n");
} }
int int give_progression(char progression[4])
give_progression (char progression[4])
{ {
if (progression[0] == 'L' && progression[1] == 'R' if (progression[0] == 'L' && progression[1] == 'R'
&& progression[2] == 'C' && progression[3] == 'P') && progression[2] == 'C' && progression[3] == 'P') {
{
return 0; return 0;
} } else {
else
{
if (progression[0] == 'R' && progression[1] == 'L' if (progression[0] == 'R' && progression[1] == 'L'
&& progression[2] == 'C' && progression[3] == 'P') && progression[2] == 'C' && progression[3] == 'P') {
{
return 1; return 1;
} } else {
else
{
if (progression[0] == 'R' && progression[1] == 'P' if (progression[0] == 'R' && progression[1] == 'P'
&& progression[2] == 'C' && progression[3] == 'L') && progression[2] == 'C' && progression[3] == 'L') {
{
return 2; return 2;
} } else {
else
{
if (progression[0] == 'P' && progression[1] == 'C' if (progression[0] == 'P' && progression[1] == 'C'
&& progression[2] == 'R' && progression[3] == 'L') && progression[2] == 'R' && progression[3] == 'L') {
{
return 3; return 3;
} } else {
else
{
if (progression[0] == 'C' && progression[1] == 'P' if (progression[0] == 'C' && progression[1] == 'P'
&& progression[2] == 'R' && progression[3] == 'L') && progression[2] == 'R' && progression[3] == 'L') {
{
return 4; return 4;
} } else {
else
{
return -1; return -1;
} }
} }
@ -215,19 +200,16 @@ double dwt_norms_97[4][10] = {
{2.080, 3.865, 8.307, 17.18, 34.71, 69.59, 139.3, 278.6, 557.2} {2.080, 3.865, 8.307, 17.18, 34.71, 69.59, 139.3, 278.6, 557.2}
}; };
int int floorlog2(int a)
floorlog2 (int a)
{ {
int l; int l;
for (l = 0; a > 1; l++) for (l = 0; a > 1; l++) {
{
a >>= 1; a >>= 1;
} }
return l; return l;
} }
void void encode_stepsize(int stepsize, int numbps, int *expn, int *mant)
encode_stepsize (int stepsize, int numbps, int *expn, int *mant)
{ {
int p, n; int p, n;
p = floorlog2(stepsize) - 13; p = floorlog2(stepsize) - 13;
@ -236,13 +218,11 @@ encode_stepsize (int stepsize, int numbps, int *expn, int *mant)
*expn = numbps - p; *expn = numbps - p;
} }
void void calc_explicit_stepsizes(j2k_tccp_t * tccp, int prec)
calc_explicit_stepsizes (j2k_tccp_t * tccp, int prec)
{ {
int numbands, bandno; int numbands, bandno;
numbands = 3 * tccp->numresolutions - 2; numbands = 3 * tccp->numresolutions - 2;
for (bandno = 0; bandno < numbands; bandno++) for (bandno = 0; bandno < numbands; bandno++) {
{
double stepsize; double stepsize;
int resno, level, orient, gain; int resno, level, orient, gain;
@ -253,12 +233,9 @@ calc_explicit_stepsizes (j2k_tccp_t * tccp, int prec)
tccp->qmfbid == 0 ? 0 : (orient == tccp->qmfbid == 0 ? 0 : (orient ==
0 ? 0 : (orient == 1 0 ? 0 : (orient == 1
|| orient == 2 ? 1 : 2)); || orient == 2 ? 1 : 2));
if (tccp->qntsty == J2K_CCP_QNTSTY_NOQNT) if (tccp->qntsty == J2K_CCP_QNTSTY_NOQNT) {
{
stepsize = 1.0; stepsize = 1.0;
} } else {
else
{
double norm = dwt_norms_97[orient][level]; double norm = dwt_norms_97[orient][level];
stepsize = (1 << (gain + 1)) / norm; stepsize = (1 << (gain + 1)) / norm;
} }
@ -268,8 +245,7 @@ calc_explicit_stepsizes (j2k_tccp_t * tccp, int prec)
} }
} }
int int main(int argc, char **argv)
main (int argc, char **argv)
{ {
int len; int len;
int NumResolution, numD_min; /* NumResolution : number of resolution */ int NumResolution, numD_min; /* NumResolution : number of resolution */
@ -338,19 +314,16 @@ main (int argc, char **argv)
cp.intermed_file = 1; cp.intermed_file = 1;
while (1) while (1) {
{
int c = getopt(argc, argv, int c = getopt(argc, argv,
"i:o:r:q:f:t:n:c:b:x:p:s:d:h:P:S:E:M:R:T:C:I"); "i:o:r:q:f:t:n:c:b:x:p:s:d:h:P:S:E:M:R:T:C:I");
if (c == -1) if (c == -1)
break; break;
switch (c) switch (c) {
{
case 'i': /* IN fill */ case 'i': /* IN fill */
infile = optarg; infile = optarg;
s = optarg; s = optarg;
while (*s) while (*s) {
{
s++; s++;
} }
s--; s--;
@ -361,8 +334,7 @@ main (int argc, char **argv)
S1 = *s; S1 = *s;
if ((S1 == 'p' && S2 == 'g' && S3 == 'x') if ((S1 == 'p' && S2 == 'g' && S3 == 'x')
|| (S1 == 'P' && S2 == 'G' && S3 == 'X')) || (S1 == 'P' && S2 == 'G' && S3 == 'X')) {
{
cp.image_type = 0; cp.image_type = 0;
break; break;
} }
@ -374,15 +346,13 @@ main (int argc, char **argv)
&& S3 == 'M') && S3 == 'M')
|| (S1 == 'P' && S2 == 'P' && S3 == 'M') || (S1 == 'p' || (S1 == 'P' && S2 == 'P' && S3 == 'M') || (S1 == 'p'
&& S2 == 'p' && S2 == 'p'
&& S3 == 'm')) && S3 == 'm')) {
{
cp.image_type = 1; cp.image_type = 1;
break; break;
} }
if ((S1 == 'b' && S2 == 'm' && S3 == 'p') if ((S1 == 'b' && S2 == 'm' && S3 == 'p')
|| (S1 == 'B' && S2 == 'M' && S3 == 'P')) || (S1 == 'B' && S2 == 'M' && S3 == 'P')) {
{
cp.image_type = 2; cp.image_type = 2;
break; break;
} }
@ -394,8 +364,7 @@ main (int argc, char **argv)
/* ----------------------------------------------------- */ /* ----------------------------------------------------- */
case 'o': /* OUT fill */ case 'o': /* OUT fill */
outfile = optarg; outfile = optarg;
while (*outfile) while (*outfile) {
{
outfile++; outfile++;
} }
outfile--; outfile--;
@ -413,8 +382,7 @@ main (int argc, char **argv)
else if ((S1 == 'j' && S2 == 'p' && S3 == '2') else if ((S1 == 'j' && S2 == 'p' && S3 == '2')
|| (S1 == 'J' && S2 == 'P' && S3 == '2')) || (S1 == 'J' && S2 == 'P' && S3 == '2'))
cp.JPEG2000_format = 1; cp.JPEG2000_format = 1;
else else {
{
fprintf(stderr, fprintf(stderr,
"Unknown output format image *.%c%c%c [only *.j2k, *.jp2]!! \n", "Unknown output format image *.%c%c%c [only *.j2k, *.jp2]!! \n",
S1, S2, S3); S1, S2, S3);
@ -427,11 +395,9 @@ main (int argc, char **argv)
/* ----------------------------------------------------- */ /* ----------------------------------------------------- */
case 'r': /* rates rates/distorsion */ case 'r': /* rates rates/distorsion */
s = optarg; s = optarg;
while (sscanf (s, "%d", &tcp_init->rates[tcp_init->numlayers]) == 1) while (sscanf(s, "%d", &tcp_init->rates[tcp_init->numlayers]) == 1) {
{
tcp_init->numlayers++; tcp_init->numlayers++;
while (*s && *s != ',') while (*s && *s != ',') {
{
s++; s++;
} }
if (!*s) if (!*s)
@ -445,11 +411,9 @@ main (int argc, char **argv)
case 'q': /* add fixed_quality */ case 'q': /* add fixed_quality */
s = optarg; s = optarg;
while (sscanf(s, "%f", &tcp_init->distoratio[tcp_init->numlayers]) while (sscanf(s, "%f", &tcp_init->distoratio[tcp_init->numlayers])
== 1) == 1) {
{
tcp_init->numlayers++; tcp_init->numlayers++;
while (*s && *s != ',') while (*s && *s != ',') {
{
s++; s++;
} }
if (!*s) if (!*s)
@ -471,8 +435,7 @@ main (int argc, char **argv)
(int *) malloc(tcp_init->numlayers * NumResolution * 3 * (int *) malloc(tcp_init->numlayers * NumResolution * 3 *
sizeof(int)); sizeof(int));
s = s + 2; s = s + 2;
for (i = 0; i < tcp_init->numlayers; i++) for (i = 0; i < tcp_init->numlayers; i++) {
{
tcp_init->rates[i] = 1; tcp_init->rates[i] = 1;
sscanf(s, "%d,", &cp.matrice[i * NumResolution * 3]); sscanf(s, "%d,", &cp.matrice[i * NumResolution * 3]);
s += 2; s += 2;
@ -480,8 +443,7 @@ main (int argc, char **argv)
s++; s++;
cp.matrice[i * NumResolution * 3 + 1] = 0; cp.matrice[i * NumResolution * 3 + 1] = 0;
cp.matrice[i * NumResolution * 3 + 2] = 0; cp.matrice[i * NumResolution * 3 + 2] = 0;
for (j = 1; j < NumResolution; j++) for (j = 1; j < NumResolution; j++) {
{
sscanf(s, "%d,%d,%d", sscanf(s, "%d,%d,%d",
&cp.matrice[i * NumResolution * 3 + j * 3 + 0], &cp.matrice[i * NumResolution * 3 + j * 3 + 0],
&cp.matrice[i * NumResolution * 3 + j * 3 + 1], &cp.matrice[i * NumResolution * 3 + j * 3 + 1],
@ -511,8 +473,7 @@ main (int argc, char **argv)
/* ----------------------------------------------------- */ /* ----------------------------------------------------- */
case 'c': /* precinct dimension */ case 'c': /* precinct dimension */
s = optarg; s = optarg;
do do {
{
sep = 0; sep = 0;
sscanf(s, "[%d,%d]%c", &prcw_init[res_spec], sscanf(s, "[%d,%d]%c", &prcw_init[res_spec],
&prch_init[res_spec], &sep); &prch_init[res_spec], &sep);
@ -526,8 +487,7 @@ main (int argc, char **argv)
case 'b': /* code-block dimension */ case 'b': /* code-block dimension */
sscanf(optarg, "%d,%d", &cblockw_init, &cblockh_init); sscanf(optarg, "%d,%d", &cblockw_init, &cblockh_init);
if (cblockw_init * cblockh_init > 4096 || cblockw_init > 1024 if (cblockw_init * cblockh_init > 4096 || cblockw_init > 1024
|| cblockw_init < 4 || cblockh_init > 1024 || cblockh_init < 4) || cblockw_init < 4 || cblockh_init > 1024 || cblockh_init < 4) {
{
fprintf(stderr, fprintf(stderr,
"!! Size of code_block error (option -b) !!\n\nRestriction :\n * width*height<=4096\n * 4<=width,height<= 1024\n\n"); "!! Size of code_block error (option -b) !!\n\nRestriction :\n * width*height<=4096\n * 4<=width,height<= 1024\n\n");
return 1; return 1;
@ -541,15 +501,13 @@ main (int argc, char **argv)
/* ----------------------------------------------------- */ /* ----------------------------------------------------- */
case 'p': /* progression order */ case 'p': /* progression order */
s = optarg; s = optarg;
for (i = 0; i < 4; i++) for (i = 0; i < 4; i++) {
{
progression[i] = *s; progression[i] = *s;
s++; s++;
} }
Prog_order = give_progression(progression); Prog_order = give_progression(progression);
if (Prog_order == -1) if (Prog_order == -1) {
{
fprintf(stderr, fprintf(stderr,
"Unrecognized progression order [LRCP, RLCP, RPCL, PCRL, CPRL] !!\n"); "Unrecognized progression order [LRCP, RLCP, RPCL, PCRL, CPRL] !!\n");
return 1; return 1;
@ -557,8 +515,7 @@ main (int argc, char **argv)
break; break;
/* ----------------------------------------------------- */ /* ----------------------------------------------------- */
case 's': /* subsampling factor */ case 's': /* subsampling factor */
if (sscanf (optarg, "%d,%d", &subsampling_dx, &subsampling_dy) != 2) if (sscanf(optarg, "%d,%d", &subsampling_dx, &subsampling_dy) != 2) {
{
fprintf(stderr, fprintf(stderr,
"'-s' sub-sampling argument error ! [-s dx,dy]\n"); "'-s' sub-sampling argument error ! [-s dx,dy]\n");
return 1; return 1;
@ -566,8 +523,7 @@ main (int argc, char **argv)
break; break;
/* ----------------------------------------------------- */ /* ----------------------------------------------------- */
case 'd': /* coordonnate of the reference grid */ case 'd': /* coordonnate of the reference grid */
if (sscanf (optarg, "%d,%d", &Dim[0], &Dim[1]) != 2) if (sscanf(optarg, "%d,%d", &Dim[0], &Dim[1]) != 2) {
{
fprintf(stderr, fprintf(stderr,
"-d 'coordonnate of the reference grid' argument error !! [-d x0,y0]\n"); "-d 'coordonnate of the reference grid' argument error !! [-d x0,y0]\n");
return 1; return 1;
@ -588,13 +544,11 @@ main (int argc, char **argv)
while (sscanf(s, "T%d=%d,%d,%d,%d,%d,%s", &POC[numpocs].tile, while (sscanf(s, "T%d=%d,%d,%d,%d,%d,%s", &POC[numpocs].tile,
&POC[numpocs].resno0, &POC[numpocs].compno0, &POC[numpocs].resno0, &POC[numpocs].compno0,
&POC[numpocs].layno1, &POC[numpocs].resno1, &POC[numpocs].layno1, &POC[numpocs].resno1,
&POC[numpocs].compno1, POC[numpocs].progorder) == 7) &POC[numpocs].compno1, POC[numpocs].progorder) == 7) {
{
POC[numpocs].prg = give_progression(POC[numpocs].progorder); POC[numpocs].prg = give_progression(POC[numpocs].progorder);
/* POC[numpocs].tile; */ /* POC[numpocs].tile; */
numpocs++; numpocs++;
while (*s && *s != '/') while (*s && *s != '/') {
{
s++; s++;
} }
if (!*s) if (!*s)
@ -612,10 +566,8 @@ main (int argc, char **argv)
break; break;
/* ------------------------------------------------------ */ /* ------------------------------------------------------ */
case 'M': /* Mode switch pas tous au point !! */ case 'M': /* Mode switch pas tous au point !! */
if (sscanf (optarg, "%d", &value) == 1) if (sscanf(optarg, "%d", &value) == 1) {
{ for (i = 0; i <= 5; i++) {
for (i = 0; i <= 5; i++)
{
int cache = value & (1 << i); int cache = value & (1 << i);
if (cache) if (cache)
mode |= (1 << i); mode |= (1 << i);
@ -624,18 +576,15 @@ main (int argc, char **argv)
break; break;
/* ------------------------------------------------------ */ /* ------------------------------------------------------ */
case 'R': /* ROI */ case 'R': /* ROI */
if (sscanf (optarg, "OI:c=%d,U=%d", &ROI_compno, &ROI_shift) != 2) if (sscanf(optarg, "OI:c=%d,U=%d", &ROI_compno, &ROI_shift) != 2) {
{
fprintf(stderr, "ROI error !! [-ROI:c='compno',U='shift']\n"); fprintf(stderr, "ROI error !! [-ROI:c='compno',U='shift']\n");
return 1; return 1;
} }
break; break;
/* ------------------------------------------------------ */ /* ------------------------------------------------------ */
case 'T': /* Tile offset */ case 'T': /* Tile offset */
if (sscanf (optarg, "%d,%d", &TX0, &TY0) != 2) if (sscanf(optarg, "%d,%d", &TX0, &TY0) != 2) {
{ fprintf(stderr, "-T 'tile offset' argument error !! [-T X0,Y0]");
fprintf (stderr,
"-T 'tile offset' argument error !! [-T X0,Y0]");
return 1; return 1;
} }
break; break;
@ -658,64 +607,53 @@ main (int argc, char **argv)
/* Error messages */ /* Error messages */
/* -------------- */ /* -------------- */
if (!infile || !outfile) if (!infile || !outfile) {
{
fprintf(stderr, fprintf(stderr,
"usage: image_to_j2k -i image-file -o j2k/jp2-file (+ options)\n"); "usage: image_to_j2k -i image-file -o j2k/jp2-file (+ options)\n");
return 1; return 1;
} }
if ((cp.disto_alloc || cp.fixed_alloc || cp.fixed_quality) if ((cp.disto_alloc || cp.fixed_alloc || cp.fixed_quality)
&& (!(cp.disto_alloc ^ cp.fixed_alloc ^ cp.fixed_quality))) && (!(cp.disto_alloc ^ cp.fixed_alloc ^ cp.fixed_quality))) {
{
fprintf(stderr, fprintf(stderr,
"Error: options -r -q and -f can not be used together !!\n"); "Error: options -r -q and -f can not be used together !!\n");
return 1; return 1;
} // mod fixed_quality } // mod fixed_quality
/* if no rate entered, lossless by default */ /* if no rate entered, lossless by default */
if (tcp_init->numlayers == 0) if (tcp_init->numlayers == 0) {
{
tcp_init->rates[tcp_init->numlayers] = 0; //MOD antonin : losslessbug tcp_init->rates[tcp_init->numlayers] = 0; //MOD antonin : losslessbug
tcp_init->numlayers++; tcp_init->numlayers++;
cp.disto_alloc = 1; cp.disto_alloc = 1;
} }
if (TX0 > Dim[0] || TY0 > Dim[1]) if (TX0 > Dim[0] || TY0 > Dim[1]) {
{
fprintf(stderr, fprintf(stderr,
"Error: Tile offset dimension is unnappropriate --> TX0(%d)<=IMG_X0(%d) TYO(%d)<=IMG_Y0(%d) \n", "Error: Tile offset dimension is unnappropriate --> TX0(%d)<=IMG_X0(%d) TYO(%d)<=IMG_Y0(%d) \n",
TX0, Dim[0], TY0, Dim[1]); TX0, Dim[0], TY0, Dim[1]);
return 1; return 1;
} }
for (i = 0; i < numpocs; i++) for (i = 0; i < numpocs; i++) {
{ if (POC[i].prg == -1) {
if (POC[i].prg == -1)
{
fprintf(stderr, fprintf(stderr,
"Unrecognized progression order in option -P (POC n %d) [LRCP, RLCP, RPCL, PCRL, CPRL] !!\n", "Unrecognized progression order in option -P (POC n %d) [LRCP, RLCP, RPCL, PCRL, CPRL] !!\n",
i + 1); i + 1);
} }
} }
switch (cp.image_type) switch (cp.image_type) {
{
case 0: case 0:
if (Tile_arg) if (Tile_arg) {
{
if (!pgxtoimage if (!pgxtoimage
(infile, &img, cp.tdy, subsampling_dx, subsampling_dy, Dim, cp)) (infile, &img, cp.tdy, subsampling_dx, subsampling_dy, Dim, cp))
{ {
fprintf(stderr, "not a pgx file\n"); fprintf(stderr, "not a pgx file\n");
return 1; return 1;
} }
} } else {
else
{
if (!pgxtoimage if (!pgxtoimage
(infile, &img, -1, subsampling_dx, subsampling_dy, Dim, cp)) (infile, &img, -1, subsampling_dx, subsampling_dy, Dim, cp)) {
{
fprintf(stderr, " not a pgx file\n"); fprintf(stderr, " not a pgx file\n");
return 1; return 1;
} }
@ -723,16 +661,14 @@ main (int argc, char **argv)
break; break;
case 1: case 1:
if (!pnmtoimage (infile, &img, subsampling_dx, subsampling_dy, Dim)) if (!pnmtoimage(infile, &img, subsampling_dx, subsampling_dy, Dim)) {
{
fprintf(stderr, " not a pnm file\n"); fprintf(stderr, " not a pnm file\n");
return 1; return 1;
} }
break; break;
case 2: case 2:
if (!bmptoimage (infile, &img, subsampling_dx, subsampling_dy, Dim)) if (!bmptoimage(infile, &img, subsampling_dx, subsampling_dy, Dim)) {
{
fprintf(stderr, " not a bmp file\n"); fprintf(stderr, " not a bmp file\n");
return 1; return 1;
} }
@ -750,13 +686,10 @@ main (int argc, char **argv)
NumResolution=numD_min+1; NumResolution=numD_min+1;
} */ } */
if (Tile_arg == 1) if (Tile_arg == 1) {
{
cp.tw = int_ceildiv(img.x1 - cp.tx0, cp.tdx); cp.tw = int_ceildiv(img.x1 - cp.tx0, cp.tdx);
cp.th = int_ceildiv(img.y1 - cp.ty0, cp.tdy); cp.th = int_ceildiv(img.y1 - cp.ty0, cp.tdy);
} } else {
else
{
cp.tdx = img.x1 - cp.tx0; cp.tdx = img.x1 - cp.tx0;
cp.tdy = img.y1 - cp.ty0; cp.tdy = img.y1 - cp.ty0;
} }
@ -771,12 +704,10 @@ main (int argc, char **argv)
/* ---------------------- */ /* ---------------------- */
cp.tcps = (j2k_tcp_t *) malloc(cp.tw * cp.th * sizeof(j2k_tcp_t)); cp.tcps = (j2k_tcp_t *) malloc(cp.tw * cp.th * sizeof(j2k_tcp_t));
for (tileno = 0; tileno < cp.tw * cp.th; tileno++) for (tileno = 0; tileno < cp.tw * cp.th; tileno++) {
{
tcp = &cp.tcps[tileno]; tcp = &cp.tcps[tileno];
tcp->numlayers = tcp_init->numlayers; tcp->numlayers = tcp_init->numlayers;
for (j = 0; j < tcp->numlayers; j++) for (j = 0; j < tcp->numlayers; j++) {
{
if (cp.fixed_quality) // add fixed_quality if (cp.fixed_quality) // add fixed_quality
tcp->distoratio[j] = tcp_init->distoratio[j]; tcp->distoratio[j] = tcp_init->distoratio[j];
else else
@ -791,14 +722,11 @@ main (int argc, char **argv)
numpocs_tile = 0; numpocs_tile = 0;
tcp->POC = 0; tcp->POC = 0;
if (numpocs) if (numpocs) {
{
/* intialisation of POC */ /* intialisation of POC */
tcp->POC = 1; tcp->POC = 1;
for (i = 0; i < numpocs; i++) for (i = 0; i < numpocs; i++) {
{ if (tileno == POC[i].tile - 1 || POC[i].tile == -1) {
if (tileno == POC[i].tile - 1 || POC[i].tile == -1)
{
tcp_poc = &tcp->pocs[numpocs_tile]; tcp_poc = &tcp->pocs[numpocs_tile];
tcp_poc->resno0 = POC[numpocs_tile].resno0; tcp_poc->resno0 = POC[numpocs_tile].resno0;
tcp_poc->compno0 = POC[numpocs_tile].compno0; tcp_poc->compno0 = POC[numpocs_tile].compno0;
@ -814,8 +742,7 @@ main (int argc, char **argv)
tcp->numpocs = numpocs_tile; tcp->numpocs = numpocs_tile;
tcp->tccps = (j2k_tccp_t *) malloc(img.numcomps * sizeof(j2k_tccp_t)); tcp->tccps = (j2k_tccp_t *) malloc(img.numcomps * sizeof(j2k_tccp_t));
for (i = 0; i < img.numcomps; i++) for (i = 0; i < img.numcomps; i++) {
{
tccp = &tcp->tccps[i]; tccp = &tcp->tccps[i];
tccp->csty = CSty & 0x01; /* 0 => one precinct || 1 => custom precinct */ tccp->csty = CSty & 0x01; /* 0 => one precinct || 1 => custom precinct */
tccp->numresolutions = NumResolution; tccp->numresolutions = NumResolution;
@ -829,13 +756,10 @@ main (int argc, char **argv)
tccp->roishift = ROI_shift; tccp->roishift = ROI_shift;
else else
tccp->roishift = 0; tccp->roishift = 0;
if (CSty & J2K_CCP_CSTY_PRT) if (CSty & J2K_CCP_CSTY_PRT) {
{
int p = 0; int p = 0;
for (j = tccp->numresolutions - 1; j >= 0; j--) for (j = tccp->numresolutions - 1; j >= 0; j--) {
{ if (p < res_spec) {
if (p < res_spec)
{
if (prcw_init[p] < 1) if (prcw_init[p] < 1)
tccp->prcw[j] = 1; tccp->prcw[j] = 1;
else else
@ -845,14 +769,10 @@ main (int argc, char **argv)
tccp->prch[j] = 1; tccp->prch[j] = 1;
else else
tccp->prch[j] = int_floorlog2(prch_init[p]); tccp->prch[j] = int_floorlog2(prch_init[p]);
} } else {
else
{
int size_prcw, size_prch; int size_prcw, size_prch;
size_prcw = size_prcw = prcw_init[res_spec - 1] >> (p - (res_spec - 1));
prcw_init[res_spec - 1] >> (p - (res_spec - 1)); size_prch = prch_init[res_spec - 1] >> (p - (res_spec - 1));
size_prch =
prch_init[res_spec - 1] >> (p - (res_spec - 1));
if (size_prcw < 1) if (size_prcw < 1)
tccp->prcw[j] = 1; tccp->prcw[j] = 1;
else else
@ -866,11 +786,8 @@ main (int argc, char **argv)
/*printf("\nsize precinct pour level %d : %d,%d\n", j, /*printf("\nsize precinct pour level %d : %d,%d\n", j,
tccp->prcw[j], tccp->prch[j]); */ tccp->prcw[j], tccp->prch[j]); */
} }
} } else {
else for (j = 0; j < tccp->numresolutions; j++) {
{
for (j = 0; j < tccp->numresolutions; j++)
{
tccp->prcw[j] = 15; tccp->prcw[j] = 15;
tccp->prch[j] = 15; tccp->prch[j] = 15;
} }
@ -881,33 +798,26 @@ main (int argc, char **argv)
if (cp.JPEG2000_format == 0) if (cp.JPEG2000_format == 0) { /* J2K format output */
{ /* J2K format output */ if (cp.intermed_file == 1) { /* After the encoding of each tile, j2k_encode
if (cp.intermed_file == 1)
{ /* After the encoding of each tile, j2k_encode
stores the data in the file */ stores the data in the file */
len = j2k_encode(&img, &cp, outfile, cp.tdx * cp.tdy * 2, index); len = j2k_encode(&img, &cp, outfile, cp.tdx * cp.tdy * 2, index);
if (len == 0) if (len == 0) {
{
fprintf(stderr, "failed to encode image\n"); fprintf(stderr, "failed to encode image\n");
return 1; return 1;
} }
} } else {
else
{
outbuf = (char *) malloc(cp.tdx * cp.tdy * cp.tw * cp.th * 2); /* Allocate memory for all tiles */ outbuf = (char *) malloc(cp.tdx * cp.tdy * cp.tw * cp.th * 2); /* Allocate memory for all tiles */
cio_init(outbuf, cp.tdx * cp.tdy * cp.tw * cp.th * 2); cio_init(outbuf, cp.tdx * cp.tdy * cp.tw * cp.th * 2);
len = len =
j2k_encode(&img, &cp, outbuf, j2k_encode(&img, &cp, outbuf,
cp.tdx * cp.tdy * cp.tw * cp.th * 2, index); cp.tdx * cp.tdy * cp.tw * cp.th * 2, index);
if (len == 0) if (len == 0) {
{
fprintf(stderr, "failed to encode image\n"); fprintf(stderr, "failed to encode image\n");
return 1; return 1;
} }
f = fopen(outfile, "wb"); f = fopen(outfile, "wb");
if (!f) if (!f) {
{
fprintf(stderr, "failed to open %s for writing\n", outfile); fprintf(stderr, "failed to open %s for writing\n", outfile);
return 1; return 1;
} }
@ -915,37 +825,32 @@ main (int argc, char **argv)
free(outbuf); free(outbuf);
fclose(f); fclose(f);
} }
} } else { /* JP2 format output */
else /* JP2 format output */
{
jp2_struct_t *jp2_struct; jp2_struct_t *jp2_struct;
jp2_struct = (jp2_struct_t *) malloc(sizeof(jp2_struct_t)); jp2_struct = (jp2_struct_t *) malloc(sizeof(jp2_struct_t));
jp2_struct->image = &img; jp2_struct->image = &img;
/* Initialising the standard JP2 box content */ /* Initialising the standard JP2 box content */
/* If you wish to modify those boxes, you have to modify the jp2_struct content */ /* If you wish to modify those boxes, you have to modify the jp2_struct content */
if (jp2_init_stdjp2 (jp2_struct, &img)) if (jp2_init_stdjp2(jp2_struct, &img)) {
{
fprintf(stderr, "Error with jp2 initialization"); fprintf(stderr, "Error with jp2 initialization");
return 1; return 1;
}; };
if (cp.intermed_file == 1) if (cp.intermed_file == 1) {
{
/*For the moment, JP2 format does not use intermediary files for each tile */ /*For the moment, JP2 format does not use intermediary files for each tile */
cp.intermed_file = 0; cp.intermed_file = 0;
} }
outbuf = (char *) malloc(cp.tdx * cp.tdy * cp.tw * cp.th * 2); outbuf = (char *) malloc(cp.tdx * cp.tdy * cp.tw * cp.th * 2);
cio_init(outbuf, cp.tdx * cp.tdy * cp.tw * cp.th * 2); cio_init(outbuf, cp.tdx * cp.tdy * cp.tw * cp.th * 2);
len = jp2_encode(jp2_struct, &cp, outbuf, index); len = jp2_encode(jp2_struct, &cp, outbuf, index);
if (len == 0) if (len == 0) {
{
fprintf(stderr, "failed to encode image\n"); fprintf(stderr, "failed to encode image\n");
return 1; return 1;
} }
f = fopen(outfile, "wb"); f = fopen(outfile, "wb");
if (!f) if (!f) {
{
fprintf(stderr, "failed to open %s for writing\n", outfile); fprintf(stderr, "failed to open %s for writing\n", outfile);
return 1; return 1;
} }
@ -956,27 +861,20 @@ main (int argc, char **argv)
/* Remove the temporary files */ /* Remove the temporary files */
/* -------------------------- */ /* -------------------------- */
if (cp.image_type) if (cp.image_type) { /* PNM PGM PPM */
{ /* PNM PGM PPM */ for (i = 0; i < img.numcomps; i++) {
for (i = 0; i < img.numcomps; i++)
{
char tmp; char tmp;
sprintf(&tmp, "Compo%d", i); sprintf(&tmp, "Compo%d", i);
if (remove (&tmp) == -1) if (remove(&tmp) == -1) {
{
fprintf(stderr, "failed to kill %s file !\n", &tmp); fprintf(stderr, "failed to kill %s file !\n", &tmp);
} }
} }
} } else { /* PGX */
else for (i = 0; i < cp.th; i++) {
{ /* PGX */
for (i = 0; i < cp.th; i++)
{
char tmp; char tmp;
sprintf(&tmp, "bandtile%d", i + 1); sprintf(&tmp, "bandtile%d", i + 1);
if (remove (&tmp) == -1) if (remove(&tmp) == -1) {
{
fprintf(stderr, "failed to kill %s file !\n", &tmp); fprintf(stderr, "failed to kill %s file !\n", &tmp);
} }
} }

567
libopenjpeg/j2k.c
View File

File diff suppressed because it is too large Load Diff

630
libopenjpeg/tcd.c
View File

File diff suppressed because it is too large Load Diff