move KK definition from rs.h to rs.c to prevent duplicate symbol error when building...

diff --git a/CHANGES b/CHANGES
index 54e7628fa674b1ab5be159ef0c0389f18b353d1f..f83432e36228d4ed158b6acba81d6a1a008adc78 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -5,7 +5,10 @@ What's New for OpenJPEG
 ! : changed
 + : added
 
-January 18, 2001
+January 23, 2011
+* [antonin] move 'KK' definition from rs.h to rs.c to prevent duplicate symbol error when building jpwl with autotools.
+
+January 18, 2011
 ! [rdieter] cmake: SOVERSION change to 1 (from 1.4) to match auto-tools
 
 January 17, 2011

diff --git a/jpwl/rs.c b/jpwl/rs.c
index 419f0836548c41b8d8b728c55bacce09ad7eb458..d699bee53e0e86d22073d6b90b5ae2fb5370df42 100644 (file)
--- a/jpwl/rs.c
+++ b/jpwl/rs.c
@@ -73,6 +73,9 @@
  */
 typedef int gf;
 
+/* KK = number of information symbols */
+static int     KK;
+
 /* Primitive polynomials - see Lin & Costello, Appendix A,
  * and  Lee & Messerschmitt, p. 453.
  */

diff --git a/jpwl/rs.h b/jpwl/rs.h
index 6d2ed59b127f66ceafe2f7507ebfa7d10909dd7e..d3c573eb67b9e81ba5e4ac78a44856dc5625e81e 100644 (file)
--- a/jpwl/rs.h
+++ b/jpwl/rs.h
@@ -55,11 +55,8 @@
  * each error counting as two erasures.
  */
 #define MM  8          /* RS code over GF(2**MM) - change to suit */
-//static int   KK;
-int    KK;
 
-/* Original code */
-/*#define KK  239*/            /* KK = number of information symbols */
+/* KK defined in rs.c */
 
 #define        NN ((1 << MM) - 1)