-2016-08-16 Mathis Rosenhauer <rosenhauer@dkrz.de>
+ Include CCSDS test data with libaec. See THANKS
Better compatibility with OSX for make check
Allow Cygwin to build DLLs
+2016-08-16 Mathis Rosenhauer <rosenhauer@dkrz.de>
+
v0.3.4
Pad incomplete last line when in SZ compatibility mode
Fixed bug with zero blocks in the last RSI (reference sample
interval) when data size is not a multiple of RSIs or segments (64
- blocks) and the zero region reaches a sement boundary.
+ blocks) and the zero region reaches a segment boundary.
Vectorization improvement for Intel compiler
--- /dev/null
+Thanks to the chairman of CCSDS SLS-MHDC, Aaron Kiely, to let us
+distribute BB121B2 test data with libaec. The data files are used
+during 'make check'.
+
+The most recent version of the data is available from the CCSDS web
+site:
+
+http://cwe.ccsds.org/sls/docs/Forms/AllItems.aspx?RootFolder=%2Fsls%2Fdocs%2FSLS%2DDC%2FBB121B2TestData&
LDADD = libcheck_aec.la $(top_builddir)/src/libaec.la
check_szcomp_LDADD = $(top_builddir)/src/libsz.la
-EXTRA_DIST = sampledata.sh szcomp.sh benc.sh bdec.sh CMakeLists.txt
+EXTRA_DIST = sampledata.sh szcomp.sh benc.sh bdec.sh CMakeLists.txt data
+
szcomp.log: sampledata.log
bench: benc bdec
benc:
- $(srcdir)/benc.sh
+ $(srcdir)/benc.sh $(srcdir)/data/typical.rz
bdec:
$(srcdir)/bdec.sh
.PHONY: bench benc bdec
#!/bin/sh
set -e
+TEST_DATA=$1
AEC=../src/aec
-test_data=https://gitlab.dkrz.de/k202009/libaec/raw/master/data/typical.rz
-if [ ! -f typical.dat ]; then
- rm -f typical.rz
- type curl >/dev/null 2>&1 || {
- echo >&2 "curl not found. Please download $test_data by other means and place it in tests. Aborting."
- exit 1
- }
- curl $test_data -O || {
- echo >&2 "Could not download $test_data. Please download it by other means and place it in tests. Aborting."
- exit 1
- }
- $AEC -d -n16 -j64 -r256 -m typical.rz typical.dat
- rm -f bench.dat
-fi
if [ ! -f bench.dat ]; then
+ rm -f typical.dat
+ $AEC -d -n16 -j64 -r256 -m $TEST_DATA typical.dat
for i in $(seq 0 499);
do
cat typical.dat >> bench.dat
--- /dev/null
+ãB"\1fà\10
\ No newline at end of file
--- /dev/null
+\8d\b¡þ\ 4
\ No newline at end of file
--- /dev/null
+ìóKhäVµb\7f\80@
\ No newline at end of file
--- /dev/null
+³Í-£õ\14QE\13ü\b
\ No newline at end of file
--- /dev/null
+ïO,ÎÎçèVµ|\96FÌͶ\89þ\ 1
\ No newline at end of file
--- /dev/null
+Þ\9eY\9d\9dÏáZÖµòY6fm´\9fà
\ No newline at end of file
--- /dev/null
+\rUUUTjªªª¡ªªªª\83UUUU\ 1ªªªª\80jªªª
\ No newline at end of file
--- /dev/null
+\ 2ªªªª\85UUUU\ 5UUUU\ 2ªªªª\80UUUUP\ 5UUUU
\ No newline at end of file
--- /dev/null
+\ 1UUUUBªªªª\82ªªªª\81UUUU@*ªªª¨\ 2ªªªª\80
\ No newline at end of file
--- /dev/null
+ÿÿÿÿÀ\80\80
\ No newline at end of file
--- /dev/null
+ªªªªÕUUU@\80@
\ No newline at end of file
--- /dev/null
+Jªªªªªªª¨\b\ 1
\ No newline at end of file
--- /dev/null
+!UUUTªªªª\80@\ 1
\ No newline at end of file
#!/bin/sh
set -e
AEC=../src/aec
-CCSDS_DATA=121B2TestData
+CCSDS_DATA=${srcdir}/data/121B2TestData
ALLO=${CCSDS_DATA}/AllOptions
EXTP=${CCSDS_DATA}/ExtendedParameters
LOWE=${CCSDS_DATA}/LowEntropyOptions
-archive=121B2TestData.zip
-archive_url=http://cwe.ccsds.org/sls/docs/SLS-DC/BB121B2TestData/$archive
-if [ ! -f $archive ]; then
- type curl >/dev/null 2>&1 || {
- echo >&2 "curl not found. Please download $archive_url by other means and place it in tests.\nAborting."
- exit 1
- }
- curl $archive_url -O || {
- echo >&2 "Could not download $archive_url. Please download $archive by other means and place it in tests. Aborting."
- exit 1
- }
-fi
-type unzip >/dev/null 2>&1 || {
- echo >&2 "unzip not found. Please install unzip or unpack $archive in tests.\nAborting."
- exit 1
-}
-unzip -oq $archive
filesize () {
wc -c $1 | awk '{print $1}'
}
echo All Options
-mv -f ${ALLO}/test_P512n22.dat ${ALLO}/test_p512n22.dat
for i in 01 02 03 04
do
uf=$ALLO/test_p256n${i}.dat
#!/bin/sh
set -e
-testfile=121B2TestData/ExtendedParameters/sar32bit.dat
+testfile=${srcdir}/data/121B2TestData/ExtendedParameters/sar32bit.dat
if [ ! -f $testfile ]; then
echo "ERROR: sample data not found."
exit -1
projects / platform / upstream / libaec.git / commitdiff