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

diff --git a/ChangeLog b/ChangeLog
index 708859490fa9c2197f062badaed40096717bddfd..da3e97c2ee4c8d389c4db190841f8e1497bc211a 100644 (file)
--- a/ChangeLog
+++ b/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

diff --git a/jpwl/Makefile b/jpwl/Makefile
new file mode 100755 (executable)
index 0000000..626b355
--- /dev/null
+++ b/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

diff --git a/jpwl/README.txt b/jpwl/README.txt
index e3b94a22019086704d5fb52d96f137950a33a04f..66e9d5b18e21a7ac06f20ae5a826b42f77e212ef 100644 (file)
--- a/jpwl/README.txt
+++ b/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\r
 -----------------------------------------------------\r
 \r
-The code has been proven to compile under Linux and MacOS X.\r
+Under linux, enter the jpwl directory and type "make clean" and "make".\r
 \r
 \r
 3. Running the JPWL software\r

diff --git a/jpwl/crc.c b/jpwl/crc.c
index 690b45b20bd3d1db5b2ef327089beb66ce7cfafe..a54b657537f3c9d1a35bcf25cb630285ecba0178 100644 (file)
--- a/jpwl/crc.c
+++ b/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);\r
 };\r
 \r
-#endif /* USE_JPWL */
\ No newline at end of file
+#endif /* USE_JPWL */\r

diff --git a/jpwl/crc.h b/jpwl/crc.h
index 474beae8970840dfe0e9c3ae97efbacd64242f7b..2d871687aea04741c9e3c196fb02a8e2fba8df60 100644 (file)
--- a/jpwl/crc.h
+++ b/jpwl/crc.h
@@ -81,4 +81,4 @@ void updateCRC32(unsigned long *, unsigned char);
 #endif /* __CRC32_HEADER__ */
 
 
-#endif /* USE_JPWL */
\ No newline at end of file
+#endif /* USE_JPWL */

diff --git a/jpwl/jpwl.c b/jpwl/jpwl.c
index 0246100c802ed21abd02b0071cfd821b4abd9596..97937b4c826205b855b3f7cda6a784d0b3dd8a6d 100644 (file)
--- a/jpwl/jpwl.c
+++ b/jpwl/jpwl.c
@@ -1135,4 +1135,4 @@ bool jpwl_check_tile(opj_j2k_t *j2k, opj_tcd_t *tcd, int tileno) {
 \r
 /*@}*/\r
 \r
-#endif /* USE_JPWL */
\ No newline at end of file
+#endif /* USE_JPWL */\r

diff --git a/jpwl/jpwl.h b/jpwl/jpwl.h
index 8af80fdb1695a207c094ad1ad063405d5198b922..667869d48dbc30184302bc1c91d325acb5f11f44 100644 (file)
--- a/jpwl/jpwl.h
+++ b/jpwl/jpwl.h
@@ -380,3 +380,4 @@ Computes the minimum between two integers
 #endif /* USE_JPWL */
 
 #endif /* __JPWL_H */
+

diff --git a/jpwl/rs.c b/jpwl/rs.c
index bf37d4115485922f13fd356c064051b62dc59b8d..419f0836548c41b8d8b728c55bacce09ad7eb458 100644 (file)
--- a/jpwl/rs.c
+++ b/jpwl/rs.c
@@ -591,4 +591,4 @@ eras_dec_rs(dtype *data, int *eras_pos, int no_eras)
 }
 
 
-#endif /* USE_JPWL */
\ No newline at end of file
+#endif /* USE_JPWL */

diff --git a/jpwl/rs.h b/jpwl/rs.h
index 047d9c2f55887816c081f3f7af57a8b6ccb16f43..2c2149d294edda04209c580c932fd05f05b34053 100644 (file)
--- a/jpwl/rs.h
+++ b/jpwl/rs.h
@@ -107,4 +107,4 @@ Computes the minimum between two integers
 #endif /* __CRC32_HEADER__ */
 
 
-#endif /* USE_JPWL */
\ No newline at end of file
+#endif /* USE_JPWL */