diff --git a/COPYING b/COPYING index 8d6bd9f..4816c43 100644 --- a/COPYING +++ b/COPYING @@ -26,3 +26,29 @@ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +=== + +Some of the benchmark data in util/zippy/testdata is licensed differently: + + - fireworks.jpeg is Copyright 2013 Steinar H. Gunderson, and + is licensed under the Creative Commons Attribution 3.0 license + (CC-BY-3.0). See https://creativecommons.org/licenses/by/3.0/ + for more information. + + - kppkn.gtb is taken from the Gaviota chess tablebase set, and + is licensed under the MIT License. See + https://sites.google.com/site/gaviotachessengine/Home/endgame-tablebases-1 + for more information. + + - paper-100k.pdf is an excerpt (bytes 92160 to 194560) from the paper + “Combinatorial Modeling of Chromatin Features Quantitatively Predicts DNA + Replication Timing in _Drosophila_” by Federico Comoglio and Renato Paro, + which is licensed under the CC-BY license. See + http://www.ploscompbiol.org/static/license for more ifnormation. + + - alice29.txt, asyoulik.txt, plrabn12.txt and lcet10.txt are from Project + Gutenberg. The first three have expired copyrights and are in the public + domain; the latter does not have expired copyright, but is still in the + public domain according to the license information + (http://www.gutenberg.org/ebooks/53). diff --git a/Makefile.am b/Makefile.am index f17b2e3..735bc12 100644 --- a/Makefile.am +++ b/Makefile.am @@ -16,7 +16,7 @@ snappy_unittest_LDADD = libsnappy.la $(UNITTEST_LIBS) $(gflags_LIBS) $(GTEST_LIB TESTS = snappy_unittest noinst_PROGRAMS = $(TESTS) -EXTRA_DIST = autogen.sh testdata/alice29.txt testdata/asyoulik.txt testdata/baddata1.snappy testdata/baddata2.snappy testdata/baddata3.snappy testdata/cp.html testdata/fields.c testdata/geo.protodata testdata/grammar.lsp testdata/house.jpg testdata/html testdata/html_x_4 testdata/kennedy.xls testdata/kppkn.gtb testdata/lcet10.txt testdata/mapreduce-osdi-1.pdf testdata/plrabn12.txt testdata/ptt5 testdata/sum testdata/urls.10K testdata/xargs.1 +EXTRA_DIST = autogen.sh testdata/alice29.txt testdata/asyoulik.txt testdata/baddata1.snappy testdata/baddata2.snappy testdata/baddata3.snappy testdata/geo.protodata testdata/fireworks.jpeg testdata/html testdata/html_x_4 testdata/kppkn.gtb testdata/lcet10.txt testdata/paper-100k.pdf testdata/plrabn12.txt testdata/urls.10K dist_doc_DATA = ChangeLog COPYING INSTALL NEWS README format_description.txt framing_format.txt libtool: $(LIBTOOL_DEPS) diff --git a/snappy_unittest.cc b/snappy_unittest.cc index 560d558..be7bba6 100644 --- a/snappy_unittest.cc +++ b/snappy_unittest.cc @@ -1191,23 +1191,14 @@ static struct { } files[] = { { "html", "html", 0 }, { "urls", "urls.10K", 0 }, - { "jpg", "house.jpg", 0 }, - { "jpg_200", "house.jpg", 200 }, - { "pdf", "mapreduce-osdi-1.pdf", 0 }, + { "jpg", "fireworks.jpeg", 0 }, + { "jpg_200", "fireworks.jpeg", 200 }, + { "pdf", "paper-100k.pdf", 0 }, { "html4", "html_x_4", 0 }, - { "cp", "cp.html", 0 }, - { "c", "fields.c", 0 }, - { "lsp", "grammar.lsp", 0 }, - { "xls", "kennedy.xls", 0 }, - { "xls_200", "kennedy.xls", 200 }, { "txt1", "alice29.txt", 0 }, { "txt2", "asyoulik.txt", 0 }, { "txt3", "lcet10.txt", 0 }, { "txt4", "plrabn12.txt", 0 }, - { "bin", "ptt5", 0 }, - { "bin_200", "ptt5", 200 }, - { "sum", "sum", 0 }, - { "man", "xargs.1", 0 }, { "pb", "geo.protodata", 0 }, { "gaviota", "kppkn.gtb", 0 }, }; @@ -1344,7 +1335,6 @@ BENCHMARK(BM_ZFlat)->DenseRange(0, ARRAYSIZE(files) - 1); int main(int argc, char** argv) { InitGoogle(argv[0], &argc, &argv, true); - File::Init(); RunSpecifiedBenchmarks(); diff --git a/testdata/cp.html b/testdata/cp.html deleted file mode 100644 index 1d0ca37..0000000 --- a/testdata/cp.html +++ /dev/null @@ -1,645 +0,0 @@ -
--Compression resources, conferences, and some research -groups and companies, are listed towards the end of this page.
- -Use this handy form to add something to this page, or to simply say you liked this page -
- - - - - -
- -
-
-
-Jean-loup Gailly -- Mr. gzip,
-PNG, CCR (1996-06-10)
-
-
-
-MPEG Pointers and Resources
-
-
-
-Robert M. Gray -- Signal
-compression, VQ, image quality evaluation (1996-04-22)
-
-
-Compression and
-Classification Group -- ISL,EE,Stanford (1996-04-22)
-
-
-Signal Processing
-and the International Information Infrastructure -- Web sites (1996-04-22)
-
-
-Valenta, Vladimir -- (1996-04-22)
-
-
-
-Jordan, Frederic -- Parallel Image Compression (1996-04-12)
-
-Electro-Optical Technologies, Inc. -- Consultant (1996-04-12)
-
-quicktime.apple.com -- Quicktime site (1996-03-11)
-
-IBM Hardware -- Compression chips (1996-03-11)
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- - -
- - -
- -
-Bell, Daniel -- Region based image compression -
-Bell, Tim -- compression, computer science for children, and computers and music. -
-Bellard, Fabrice -- Author of LZEXE -
-Bhaskaran, Vasudev -- Image and Video compression -
-Bloom, Charles -- text compression, LZ methods, PPM methods... -
-Brito, Roger -- Arithmetic Coding, LZW, Text Compression -
-Budge, Scott E. -- medical/lossy image compression -
-Burnett, Ian -- Speech coding, prototype waveform techniques -
- - -
-Chao, Hong-yang -- Lightning strike image compressor -
-Cheung, S.C. -- Scalable video compression algorithms (18th Feb 1996) -
- -Christopoulos, Charilaos -- Image and Video compression -
-Chung, Wilson C. -- R-D image and video coding, subband/wavelet, filter banks -
-Clark, Alan -- primary contact for V.42bis. Developed BTLZ variant of LZW -
-Cleary, John -- PPM, PPM*, K* -
-Cohn, Martin -
- -Cormack, Gordon V. -- DMC -
-Cramer, Chris -- neural network image compression -
- -
-Davis, Geoff -- wavelets, image compression, medical -
-Dilger, Andreas -- fractal block coding of video sequences -
- - -
- - - -
-Ford, Adrian -- Subjective and Objective Compression quality (5th Mar 1996) -
- -
- -Gersho, Allen -- Vector Quantisation, Image Compression -
-Gooch, Mark -- High Performance Hardware Compression (7th Feb 1996) -
-Goyal, Vivek -- overcomplete representations, adaptive transform coding, VQ -
-Robert M. Gray -- Signal -compression, VQ, image quality evaluation -
- -
-Hirschberg, Dan -- algorithm theory, compression -
-Horspool, R. Nigel -- text compression, ECG compression - -
- -
-Jones, Simon -- Lossless compression, High Performance Hardware (7th Feb 1996) -
-Jordan, Frederic -- Parallel Image Compression (12th April 1996) -
-Jung, Robert K. -- ARJ -
-jutta -
- - - -
-Kjelso, Morten -- Main memory compression, High performance hardware -
-Kuhn, Markus -- JBIG implementation -
-Kuru, Esa -
- -
-Larsson, Jesper -- algorithms and data structures, text compression -
- - -
-Mangen, Jean-Michel -- image compression, wavelets, satellite -
-Moffat, Alistair -- text and index compression, coding methods, information retrieval, document databases -
-Montgomery, Christopher -- OggSquish, audio compression -
-Mueller, Urban Dominik -- XPK system -
-
-Noah, Matt -- speech, ATC, ACELP and IMBE -
-Nuri, Veyis -- wavelets, data compression, DSP (speech & image) - -
-Ortega, Antonio -- Video compression, Packet video, Adaptive quantization -
- -
- -
-Roelofs, Greg -- Info-ZIP; primary UnZip author; PNG group -
-Russo, Roberto Maria -- Multiplatform Data Compression -
- -
-Sharifi, Kamran -- Video over ATM networks -
-Smoot, Steve -- MPEG -
-Streit, Jurgen -- Low bitrate coding -
-Strutz, Tilo -- Wavelet image compressor, demonstration execs -
- - -
-Teahan, Bill -- PPM, PPM*, master of the Calgary Corpus -
-Thomson, Duncan -- ECG compression with ANNs -
-Turpin, Andrew -- Prefix Codes -
- -
-Vitter, Jeff -
-de Vries, Nico -- AIP-NL, UltraCompressor II development -
- -
-Wegener, Al -- DSP, lossless audio compression and AC-2 -
-Wei, Dong -- Wavelet compression -
-Witten, Ian -- PPM, mg, arithmetic coding -
-Wolff, Gerry -
-Woo, Woon-Tack -- stereo image and video compression (12th Feb 1996) -
-Wu, Xiaolin -- CALIC -
- - -
-
-
-
-
-
-
-
-Conferences
-Data Compression Conference (DCC), Snowbird, Utah, USA.
-
-
-
-
-
-
-
-
-
-
-Resources
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-Research Projects, Standards & Companies
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/testdata/fields.c b/testdata/fields.c
deleted file mode 100644
index 63cdc03..0000000
--- a/testdata/fields.c
+++ /dev/null
@@ -1,431 +0,0 @@
-#ifndef lint
-static char Rcs_Id[] =
- "$Id: fields.c,v 1.7 1994/01/06 05:26:37 geoff Exp $";
-#endif
-
-/*
- * $Log: fields.c,v $
- * Revision 1.7 1994/01/06 05:26:37 geoff
- * Get rid of all references to System V string routines, for portability
- * (sigh).
- *
- * Revision 1.6 1994/01/05 20:13:43 geoff
- * Add the maxf parameter
- *
- * Revision 1.5 1994/01/04 02:40:21 geoff
- * Make the increments settable (field_line_inc and field_field_inc).
- * Add support for the FLD_NOSHRINK flag.
- *
- * Revision 1.4 1993/09/27 17:48:02 geoff
- * Fix some lint complaints and some parenthesization errors.
- *
- * Revision 1.3 1993/09/09 01:11:11 geoff
- * Add a return value to fieldwrite. Add support for backquotes and for
- * unstripped backslashes.
- *
- * Revision 1.2 1993/08/26 00:02:50 geoff
- * Fix a stupid null-pointer bug
- *
- * Revision 1.1 1993/08/25 21:32:05 geoff
- * Initial revision
- *
- */
-
-#include