diff options
author | Magnus Lundborg <lundborg.magnus@gmail.com> | 2013-11-04 13:41:42 (GMT) |
---|---|---|
committer | Magnus Lundborg <lundborg.magnus@gmail.com> | 2013-11-04 13:41:42 (GMT) |
commit | 65443992d81a8845ba3597620d84e8652e83a254 (patch) | |
tree | f1a1c084c156210925d8009138a070d1cfb75366 /include/compression | |
parent | 0f1d005a2a7123f4077dbe3ff446ced8f240f1f8 (diff) |
Changed from LGPL 2.1 license to the Revised BSD license.
Diffstat (limited to 'include/compression')
-rw-r--r-- | include/compression/bwlzh.h | 6 | ||||
-rw-r--r-- | include/compression/bwt.h | 4 | ||||
-rw-r--r-- | include/compression/coder.h | 4 | ||||
-rw-r--r-- | include/compression/dict.h | 4 | ||||
-rw-r--r-- | include/compression/fixpoint.h | 4 | ||||
-rw-r--r-- | include/compression/huffman.h | 4 | ||||
-rw-r--r-- | include/compression/lz77.h | 4 | ||||
-rw-r--r-- | include/compression/merge_sort.h | 4 | ||||
-rw-r--r-- | include/compression/mtf.h | 4 | ||||
-rw-r--r-- | include/compression/my64bit.h | 4 | ||||
-rw-r--r-- | include/compression/rle.h | 6 | ||||
-rw-r--r-- | include/compression/tng_compress.h | 30 | ||||
-rw-r--r-- | include/compression/vals16.h | 4 | ||||
-rw-r--r-- | include/compression/warnmalloc.h | 4 | ||||
-rw-r--r-- | include/compression/widemuldiv.h | 4 |
15 files changed, 30 insertions, 60 deletions
diff --git a/include/compression/bwlzh.h b/include/compression/bwlzh.h index 3e58d2d..70d586a 100644 --- a/include/compression/bwlzh.h +++ b/include/compression/bwlzh.h @@ -5,9 +5,7 @@ * * * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public License - * as published by the Free Software Foundation; either version 2.1 - * of the License, or (at your option) any later version. + * modify it under the terms of the Revised BSD License. */ @@ -32,7 +30,7 @@ void DECLSPECDLLEXPORT bwlzh_decompress(unsigned char *input, int nvals, /* The routines below are mostly useful for testing, and for internal - use by the library. */ + use by the library. */ void DECLSPECDLLEXPORT bwlzh_compress_verbose(unsigned int *vals, int nvals, unsigned char *output, int *output_len); diff --git a/include/compression/bwt.h b/include/compression/bwt.h index e95f7ee..9f927f8 100644 --- a/include/compression/bwt.h +++ b/include/compression/bwt.h @@ -5,9 +5,7 @@ * * * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public License - * as published by the Free Software Foundation; either version 2.1 - * of the License, or (at your option) any later version. + * modify it under the terms of the Revised BSD License. */ diff --git a/include/compression/coder.h b/include/compression/coder.h index 570bc6d..34b56c1 100644 --- a/include/compression/coder.h +++ b/include/compression/coder.h @@ -5,9 +5,7 @@ * * * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public License - * as published by the Free Software Foundation; either version 2.1 - * of the License, or (at your option) any later version. + * modify it under the terms of the Revised BSD License. */ #ifndef CODER_H diff --git a/include/compression/dict.h b/include/compression/dict.h index e29b17f..d66dd23 100644 --- a/include/compression/dict.h +++ b/include/compression/dict.h @@ -5,9 +5,7 @@ * * * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public License - * as published by the Free Software Foundation; either version 2.1 - * of the License, or (at your option) any later version. + * modify it under the terms of the Revised BSD License. */ diff --git a/include/compression/fixpoint.h b/include/compression/fixpoint.h index b1e7130..f448dbf 100644 --- a/include/compression/fixpoint.h +++ b/include/compression/fixpoint.h @@ -5,9 +5,7 @@ * * * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public License - * as published by the Free Software Foundation; either version 2.1 - * of the License, or (at your option) any later version. + * modify it under the terms of the Revised BSD License. */ #ifndef FIXPOINT_H diff --git a/include/compression/huffman.h b/include/compression/huffman.h index c36e94d..49347de 100644 --- a/include/compression/huffman.h +++ b/include/compression/huffman.h @@ -5,9 +5,7 @@ * * * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public License - * as published by the Free Software Foundation; either version 2.1 - * of the License, or (at your option) any later version. + * modify it under the terms of the Revised BSD License. */ diff --git a/include/compression/lz77.h b/include/compression/lz77.h index e811256..ad37e5b 100644 --- a/include/compression/lz77.h +++ b/include/compression/lz77.h @@ -5,9 +5,7 @@ * * * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public License - * as published by the Free Software Foundation; either version 2.1 - * of the License, or (at your option) any later version. + * modify it under the terms of the Revised BSD License. */ diff --git a/include/compression/merge_sort.h b/include/compression/merge_sort.h index 970d5ee..48ab410 100644 --- a/include/compression/merge_sort.h +++ b/include/compression/merge_sort.h @@ -5,9 +5,7 @@ * * * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public License - * as published by the Free Software Foundation; either version 2.1 - * of the License, or (at your option) any later version. + * modify it under the terms of the Revised BSD License. */ diff --git a/include/compression/mtf.h b/include/compression/mtf.h index 9c5e175..bc4b2c8 100644 --- a/include/compression/mtf.h +++ b/include/compression/mtf.h @@ -5,9 +5,7 @@ * * * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public License - * as published by the Free Software Foundation; either version 2.1 - * of the License, or (at your option) any later version. + * modify it under the terms of the Revised BSD License. */ diff --git a/include/compression/my64bit.h b/include/compression/my64bit.h index f88c797..2959a8d 100644 --- a/include/compression/my64bit.h +++ b/include/compression/my64bit.h @@ -5,9 +5,7 @@ * * * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public License - * as published by the Free Software Foundation; either version 2.1 - * of the License, or (at your option) any later version. + * modify it under the terms of the Revised BSD License. */ #ifndef MY64BIT_H diff --git a/include/compression/rle.h b/include/compression/rle.h index 3adf8dc..c6d4706 100644 --- a/include/compression/rle.h +++ b/include/compression/rle.h @@ -5,9 +5,7 @@ * * * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public License - * as published by the Free Software Foundation; either version 2.1 - * of the License, or (at your option) any later version. + * modify it under the terms of the Revised BSD License. */ @@ -18,7 +16,7 @@ void Ptngc_comp_conv_to_rle(unsigned int *vals, int nvals, unsigned int *rle, int *nrle, int min_rle); -void Ptngc_comp_conv_from_rle(unsigned int *rle, +void Ptngc_comp_conv_from_rle(unsigned int *rle, unsigned int *vals, int nvals); #endif diff --git a/include/compression/tng_compress.h b/include/compression/tng_compress.h index 51597be..c8b8db1 100644 --- a/include/compression/tng_compress.h +++ b/include/compression/tng_compress.h @@ -5,9 +5,7 @@ * * * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public License - * as published by the Free Software Foundation; either version 2.1 - * of the License, or (at your option) any later version. + * modify it under the terms of the Revised BSD License. */ #ifndef TNG_COMPRESS_H @@ -41,27 +39,27 @@ ] desired_precision what to round the numbers to, i.e. integers will be created as: round(pos[]/desired_precision). - + algo should first be determined by calling tng_compress_pos_find_algo - + The compressed data is returned in a malloced pointer (so free can be called to free the memory), the number of chars in the compressed data is put into *nitems. If too large values are input (compared to the precision), NULL is returned. */ - + char DECLSPECDLLEXPORT *tng_compress_pos(double *pos, int natoms, int nframes, - double desired_precision, + double desired_precision, int speed, int *algo, int *nitems); char DECLSPECDLLEXPORT *tng_compress_pos_float(float *pos, int natoms, int nframes, - float desired_precision, + float desired_precision, int speed, int *algo, int *nitems); - + char DECLSPECDLLEXPORT *tng_compress_pos_int(int *pos, int natoms, int nframes, unsigned long prec_hi, unsigned long prec_lo, int speed,int *algo, @@ -78,13 +76,13 @@ char DECLSPECDLLEXPORT *tng_compress_pos_int(int *pos, int natoms, int nframes, speed=3: Same as 2 and also includes the XTC3 algorithm which will use BWLZH compression when it seems likely to give better compression. Also includes the interframe BWLZH algorithm for - coordinates and velocities. + coordinates and velocities. speed=4: Enable the inter frame BWLZH algorithm for the coordinates. The one-to-one BWLZH algorithm is enabled for velocities. speed=5: Enable the LZ77 part of the BWLZH algorithm. speed=6: Enable the intra frame BWLZH algorithm for the coordinates. Always try the BWLZH compression in the XTC3 algorithm. - + Set speed=0 to allow tng_compression to set the default speed (which is currently 2). For very good compression it makes sense to choose speed=4 or speed=5 @@ -108,7 +106,7 @@ char DECLSPECDLLEXPORT *tng_compress_pos_int_find_algo(int *pos, int natoms, int unsigned long prec_hi, unsigned long prec_lo, int speed,int *algo, int *nitems); - + /* This returns the number of integers required for the storage of the algorithm with the best compression ratio. */ int DECLSPECDLLEXPORT tng_compress_nalgo(void); @@ -132,7 +130,7 @@ char DECLSPECDLLEXPORT *tng_compress_vel_int(int *vel, int natoms, int nframes, unsigned long prec_hi, unsigned long prec_lo, int speed, int *algo, int *nitems); - + char DECLSPECDLLEXPORT *tng_compress_vel_find_algo(double *vel, int natoms, int nframes, double desired_precision, int speed, @@ -152,9 +150,9 @@ char DECLSPECDLLEXPORT *tng_compress_vel_int_find_algo(int *vel, int natoms, int int *nitems); /* From a compressed block, obtain information about - whether it is a position or velocity block: + whether it is a position or velocity block: *vel=1 means velocity block, *vel=0 means position block. - It also gives info about the number of atoms, + It also gives info about the number of atoms, frames, and the precision used to compress the block, and the algorithms used to compress the block. The return value=0 if the block looks like a tng compressed block, and 1 otherwise. If the return value is 1 no information is returned. */ @@ -184,7 +182,7 @@ void DECLSPECDLLEXPORT tng_compress_int_to_float(int *posvel_int,unsigned long p /* Compression algorithms (matching the original trajng assignments) The compression backends require that some of the algorithms must have the same value. */ - + #define TNG_COMPRESS_ALGO_STOPBIT 1 #define TNG_COMPRESS_ALGO_TRIPLET 2 #define TNG_COMPRESS_ALGO_BWLZH1 8 diff --git a/include/compression/vals16.h b/include/compression/vals16.h index a8acdf4..4585755 100644 --- a/include/compression/vals16.h +++ b/include/compression/vals16.h @@ -5,9 +5,7 @@ * * * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public License - * as published by the Free Software Foundation; either version 2.1 - * of the License, or (at your option) any later version. + * modify it under the terms of the Revised BSD License. */ diff --git a/include/compression/warnmalloc.h b/include/compression/warnmalloc.h index 945afbe..46e7d52 100644 --- a/include/compression/warnmalloc.h +++ b/include/compression/warnmalloc.h @@ -5,9 +5,7 @@ * * * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public License - * as published by the Free Software Foundation; either version 2.1 - * of the License, or (at your option) any later version. + * modify it under the terms of the Revised BSD License. */ diff --git a/include/compression/widemuldiv.h b/include/compression/widemuldiv.h index b7574fa..8ca24ee 100644 --- a/include/compression/widemuldiv.h +++ b/include/compression/widemuldiv.h @@ -5,9 +5,7 @@ * * * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public License - * as published by the Free Software Foundation; either version 2.1 - * of the License, or (at your option) any later version. + * modify it under the terms of the Revised BSD License. */ |