[openjpeg] Upgrade to upstream 2.3.0, contributes to MER#1912.

.gitmodules

@@ -1,3 +1,3 @@
 [submodule "upstream"]
 	path = upstream
-	url = git://github.com/uclouvain/openjpeg
+	url = https://git.merproject.org/mirror/openjpeg

rpm/openjpeg-20070717svn-mqc-optimize.patch

@@ -1,31 +1,45 @@
-diff -urN -x '*.orig' -x '*.rej' -x '*~' -x '.*' OpenJPEG.orig/libopenjpeg/mqc.c OpenJPEG.patched/libopenjpeg/mqc.c
---- OpenJPEG.orig/libopenjpeg/mqc.c	2007-07-17 20:07:22.000000000 -0500
-+++ OpenJPEG.patched/libopenjpeg/mqc.c	2007-07-17 20:07:44.000000000 -0500
-@@ -507,20 +507,20 @@
+diff --git a/src/lib/openmj2/mqc.c b/src/lib/openmj2/mqc.c
+index 60d0572..c832fa6 100644
+--- a/src/lib/openmj2/mqc.c
++++ b/src/lib/openmj2/mqc.c
+@@ -595,22 +595,27 @@ void mqc_init_dec(opj_mqc_t *mqc, unsigned char *bp, int len)
 
- int mqc_decode(opj_mqc_t *mqc) {
- 	int d;
--	mqc->a -= (*mqc->curctx)->qeval;
--	if ((mqc->c >> 16) < (*mqc->curctx)->qeval) {
-+	unsigned int qeval = (*mqc->curctx)->qeval;
-+	mqc->a -= qeval;
-+	qeval <<= 16;
-+	if (mqc->c < qeval) {
- 		d = mqc_lpsexchange(mqc);
--		mqc_renormd(mqc);
- 	} else {
--		mqc->c -= (*mqc->curctx)->qeval << 16;
-+		mqc->c -= qeval;
- 		if ((mqc->a & 0x8000) == 0) {
- 			d = mqc_mpsexchange(mqc);
--			mqc_renormd(mqc);
- 		} else {
--			d = (*mqc->curctx)->mps;
-+			return (*mqc->curctx)->mps;
- 		}
- 	}
--
-+	mqc_renormd(mqc);
- 	return d;
+ int mqc_decode(opj_mqc_t *const mqc)
+ {
+-    int d;
+-    mqc->a -= (*mqc->curctx)->qeval;
+-    if ((mqc->c >> 16) < (*mqc->curctx)->qeval) {
+-        d = mqc_lpsexchange(mqc);
+-        mqc_renormd(mqc);
+-    } else {
+-        mqc->c -= (*mqc->curctx)->qeval << 16;
+-        if ((mqc->a & 0x8000) == 0) {
+-            d = mqc_mpsexchange(mqc);
+-            mqc_renormd(mqc);
+-        } else {
+-            d = (*mqc->curctx)->mps;
++    unsigned int qeval = (*mqc->curctx)->qeval;
++    mqc->a -= qeval;
++    bool tmp = (mqc->a < qeval);
++    qeval <<= 16;
++    if (mqc->c >= qeval) {
++        mqc->c -= qeval;
++        if (mqc->a & 0x8000) {
++            return (*mqc->curctx)->mps;
+         }
++    }else{
++        tmp = !tmp;
++        mqc->a = (*mqc->curctx)->qeval;
+     }
+
+-    return d;
++    opj_mqc_state_t* nmps = (*mqc->curctx)->nmps;
++    opj_mqc_state_t* nlps = (*mqc->curctx)->nlps;
++    int mps = (*mqc->curctx)->mps ^ tmp;
++    *mqc->curctx = tmp ? nlps : nmps;
++
++    mqc_renormd(mqc);
++    return mps;
  }
 
+ void mqc_resetstates(opj_mqc_t *mqc)