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

2011-01-23 18:17:00 +00:00 · 2011-01-23 18:17:00 +00:00 · 066bda52c0
parent 2514c5b550
commit 066bda52c0
3 changed files with 8 additions and 5 deletions
--- a/5
+++ b/5
@ -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
--- 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.
 */
--- 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)