diff --git a/Htmldocs/credits.html b/Htmldocs/credits.html index 6bae0936..54f4e51f 100644 --- a/Htmldocs/credits.html +++ b/Htmldocs/credits.html @@ -54,5 +54,48 @@

A special mention to the ApneaBoard for providing a development forum for OSCAR and for providing the primary download site for OSCAR at https://sleepfiles.com/OSCAR.

Also acknowledging ApneaBoard for their support of software for CPAP users for many years.

+ +
+

Third-Party Libraries:

+

Botan
+Copyright (C) 1999-2020 The Botan Authors
+All rights reserved.

+

Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met:

+

1. Redistributions of source code must retain the above copyright notice, + this list of conditions, and the following disclaimer.

+

2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions, and the following disclaimer in the + documentation and/or other materials provided with the distribution.

+

THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE +LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR +CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 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.

+

miniz
+Copyright 2013-2014 RAD Game Tools and Valve Software
+Copyright 2010-2014 Rich Geldreich and Tenacious Software LLC
+All Rights Reserved.

+

Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions:

+

The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software.

+

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE.

diff --git a/oscar/miniz.c b/oscar/SleepLib/thirdparty/miniz.c similarity index 100% rename from oscar/miniz.c rename to oscar/SleepLib/thirdparty/miniz.c diff --git a/oscar/miniz.h b/oscar/SleepLib/thirdparty/miniz.h similarity index 100% rename from oscar/miniz.h rename to oscar/SleepLib/thirdparty/miniz.h diff --git a/oscar/oscar.pro b/oscar/oscar.pro index 2f910738..38cb6bbb 100644 --- a/oscar/oscar.pro +++ b/oscar/oscar.pro @@ -312,7 +312,7 @@ SOURCES += \ SleepLib/loader_plugins/zeo_loader.cpp \ SleepLib/thirdparty/botan_all.cpp \ zip.cpp \ - miniz.c \ + SleepLib/thirdparty/miniz.c \ csv.cpp \ rawdata.cpp \ translation.cpp \ @@ -401,7 +401,7 @@ HEADERS += \ SleepLib/thirdparty/botan_linux.h \ SleepLib/thirdparty/botan_macos.h \ zip.h \ - miniz.h \ + SleepLib/thirdparty/miniz.h \ csv.h \ rawdata.h \ translation.h \ diff --git a/oscar/zip.cpp b/oscar/zip.cpp index 6977621c..c557f60f 100644 --- a/oscar/zip.cpp +++ b/oscar/zip.cpp @@ -275,7 +275,7 @@ const QString FileQueue::toString() const // ================================================================================================== // Static functions to abstract the details of miniz from the primary logic. -#include "miniz.h" +#include "SleepLib/thirdparty/miniz.h" // Callback for miniz to write compressed data static size_t zip_write(void *pOpaque, mz_uint64 /*file_ofs*/, const void *pBuf, size_t n)