walkero
/
openjpeg
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

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

This commit is contained in:
Antonin Descampe 2011-01-23 18:17:00 +00:00
parent 2514c5b550
commit 066bda52c0
3 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CHANGES
View File

@ -5,7 +5,10 @@ What's New for OpenJPEG
! : changed ! : changed
+ : added + : 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 ! [rdieter] cmake: SOVERSION change to 1 (from 1.4) to match auto-tools
January 17, 2011 January 17, 2011

3
jpwl/rs.c
View File

@ -73,6 +73,9 @@
*/ */
typedef int gf; typedef int gf;
/* KK = number of information symbols */
static int KK;
/* Primitive polynomials - see Lin & Costello, Appendix A, /* Primitive polynomials - see Lin & Costello, Appendix A,
* and Lee & Messerschmitt, p. 453. * and Lee & Messerschmitt, p. 453.
*/ */

5
jpwl/rs.h
View File

@ -55,11 +55,8 @@
* each error counting as two erasures. * each error counting as two erasures.
*/ */
#define MM 8 /* RS code over GF(2**MM) - change to suit */ #define MM 8 /* RS code over GF(2**MM) - change to suit */
//static int KK;
int KK;
/* Original code */ /* KK defined in rs.c */
/*#define KK 239*/ /* KK = number of information symbols */
#define NN ((1 << MM) - 1) #define NN ((1 << MM) - 1)