summaryrefslogtreecommitdiff
path: root/src/bin
diff options
context:
space:
mode:
authorMathieu Malaterre <mathieu.malaterre@gmail.com>2012-10-29 10:12:03 +0000
committerMathieu Malaterre <mathieu.malaterre@gmail.com>2012-10-29 10:12:03 +0000
commite189679ebc28f25e1a62987e0bbeb95fd2eb80c7 (patch)
treef9bd169a1cdc0f254cf24dde5efe21e3d00daf98 /src/bin
parent18e7fcc37f8d3585f015755c81769852526aedcc (diff)
[trunk] Merge back JPIP modification into v2
This commit imports changes from openjpip.c from r2122 into openjpeg.c
Diffstat (limited to 'src/bin')
-rw-r--r--src/bin/jp2/opj_compress.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/bin/jp2/opj_compress.c b/src/bin/jp2/opj_compress.c
index 1824c03e..d5736c1e 100644
--- a/src/bin/jp2/opj_compress.c
+++ b/src/bin/jp2/opj_compress.c
@@ -597,7 +597,7 @@ static int parse_cmdline_encoder(int argc, char **argv, opj_cparameters_t *param
};
/* parse the command line */
- const char optlist[] = "i:o:r:q:n:b:c:t:p:s:SEM:x:R:d:T:If:P:C:F:u:"
+ const char optlist[] = "i:o:r:q:n:b:c:t:p:s:SEM:x:R:d:T:If:P:C:F:u:J"
#ifdef USE_JPWL
"W:"
#endif /* USE_JPWL */
@@ -1449,6 +1449,10 @@ static int parse_cmdline_encoder(int argc, char **argv, opj_cparameters_t *param
/* <<UniPG */
/* ------------------------------------------------------ */
+ case 'J': /* jpip on */
+ {
+ parameters->jpip_on = OPJ_TRUE;
+ }
break;
/* ------------------------------------------------------ */