From e189679ebc28f25e1a62987e0bbeb95fd2eb80c7 Mon Sep 17 00:00:00 2001 From: Mathieu Malaterre Date: Mon, 29 Oct 2012 10:12:03 +0000 Subject: [trunk] Merge back JPIP modification into v2 This commit imports changes from openjpip.c from r2122 into openjpeg.c --- src/bin/jp2/opj_compress.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'src/bin') 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 /* <jpip_on = OPJ_TRUE; + } break; /* ------------------------------------------------------ */ -- cgit v1.2.3