summaryrefslogtreecommitdiff
path: root/src/bin/common
diff options
context:
space:
mode:
authorMatthieu Darbois <mayeut@users.noreply.github.com>2014-11-22 00:04:39 +0000
committerMatthieu Darbois <mayeut@users.noreply.github.com>2014-11-22 00:04:39 +0000
commit7e3844607584141d438191433c700d79ffab3b2a (patch)
tree6ac21066f7f1e09fd1abbf7441329db5868ba676 /src/bin/common
parent548aff34f4c3809bde94c8a9559ee98b5cd70f84 (diff)
[trunk] added option to force rgb output in opj_decompress (fixes issue 282 , fixes issue 286)
Diffstat (limited to 'src/bin/common')
-rw-r--r--src/bin/common/opj_getopt.c2
-rw-r--r--src/bin/common/opj_getopt.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/bin/common/opj_getopt.c b/src/bin/common/opj_getopt.c
index 100cded7..484c839d 100644
--- a/src/bin/common/opj_getopt.c
+++ b/src/bin/common/opj_getopt.c
@@ -54,7 +54,7 @@ int opj_opterr = 1, /* if error message should be printed */
static char EMSG[]={""};
/* As this class remembers its values from one Java call to the other, reset the values before each use */
-void reset_options_reading(void) {
+void opj_reset_options_reading(void) {
opj_opterr = 1;
opj_optind = 1;
}
diff --git a/src/bin/common/opj_getopt.h b/src/bin/common/opj_getopt.h
index e1f41a56..f97e8b35 100644
--- a/src/bin/common/opj_getopt.h
+++ b/src/bin/common/opj_getopt.h
@@ -24,6 +24,6 @@ extern char *opj_optarg;
extern int opj_getopt(int nargc, char *const *nargv, const char *ostr);
extern int opj_getopt_long(int argc, char * const argv[], const char *optstring,
const opj_option_t *longopts, int totlen);
-extern void reset_options_reading(void);
+extern void opj_reset_options_reading(void);
#endif /* _GETOPT_H_ */