Added makefile for linux build of JPWL module; added newlines at the end of JPWL files

ChangeLog

@@ -8,6 +8,7 @@ What's New for OpenJPEG
 February 23, 2007
 * [GB] Fixed a copy-and-paste type assignment error (bool instead of int) in the JPWL section of decoder parameters structure in openjpeg.h; minor type-casting in jpwl_lib.c. As a result, now OPJViewer should run correctly when built against the most current SVN trunk of LibOpenJPEG.lib
 * [FOD] Changed version number from 1.1.0 to 1.1.1 in openjpeg.h
++ [GB] Linux makefile for the JPWL module; newlines at end of JPWL files
 
 February 22, 2007
 + [FOD] Added the OPJViewer Module (/OPJViewer), developed by Giuseppe Baruffa of the university of Perugia

jpwl/Makefile

@@ -0,0 +1,33 @@
+# Makefile for the main JPWL OpenJPEG codecs: JPWL_ j2k_to_image and JPWL_image_to_j2k
+
+# General configuration variables:
+CC = gcc
+AR = ar
+
+CFLAGS = -O3 -DUSE_JPWL # -g -p -pg -DUSE_JPWL
+
+OPJ_SRCS = ../libopenjpeg/bio.c ../libopenjpeg/cio.c ../libopenjpeg/dwt.c ../libopenjpeg/event.c ../libopenjpeg/image.c ../libopenjpeg/j2k.c ../libopenjpeg/j2k_lib.c ../libopenjpeg/jp2.c ../libopenjpeg/jpt.c ../libopenjpeg/mct.c ../libopenjpeg/mqc.c ../libopenjpeg/openjpeg.c ../libopenjpeg/pi.c ../libopenjpeg/raw.c ../libopenjpeg/t1.c ../libopenjpeg/t2.c ../libopenjpeg/tcd.c ../libopenjpeg/tgt.c
+JPWL_SRCS = crc.c jpwl.c jpwl_lib.c rs.c
+
+TARGET  = openjpeg_JPWL
+STATICLIB = lib$(TARGET).a
+
+MODULES = $(OPJ_SRCS:.c=.o) $(JPWL_SRCS:.c=.o)
+
+all: JPWL_image_to_j2k JPWL_j2k_to_image
+
+.c.o:
+	$(CC) $(CFLAGS) -c $< -o $@
+
+$(STATICLIB): $(MODULES)
+	$(AR) r $@ $(MODULES)
+
+JPWL_j2k_to_image: ../codec/j2k_to_image.c $(STATICLIB)
+	gcc $(CFLAGS) ../codec/convert.c ../codec/j2k_to_image.c -o JPWL_j2k_to_image -I ../libopenjpeg/ -L . -lopenjpeg_JPWL -lm -lstdc++ 
+
+JPWL_image_to_j2k: ../codec/image_to_j2k.c $(STATICLIB)
+	gcc $(CFLAGS) ../codec/convert.c ../codec/image_to_j2k.c -o JPWL_image_to_j2k -I ../libopenjpeg/ -L . -lopenjpeg_JPWL -lm -lstdc++ 
+
+clean:
+	rm -f JPWL_j2k_to_image JPWL_image_to_j2k *.o *.a
+	cd ../libopenjpeg; rm -f *.o

jpwl/README.txt

@@ -36,7 +36,7 @@ The "jpwl" directory is already populated with a couple of Visual C++ 6.0 worksp
 2.2. Compiling the source code in Unix-like systems
 -----------------------------------------------------
 
-The code has been proven to compile under Linux and MacOS X.
+Under linux, enter the jpwl directory and type "make clean" and "make".
 
 
 3. Running the JPWL software

jpwl/crc.c

@@ -157,4 +157,4 @@ void updateCRC32(unsigned long *crc, unsigned char data) {
 	*crc = CRC32_table[(unsigned char) *crc ^ data] ^ ((*crc >> 8) & 0x00FFFFFF);
 };
 
-#endif /* USE_JPWL */
+#endif /* USE_JPWL */

jpwl/crc.h

@@ -81,4 +81,4 @@ void updateCRC32(unsigned long *, unsigned char);
 #endif /* __CRC32_HEADER__ */
 
 
-#endif /* USE_JPWL */
+#endif /* USE_JPWL */

jpwl/jpwl.c

@@ -1135,4 +1135,4 @@ bool jpwl_check_tile(opj_j2k_t *j2k, opj_tcd_t *tcd, int tileno) {
 
 /*@}*/
 
-#endif /* USE_JPWL */
+#endif /* USE_JPWL */

jpwl/jpwl.h

@@ -380,3 +380,4 @@ Computes the minimum between two integers
 #endif /* USE_JPWL */
 
 #endif /* __JPWL_H */
+

jpwl/rs.c

@@ -591,4 +591,4 @@ eras_dec_rs(dtype *data, int *eras_pos, int no_eras)
 }
 
 
-#endif /* USE_JPWL */
+#endif /* USE_JPWL */

jpwl/rs.h

@@ -107,4 +107,4 @@ Computes the minimum between two integers
 #endif /* __CRC32_HEADER__ */
 
 
-#endif /* USE_JPWL */
+#endif /* USE_JPWL */