diff options
| author | XhmikosR <xhmikosr@users.sourceforge.net> | 2013-05-13 16:48:46 +0400 |
|---|---|---|
| committer | XhmikosR <xhmikosr@users.sourceforge.net> | 2013-05-13 16:48:46 +0400 |
| commit | d73b4cbc6b31916f8659794e38729052d1877565 (patch) | |
| tree | 233db2c54c42b58e2073ea80bc6cd0d2a7ce631f /src | |
| parent | ae476106d2ee0fb0bcbadacc970de37ad799ba77 (diff) | |
update ZenLib to v0.4.29
Diffstat (limited to 'src')
55 files changed, 400 insertions, 1207 deletions
diff --git a/src/thirdparty/ZenLib/ZenLib/BitStream.h b/src/thirdparty/ZenLib/ZenLib/BitStream.h index abe617cb8..d7734f919 100644 --- a/src/thirdparty/ZenLib/ZenLib/BitStream.h +++ b/src/thirdparty/ZenLib/ZenLib/BitStream.h @@ -1,23 +1,9 @@ -// ZenLib::bitStream - Read bit per bit
-// Copyright (C) 2006-2012 MediaArea.net SARL, Info@MediaArea.net
-//
-// This software is provided 'as-is', without any express or implied
-// warranty. In no event will the authors be held liable for any damages
-// arising from the use of this software.
-//
-// Permission is granted to anyone to use this software for any purpose,
-// including commercial applications, and to alter it and redistribute it
-// freely, subject to the following restrictions:
-//
-// 1. The origin of this software must not be misrepresented; you must not
-// claim that you wrote the original software. If you use this software
-// in a product, an acknowledgment in the product documentation would be
-// appreciated but is not required.
-// 2. Altered source versions must be plainly marked as such, and must not be
-// misrepresented as being the original software.
-// 3. This notice may not be removed or altered from any source distribution.
-//
-//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+/* Copyright (c) MediaArea.net SARL. All Rights Reserved.
+ *
+ * Use of this source code is governed by a zlib-style license that can
+ * be found in the License.txt file in the root of the source tree.
+ */
+
//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
//
// Read a stream bit per bit
diff --git a/src/thirdparty/ZenLib/ZenLib/BitStream_Fast.h b/src/thirdparty/ZenLib/ZenLib/BitStream_Fast.h index 29be1467b..ff4474451 100644 --- a/src/thirdparty/ZenLib/ZenLib/BitStream_Fast.h +++ b/src/thirdparty/ZenLib/ZenLib/BitStream_Fast.h @@ -1,23 +1,9 @@ -// ZenLib::bitStream - Read bit per bit
-// Copyright (C) 2006-2012 MediaArea.net SARL, Info@MediaArea.net
-//
-// This software is provided 'as-is', without any express or implied
-// warranty. In no event will the authors be held liable for any damages
-// arising from the use of this software.
-//
-// Permission is granted to anyone to use this software for any purpose,
-// including commercial applications, and to alter it and redistribute it
-// freely, subject to the following restrictions:
-//
-// 1. The origin of this software must not be misrepresented; you must not
-// claim that you wrote the original software. If you use this software
-// in a product, an acknowledgment in the product documentation would be
-// appreciated but is not required.
-// 2. Altered source versions must be plainly marked as such, and must not be
-// misrepresented as being the original software.
-// 3. This notice may not be removed or altered from any source distribution.
-//
-//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+/* Copyright (c) MediaArea.net SARL. All Rights Reserved.
+ *
+ * Use of this source code is governed by a zlib-style license that can
+ * be found in the License.txt file in the root of the source tree.
+ */
+
//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
//
// Read a stream bit per bit
diff --git a/src/thirdparty/ZenLib/ZenLib/BitStream_LE.h b/src/thirdparty/ZenLib/ZenLib/BitStream_LE.h index 3e72277b5..362427fbb 100644 --- a/src/thirdparty/ZenLib/ZenLib/BitStream_LE.h +++ b/src/thirdparty/ZenLib/ZenLib/BitStream_LE.h @@ -1,23 +1,9 @@ -// ZenLib::BitStream_LE - Read bit per bit, Little Endian version
-// Copyright (C) 2007-2012 MediaArea.net SARL, Info@MediaArea.net
-//
-// This software is provided 'as-is', without any express or implied
-// warranty. In no event will the authors be held liable for any damages
-// arising from the use of this software.
-//
-// Permission is granted to anyone to use this software for any purpose,
-// including commercial applications, and to alter it and redistribute it
-// freely, subject to the following restrictions:
-//
-// 1. The origin of this software must not be misrepresented; you must not
-// claim that you wrote the original software. If you use this software
-// in a product, an acknowledgment in the product documentation would be
-// appreciated but is not required.
-// 2. Altered source versions must be plainly marked as such, and must not be
-// misrepresented as being the original software.
-// 3. This notice may not be removed or altered from any source distribution.
-//
-//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+/* Copyright (c) MediaArea.net SARL. All Rights Reserved.
+ *
+ * Use of this source code is governed by a zlib-style license that can
+ * be found in the License.txt file in the root of the source tree.
+ */
+
//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
//
// Read a stream bit per bit, Little Endian version (rarely used!!!)
diff --git a/src/thirdparty/ZenLib/ZenLib/Conf.cpp b/src/thirdparty/ZenLib/ZenLib/Conf.cpp index cb9244b04..25c65e9f6 100644 --- a/src/thirdparty/ZenLib/ZenLib/Conf.cpp +++ b/src/thirdparty/ZenLib/ZenLib/Conf.cpp @@ -1,24 +1,8 @@ -// ZenLib::ZenTypes - To be independant of platform & compiler
-// Copyright (C) 2002-2012 MediaArea.net SARL, Info@MediaArea.net
-//
-// This software is provided 'as-is', without any express or implied
-// warranty. In no event will the authors be held liable for any damages
-// arising from the use of this software.
-//
-// Permission is granted to anyone to use this software for any purpose,
-// including commercial applications, and to alter it and redistribute it
-// freely, subject to the following restrictions:
-//
-// 1. The origin of this software must not be misrepresented; you must not
-// claim that you wrote the original software. If you use this software
-// in a product, an acknowledgment in the product documentation would be
-// appreciated but is not required.
-// 2. Altered source versions must be plainly marked as such, and must not be
-// misrepresented as being the original software.
-// 3. This notice may not be removed or altered from any source distribution.
-//
-//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+/* Copyright (c) MediaArea.net SARL. All Rights Reserved.
+ *
+ * Use of this source code is governed by a zlib-style license that can
+ * be found in the License.txt file in the root of the source tree.
+ */
//---------------------------------------------------------------------------
#include "ZenLib/PreComp.h"
diff --git a/src/thirdparty/ZenLib/ZenLib/Conf.h b/src/thirdparty/ZenLib/ZenLib/Conf.h index 92897adc7..5c824619a 100644 --- a/src/thirdparty/ZenLib/ZenLib/Conf.h +++ b/src/thirdparty/ZenLib/ZenLib/Conf.h @@ -1,24 +1,8 @@ -// ZenLib::ZenTypes - To be independant of platform & compiler
-// Copyright (C) 2002-2012 MediaArea.net SARL, Info@MediaArea.net
-//
-// This software is provided 'as-is', without any express or implied
-// warranty. In no event will the authors be held liable for any damages
-// arising from the use of this software.
-//
-// Permission is granted to anyone to use this software for any purpose,
-// including commercial applications, and to alter it and redistribute it
-// freely, subject to the following restrictions:
-//
-// 1. The origin of this software must not be misrepresented; you must not
-// claim that you wrote the original software. If you use this software
-// in a product, an acknowledgment in the product documentation would be
-// appreciated but is not required.
-// 2. Altered source versions must be plainly marked as such, and must not be
-// misrepresented as being the original software.
-// 3. This notice may not be removed or altered from any source distribution.
-//
-//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+/* Copyright (c) MediaArea.net SARL. All Rights Reserved.
+ *
+ * Use of this source code is governed by a zlib-style license that can
+ * be found in the License.txt file in the root of the source tree.
+ */
//---------------------------------------------------------------------------
#ifndef ZenConfH
diff --git a/src/thirdparty/ZenLib/ZenLib/Conf_Internal.h b/src/thirdparty/ZenLib/ZenLib/Conf_Internal.h index 484442d70..a6574ff8d 100644 --- a/src/thirdparty/ZenLib/ZenLib/Conf_Internal.h +++ b/src/thirdparty/ZenLib/ZenLib/Conf_Internal.h @@ -1,24 +1,8 @@ -// ZenLib::Conf_Internal - To be independant of platform & compiler
-// Copyright (C) 2007-2012 MediaArea.net SARL, Info@MediaArea.net
-//
-// This software is provided 'as-is', without any express or implied
-// warranty. In no event will the authors be held liable for any damages
-// arising from the use of this software.
-//
-// Permission is granted to anyone to use this software for any purpose,
-// including commercial applications, and to alter it and redistribute it
-// freely, subject to the following restrictions:
-//
-// 1. The origin of this software must not be misrepresented; you must not
-// claim that you wrote the original software. If you use this software
-// in a product, an acknowledgment in the product documentation would be
-// appreciated but is not required.
-// 2. Altered source versions must be plainly marked as such, and must not be
-// misrepresented as being the original software.
-// 3. This notice may not be removed or altered from any source distribution.
-//
-//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+/* Copyright (c) MediaArea.net SARL. All Rights Reserved.
+ *
+ * Use of this source code is governed by a zlib-style license that can
+ * be found in the License.txt file in the root of the source tree.
+ */
//---------------------------------------------------------------------------
#ifndef ZenConf_InternalH
diff --git a/src/thirdparty/ZenLib/ZenLib/CriticalSection.cpp b/src/thirdparty/ZenLib/ZenLib/CriticalSection.cpp index a78201def..9574dce24 100644 --- a/src/thirdparty/ZenLib/ZenLib/CriticalSection.cpp +++ b/src/thirdparty/ZenLib/ZenLib/CriticalSection.cpp @@ -1,24 +1,8 @@ -// ZenLib::CriticalSection - CriticalSection functions
-// Copyright (C) 2007-2012 MediaArea.net SARL, Info@MediaArea.net
-//
-// This software is provided 'as-is', without any express or implied
-// warranty. In no event will the authors be held liable for any damages
-// arising from the use of this software.
-//
-// Permission is granted to anyone to use this software for any purpose,
-// including commercial applications, and to alter it and redistribute it
-// freely, subject to the following restrictions:
-//
-// 1. The origin of this software must not be misrepresented; you must not
-// claim that you wrote the original software. If you use this software
-// in a product, an acknowledgment in the product documentation would be
-// appreciated but is not required.
-// 2. Altered source versions must be plainly marked as such, and must not be
-// misrepresented as being the original software.
-// 3. This notice may not be removed or altered from any source distribution.
-//
-//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+/* Copyright (c) MediaArea.net SARL. All Rights Reserved.
+ *
+ * Use of this source code is governed by a zlib-style license that can
+ * be found in the License.txt file in the root of the source tree.
+ */
//---------------------------------------------------------------------------
#include "ZenLib/PreComp.h"
diff --git a/src/thirdparty/ZenLib/ZenLib/CriticalSection.h b/src/thirdparty/ZenLib/ZenLib/CriticalSection.h index 43002be2e..d9e044ca9 100644 --- a/src/thirdparty/ZenLib/ZenLib/CriticalSection.h +++ b/src/thirdparty/ZenLib/ZenLib/CriticalSection.h @@ -1,23 +1,9 @@ -// ZenLib::CriticalSection - CriticalSection functions
-// Copyright (C) 2007-2012 MediaArea.net SARL, Info@MediaArea.net
-//
-// This software is provided 'as-is', without any express or implied
-// warranty. In no event will the authors be held liable for any damages
-// arising from the use of this software.
-//
-// Permission is granted to anyone to use this software for any purpose,
-// including commercial applications, and to alter it and redistribute it
-// freely, subject to the following restrictions:
-//
-// 1. The origin of this software must not be misrepresented; you must not
-// claim that you wrote the original software. If you use this software
-// in a product, an acknowledgment in the product documentation would be
-// appreciated but is not required.
-// 2. Altered source versions must be plainly marked as such, and must not be
-// misrepresented as being the original software.
-// 3. This notice may not be removed or altered from any source distribution.
-//
-//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+/* Copyright (c) MediaArea.net SARL. All Rights Reserved.
+ *
+ * Use of this source code is governed by a zlib-style license that can
+ * be found in the License.txt file in the root of the source tree.
+ */
+
//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
//
// CriticalSection functions
diff --git a/src/thirdparty/ZenLib/ZenLib/Dir.cpp b/src/thirdparty/ZenLib/ZenLib/Dir.cpp index 8a592b222..3cc3f49ed 100644 --- a/src/thirdparty/ZenLib/ZenLib/Dir.cpp +++ b/src/thirdparty/ZenLib/ZenLib/Dir.cpp @@ -1,24 +1,8 @@ -// ZenLib::Dir - Directories functions
-// Copyright (C) 2007-2012 MediaArea.net SARL, Info@MediaArea.net
-//
-// This software is provided 'as-is', without any express or implied
-// warranty. In no event will the authors be held liable for any damages
-// arising from the use of this software.
-//
-// Permission is granted to anyone to use this software for any purpose,
-// including commercial applications, and to alter it and redistribute it
-// freely, subject to the following restrictions:
-//
-// 1. The origin of this software must not be misrepresented; you must not
-// claim that you wrote the original software. If you use this software
-// in a product, an acknowledgment in the product documentation would be
-// appreciated but is not required.
-// 2. Altered source versions must be plainly marked as such, and must not be
-// misrepresented as being the original software.
-// 3. This notice may not be removed or altered from any source distribution.
-//
-//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+/* Copyright (c) MediaArea.net SARL. All Rights Reserved.
+ *
+ * Use of this source code is governed by a zlib-style license that can
+ * be found in the License.txt file in the root of the source tree.
+ */
//---------------------------------------------------------------------------
#include "ZenLib/PreComp.h"
diff --git a/src/thirdparty/ZenLib/ZenLib/Dir.h b/src/thirdparty/ZenLib/ZenLib/Dir.h index f8b393d21..76f3d89f4 100644 --- a/src/thirdparty/ZenLib/ZenLib/Dir.h +++ b/src/thirdparty/ZenLib/ZenLib/Dir.h @@ -1,23 +1,9 @@ -// ZenLib::Dir - Directories functions
-// Copyright (C) 2007-2012 MediaArea.net SARL, Info@MediaArea.net
-//
-// This software is provided 'as-is', without any express or implied
-// warranty. In no event will the authors be held liable for any damages
-// arising from the use of this software.
-//
-// Permission is granted to anyone to use this software for any purpose,
-// including commercial applications, and to alter it and redistribute it
-// freely, subject to the following restrictions:
-//
-// 1. The origin of this software must not be misrepresented; you must not
-// claim that you wrote the original software. If you use this software
-// in a product, an acknowledgment in the product documentation would be
-// appreciated but is not required.
-// 2. Altered source versions must be plainly marked as such, and must not be
-// misrepresented as being the original software.
-// 3. This notice may not be removed or altered from any source distribution.
-//
-//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+/* Copyright (c) MediaArea.net SARL. All Rights Reserved.
+ *
+ * Use of this source code is governed by a zlib-style license that can
+ * be found in the License.txt file in the root of the source tree.
+ */
+
//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
//
// Directories functions
diff --git a/src/thirdparty/ZenLib/ZenLib/File.cpp b/src/thirdparty/ZenLib/ZenLib/File.cpp index 28c661bab..a2a66d338 100644 --- a/src/thirdparty/ZenLib/ZenLib/File.cpp +++ b/src/thirdparty/ZenLib/ZenLib/File.cpp @@ -1,24 +1,8 @@ -// ZenLib::File - File functions
-// Copyright (C) 2002-2010 MediaArea.net SARL, Info@MediaArea.net
-//
-// This software is provided 'as-is', without any express or implied
-// warranty. In no event will the authors be held liable for any damages
-// arising from the use of this software.
-//
-// Permission is granted to anyone to use this software for any purpose,
-// including commercial applications, and to alter it and redistribute it
-// freely, subject to the following restrictions:
-//
-// 1. The origin of this software must not be misrepresented; you must not
-// claim that you wrote the original software. If you use this software
-// in a product, an acknowledgment in the product documentation would be
-// appreciated but is not required.
-// 2. Altered source versions must be plainly marked as such, and must not be
-// misrepresented as being the original software.
-// 3. This notice may not be removed or altered from any source distribution.
-//
-//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+/* Copyright (c) MediaArea.net SARL. All Rights Reserved.
+ *
+ * Use of this source code is governed by a zlib-style license that can
+ * be found in the License.txt file in the root of the source tree.
+ */
//---------------------------------------------------------------------------
#include "ZenLib/PreComp.h"
@@ -836,14 +820,13 @@ Ztring File::Modified_Get(const Ztring &File_Name) //---------------------------------------------------------------------------
bool File::Exists(const Ztring &File_Name)
{
- if (File_Name.find(__T('*'))!=std::string::npos || File_Name.find(__T('?'))!=std::string::npos)
- return false;
-
#ifdef ZENLIB_USEWX
wxFileName FN(File_Name.c_str());
return FN.FileExists();
#else //ZENLIB_USEWX
#ifdef ZENLIB_STANDARD
+ if (File_Name.find(__T('*'))!=std::string::npos || File_Name.find(__T('?'))!=std::string::npos)
+ return false;
struct stat buffer;
int status;
#ifdef UNICODE
@@ -853,6 +836,8 @@ bool File::Exists(const Ztring &File_Name) #endif //UNICODE
return status==0 && S_ISREG(buffer.st_mode);
#elif defined WINDOWS
+ if (File_Name.find(__T('*'))!=std::string::npos || (File_Name.find(__T("\\\\?\\"))!=0 && File_Name.find(__T('?'))!=std::string::npos) || (File_Name.find(__T("\\\\?\\"))==0 && File_Name.find(__T('?'), 4)!=std::string::npos))
+ return false;
#ifdef UNICODE
DWORD FileAttributes;
#ifndef ZENLIB_NO_WIN9X_SUPPORT
diff --git a/src/thirdparty/ZenLib/ZenLib/File.h b/src/thirdparty/ZenLib/ZenLib/File.h index 7a61dc046..392e4af0e 100644 --- a/src/thirdparty/ZenLib/ZenLib/File.h +++ b/src/thirdparty/ZenLib/ZenLib/File.h @@ -1,23 +1,9 @@ -// ZenLib::File - File functions
-// Copyright (C) 2007-2010 MediaArea.net SARL, Info@MediaArea.net
-//
-// This software is provided 'as-is', without any express or implied
-// warranty. In no event will the authors be held liable for any damages
-// arising from the use of this software.
-//
-// Permission is granted to anyone to use this software for any purpose,
-// including commercial applications, and to alter it and redistribute it
-// freely, subject to the following restrictions:
-//
-// 1. The origin of this software must not be misrepresented; you must not
-// claim that you wrote the original software. If you use this software
-// in a product, an acknowledgment in the product documentation would be
-// appreciated but is not required.
-// 2. Altered source versions must be plainly marked as such, and must not be
-// misrepresented as being the original software.
-// 3. This notice may not be removed or altered from any source distribution.
-//
-//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+/* Copyright (c) MediaArea.net SARL. All Rights Reserved.
+ *
+ * Use of this source code is governed by a zlib-style license that can
+ * be found in the License.txt file in the root of the source tree.
+ */
+
//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
//
// File functions
diff --git a/src/thirdparty/ZenLib/ZenLib/FileName.cpp b/src/thirdparty/ZenLib/ZenLib/FileName.cpp index 1d1d4f0b3..667dcd352 100644 --- a/src/thirdparty/ZenLib/ZenLib/FileName.cpp +++ b/src/thirdparty/ZenLib/ZenLib/FileName.cpp @@ -1,24 +1,8 @@ -// ZenLib::FileName - File name functions
-// Copyright (C) 2007-2012 MediaArea.net SARL, Info@MediaArea.net
-//
-// This software is provided 'as-is', without any express or implied
-// warranty. In no event will the authors be held liable for any damages
-// arising from the use of this software.
-//
-// Permission is granted to anyone to use this software for any purpose,
-// including commercial applications, and to alter it and redistribute it
-// freely, subject to the following restrictions:
-//
-// 1. The origin of this software must not be misrepresented; you must not
-// claim that you wrote the original software. If you use this software
-// in a product, an acknowledgment in the product documentation would be
-// appreciated but is not required.
-// 2. Altered source versions must be plainly marked as such, and must not be
-// misrepresented as being the original software.
-// 3. This notice may not be removed or altered from any source distribution.
-//
-//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+/* Copyright (c) MediaArea.net SARL. All Rights Reserved.
+ *
+ * Use of this source code is governed by a zlib-style license that can
+ * be found in the License.txt file in the root of the source tree.
+ */
//---------------------------------------------------------------------------
#include "ZenLib/PreComp.h"
diff --git a/src/thirdparty/ZenLib/ZenLib/FileName.h b/src/thirdparty/ZenLib/ZenLib/FileName.h index 12bc9f984..4a55626a4 100644 --- a/src/thirdparty/ZenLib/ZenLib/FileName.h +++ b/src/thirdparty/ZenLib/ZenLib/FileName.h @@ -1,23 +1,9 @@ -// ZenLib::FileName - FileName functions
-// Copyright (C) 2007-2012 MediaArea.net SARL, Info@MediaArea.net
-//
-// This software is provided 'as-is', without any express or implied
-// warranty. In no event will the authors be held liable for any damages
-// arising from the use of this software.
-//
-// Permission is granted to anyone to use this software for any purpose,
-// including commercial applications, and to alter it and redistribute it
-// freely, subject to the following restrictions:
-//
-// 1. The origin of this software must not be misrepresented; you must not
-// claim that you wrote the original software. If you use this software
-// in a product, an acknowledgment in the product documentation would be
-// appreciated but is not required.
-// 2. Altered source versions must be plainly marked as such, and must not be
-// misrepresented as being the original software.
-// 3. This notice may not be removed or altered from any source distribution.
-//
-//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+/* Copyright (c) MediaArea.net SARL. All Rights Reserved.
+ *
+ * Use of this source code is governed by a zlib-style license that can
+ * be found in the License.txt file in the root of the source tree.
+ */
+
//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
//
// File name related functions
diff --git a/src/thirdparty/ZenLib/ZenLib/Format/Html/Html_Handler.cpp b/src/thirdparty/ZenLib/ZenLib/Format/Html/Html_Handler.cpp index bb36d5fc3..4064f4be1 100644 --- a/src/thirdparty/ZenLib/ZenLib/Format/Html/Html_Handler.cpp +++ b/src/thirdparty/ZenLib/ZenLib/Format/Html/Html_Handler.cpp @@ -1,24 +1,8 @@ -// ZenLib::Format::Html::Handler - A HTML Handler
-// Copyright (C) 2008-2012 MediaArea.net SARL, Info@MediaArea.net
-//
-// This software is provided 'as-is', without any express or implied
-// warranty. In no event will the authors be held liable for any damages
-// arising from the use of this software.
-//
-// Permission is granted to anyone to use this software for any purpose,
-// including commercial applications, and to alter it and redistribute it
-// freely, subject to the following restrictions:
-//
-// 1. The origin of this software must not be misrepresented; you must not
-// claim that you wrote the original software. If you use this software
-// in a product, an acknowledgment in the product documentation would be
-// appreciated but is not required.
-// 2. Altered source versions must be plainly marked as such, and must not be
-// misrepresented as being the original software.
-// 3. This notice may not be removed or altered from any source distribution.
-//
-//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+/* Copyright (c) MediaArea.net SARL. All Rights Reserved.
+ *
+ * Use of this source code is governed by a zlib-style license that can
+ * be found in the License.txt file in the root of the source tree.
+ */
//---------------------------------------------------------------------------
#include "ZenLib/PreComp.h"
diff --git a/src/thirdparty/ZenLib/ZenLib/Format/Html/Html_Handler.h b/src/thirdparty/ZenLib/ZenLib/Format/Html/Html_Handler.h index ac5788327..0bdbb7ae2 100644 --- a/src/thirdparty/ZenLib/ZenLib/Format/Html/Html_Handler.h +++ b/src/thirdparty/ZenLib/ZenLib/Format/Html/Html_Handler.h @@ -1,23 +1,9 @@ -// ZenLib::Format::Html::Handler - A HTML Handler
-// Copyright (C) 2008-2012 MediaArea.net SARL, Info@MediaArea.net
-//
-// This software is provided 'as-is', without any express or implied
-// warranty. In no event will the authors be held liable for any damages
-// arising from the use of this software.
-//
-// Permission is granted to anyone to use this software for any purpose,
-// including commercial applications, and to alter it and redistribute it
-// freely, subject to the following restrictions:
-//
-// 1. The origin of this software must not be misrepresented; you must not
-// claim that you wrote the original software. If you use this software
-// in a product, an acknowledgment in the product documentation would be
-// appreciated but is not required.
-// 2. Altered source versions must be plainly marked as such, and must not be
-// misrepresented as being the original software.
-// 3. This notice may not be removed or altered from any source distribution.
-//
-//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+/* Copyright (c) MediaArea.net SARL. All Rights Reserved.
+ *
+ * Use of this source code is governed by a zlib-style license that can
+ * be found in the License.txt file in the root of the source tree.
+ */
+
//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
//
// A HTML Handler
diff --git a/src/thirdparty/ZenLib/ZenLib/Format/Html/Html_Request.cpp b/src/thirdparty/ZenLib/ZenLib/Format/Html/Html_Request.cpp index 94d12e547..db4d1f24b 100644 --- a/src/thirdparty/ZenLib/ZenLib/Format/Html/Html_Request.cpp +++ b/src/thirdparty/ZenLib/ZenLib/Format/Html/Html_Request.cpp @@ -1,24 +1,8 @@ -// ZenLib::Server::Html::Request - A HTML request
-// Copyright (C) 2008-2012 MediaArea.net SARL, Info@MediaArea.net
-//
-// This software is provided 'as-is', without any express or implied
-// warranty. In no event will the authors be held liable for any damages
-// arising from the use of this software.
-//
-// Permission is granted to anyone to use this software for any purpose,
-// including commercial applications, and to alter it and redistribute it
-// freely, subject to the following restrictions:
-//
-// 1. The origin of this software must not be misrepresented; you must not
-// claim that you wrote the original software. If you use this software
-// in a product, an acknowledgment in the product documentation would be
-// appreciated but is not required.
-// 2. Altered source versions must be plainly marked as such, and must not be
-// misrepresented as being the original software.
-// 3. This notice may not be removed or altered from any source distribution.
-//
-//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+/* Copyright (c) MediaArea.net SARL. All Rights Reserved.
+ *
+ * Use of this source code is governed by a zlib-style license that can
+ * be found in the License.txt file in the root of the source tree.
+ */
//---------------------------------------------------------------------------
#include "ZenLib/PreComp.h"
diff --git a/src/thirdparty/ZenLib/ZenLib/Format/Html/Html_Request.h b/src/thirdparty/ZenLib/ZenLib/Format/Html/Html_Request.h index 5fcca2dbe..f94b94888 100644 --- a/src/thirdparty/ZenLib/ZenLib/Format/Html/Html_Request.h +++ b/src/thirdparty/ZenLib/ZenLib/Format/Html/Html_Request.h @@ -1,23 +1,9 @@ -// ZenLib::Format::Html::Request - A HTML request
-// Copyright (C) 2008-2012 MediaArea.net SARL, Info@MediaArea.net
-//
-// This software is provided 'as-is', without any express or implied
-// warranty. In no event will the authors be held liable for any damages
-// arising from the use of this software.
-//
-// Permission is granted to anyone to use this software for any purpose,
-// including commercial applications, and to alter it and redistribute it
-// freely, subject to the following restrictions:
-//
-// 1. The origin of this software must not be misrepresented; you must not
-// claim that you wrote the original software. If you use this software
-// in a product, an acknowledgment in the product documentation would be
-// appreciated but is not required.
-// 2. Altered source versions must be plainly marked as such, and must not be
-// misrepresented as being the original software.
-// 3. This notice may not be removed or altered from any source distribution.
-//
-//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+/* Copyright (c) MediaArea.net SARL. All Rights Reserved.
+ *
+ * Use of this source code is governed by a zlib-style license that can
+ * be found in the License.txt file in the root of the source tree.
+ */
+
//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
//
// A HTML Request
diff --git a/src/thirdparty/ZenLib/ZenLib/Format/Http/Http_Cookies.cpp b/src/thirdparty/ZenLib/ZenLib/Format/Http/Http_Cookies.cpp index 080f2d07b..1345aa0ab 100644 --- a/src/thirdparty/ZenLib/ZenLib/Format/Http/Http_Cookies.cpp +++ b/src/thirdparty/ZenLib/ZenLib/Format/Http/Http_Cookies.cpp @@ -1,22 +1,9 @@ -// ZenLib::Format::Http::Cookies - Cookies handling
-// Copyright (C) 2008-2012 MediaArea.net SARL, Info@MediaArea.net
-//
-// This software is provided 'as-is', without any express or implied
-// warranty. In no event will the authors be held liable for any damages
-// arising from the use of this software.
-//
-// Permission is granted to anyone to use this software for any purpose,
-// including commercial applications, and to alter it and redistribute it
-// freely, subject to the following restrictions:
-//
-// 1. The origin of this software must not be misrepresented; you must not
-// claim that you wrote the original software. If you use this software
-// in a product, an acknowledgment in the product documentation would be
-// appreciated but is not required.
-// 2. Altered source versions must be plainly marked as such, and must not be
-// misrepresented as being the original software.
-// 3. This notice may not be removed or altered from any source distribution.
-//
+/* Copyright (c) MediaArea.net SARL. All Rights Reserved.
+ *
+ * Use of this source code is governed by a zlib-style license that can
+ * be found in the License.txt file in the root of the source tree.
+ */
+
//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
diff --git a/src/thirdparty/ZenLib/ZenLib/Format/Http/Http_Cookies.h b/src/thirdparty/ZenLib/ZenLib/Format/Http/Http_Cookies.h index 809bda130..5c59ae282 100644 --- a/src/thirdparty/ZenLib/ZenLib/Format/Http/Http_Cookies.h +++ b/src/thirdparty/ZenLib/ZenLib/Format/Http/Http_Cookies.h @@ -1,23 +1,9 @@ -// ZenLib::Format::Http::Cookies - Cookies handling
-// Copyright (C) 2008-2012 MediaArea.net SARL, Info@MediaArea.net
-//
-// This software is provided 'as-is', without any express or implied
-// warranty. In no event will the authors be held liable for any damages
-// arising from the use of this software.
-//
-// Permission is granted to anyone to use this software for any purpose,
-// including commercial applications, and to alter it and redistribute it
-// freely, subject to the following restrictions:
-//
-// 1. The origin of this software must not be misrepresented; you must not
-// claim that you wrote the original software. If you use this software
-// in a product, an acknowledgment in the product documentation would be
-// appreciated but is not required.
-// 2. Altered source versions must be plainly marked as such, and must not be
-// misrepresented as being the original software.
-// 3. This notice may not be removed or altered from any source distribution.
-//
-//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+/* Copyright (c) MediaArea.net SARL. All Rights Reserved.
+ *
+ * Use of this source code is governed by a zlib-style license that can
+ * be found in the License.txt file in the root of the source tree.
+ */
+
//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
//
// Cookies handling
diff --git a/src/thirdparty/ZenLib/ZenLib/Format/Http/Http_Handler.cpp b/src/thirdparty/ZenLib/ZenLib/Format/Http/Http_Handler.cpp index 5050a8dfb..8e7963aa4 100644 --- a/src/thirdparty/ZenLib/ZenLib/Format/Http/Http_Handler.cpp +++ b/src/thirdparty/ZenLib/ZenLib/Format/Http/Http_Handler.cpp @@ -1,24 +1,8 @@ -// ZenLib::Format::Http::Handler - A HTTP Handler
-// Copyright (C) 2008-2012 MediaArea.net SARL, Info@MediaArea.net
-//
-// This software is provided 'as-is', without any express or implied
-// warranty. In no event will the authors be held liable for any damages
-// arising from the use of this software.
-//
-// Permission is granted to anyone to use this software for any purpose,
-// including commercial applications, and to alter it and redistribute it
-// freely, subject to the following restrictions:
-//
-// 1. The origin of this software must not be misrepresented; you must not
-// claim that you wrote the original software. If you use this software
-// in a product, an acknowledgment in the product documentation would be
-// appreciated but is not required.
-// 2. Altered source versions must be plainly marked as such, and must not be
-// misrepresented as being the original software.
-// 3. This notice may not be removed or altered from any source distribution.
-//
-//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+/* Copyright (c) MediaArea.net SARL. All Rights Reserved.
+ *
+ * Use of this source code is governed by a zlib-style license that can
+ * be found in the License.txt file in the root of the source tree.
+ */
//---------------------------------------------------------------------------
#include "ZenLib/PreComp.h"
diff --git a/src/thirdparty/ZenLib/ZenLib/Format/Http/Http_Handler.h b/src/thirdparty/ZenLib/ZenLib/Format/Http/Http_Handler.h index bf82a9d16..1ea484d27 100644 --- a/src/thirdparty/ZenLib/ZenLib/Format/Http/Http_Handler.h +++ b/src/thirdparty/ZenLib/ZenLib/Format/Http/Http_Handler.h @@ -1,23 +1,9 @@ -// ZenLib::Format::Http::Request - A HTTP request
-// Copyright (C) 2008-2012 MediaArea.net SARL, Info@MediaArea.net
-//
-// This software is provided 'as-is', without any express or implied
-// warranty. In no event will the authors be held liable for any damages
-// arising from the use of this software.
-//
-// Permission is granted to anyone to use this software for any purpose,
-// including commercial applications, and to alter it and redistribute it
-// freely, subject to the following restrictions:
-//
-// 1. The origin of this software must not be misrepresented; you must not
-// claim that you wrote the original software. If you use this software
-// in a product, an acknowledgment in the product documentation would be
-// appreciated but is not required.
-// 2. Altered source versions must be plainly marked as such, and must not be
-// misrepresented as being the original software.
-// 3. This notice may not be removed or altered from any source distribution.
-//
-//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+/* Copyright (c) MediaArea.net SARL. All Rights Reserved.
+ *
+ * Use of this source code is governed by a zlib-style license that can
+ * be found in the License.txt file in the root of the source tree.
+ */
+
//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
//
// A HTTP Request
diff --git a/src/thirdparty/ZenLib/ZenLib/Format/Http/Http_Request.cpp b/src/thirdparty/ZenLib/ZenLib/Format/Http/Http_Request.cpp index 97536a78e..be12d6fad 100644 --- a/src/thirdparty/ZenLib/ZenLib/Format/Http/Http_Request.cpp +++ b/src/thirdparty/ZenLib/ZenLib/Format/Http/Http_Request.cpp @@ -1,24 +1,8 @@ -// ZenLib::Server::Http::Request - A HTTP request
-// Copyright (C) 2008-2012 MediaArea.net SARL, Info@MediaArea.net
-//
-// This software is provided 'as-is', without any express or implied
-// warranty. In no event will the authors be held liable for any damages
-// arising from the use of this software.
-//
-// Permission is granted to anyone to use this software for any purpose,
-// including commercial applications, and to alter it and redistribute it
-// freely, subject to the following restrictions:
-//
-// 1. The origin of this software must not be misrepresented; you must not
-// claim that you wrote the original software. If you use this software
-// in a product, an acknowledgment in the product documentation would be
-// appreciated but is not required.
-// 2. Altered source versions must be plainly marked as such, and must not be
-// misrepresented as being the original software.
-// 3. This notice may not be removed or altered from any source distribution.
-//
-//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+/* Copyright (c) MediaArea.net SARL. All Rights Reserved.
+ *
+ * Use of this source code is governed by a zlib-style license that can
+ * be found in the License.txt file in the root of the source tree.
+ */
//---------------------------------------------------------------------------
#include "ZenLib/PreComp.h"
diff --git a/src/thirdparty/ZenLib/ZenLib/Format/Http/Http_Request.h b/src/thirdparty/ZenLib/ZenLib/Format/Http/Http_Request.h index e154b65f3..73d9933b7 100644 --- a/src/thirdparty/ZenLib/ZenLib/Format/Http/Http_Request.h +++ b/src/thirdparty/ZenLib/ZenLib/Format/Http/Http_Request.h @@ -1,23 +1,9 @@ -// ZenLib::Format::Http::Request - A HTTP request
-// Copyright (C) 2008-2012 MediaArea.net SARL, Info@MediaArea.net
-//
-// This software is provided 'as-is', without any express or implied
-// warranty. In no event will the authors be held liable for any damages
-// arising from the use of this software.
-//
-// Permission is granted to anyone to use this software for any purpose,
-// including commercial applications, and to alter it and redistribute it
-// freely, subject to the following restrictions:
-//
-// 1. The origin of this software must not be misrepresented; you must not
-// claim that you wrote the original software. If you use this software
-// in a product, an acknowledgment in the product documentation would be
-// appreciated but is not required.
-// 2. Altered source versions must be plainly marked as such, and must not be
-// misrepresented as being the original software.
-// 3. This notice may not be removed or altered from any source distribution.
-//
-//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+/* Copyright (c) MediaArea.net SARL. All Rights Reserved.
+ *
+ * Use of this source code is governed by a zlib-style license that can
+ * be found in the License.txt file in the root of the source tree.
+ */
+
//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
//
// A HTTP Request
diff --git a/src/thirdparty/ZenLib/ZenLib/Format/Http/Http_Utils.cpp b/src/thirdparty/ZenLib/ZenLib/Format/Http/Http_Utils.cpp index f705189b5..d896a0f85 100644 --- a/src/thirdparty/ZenLib/ZenLib/Format/Http/Http_Utils.cpp +++ b/src/thirdparty/ZenLib/ZenLib/Format/Http/Http_Utils.cpp @@ -1,24 +1,8 @@ -// ZenLib::Server::Http::Utils - Utils for HTTP handling
-// Copyright (C) 2008-2012 MediaArea.net SARL, Info@MediaArea.net
-//
-// This software is provided 'as-is', without any express or implied
-// warranty. In no event will the authors be held liable for any damages
-// arising from the use of this software.
-//
-// Permission is granted to anyone to use this software for any purpose,
-// including commercial applications, and to alter it and redistribute it
-// freely, subject to the following restrictions:
-//
-// 1. The origin of this software must not be misrepresented; you must not
-// claim that you wrote the original software. If you use this software
-// in a product, an acknowledgment in the product documentation would be
-// appreciated but is not required.
-// 2. Altered source versions must be plainly marked as such, and must not be
-// misrepresented as being the original software.
-// 3. This notice may not be removed or altered from any source distribution.
-//
-//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+/* Copyright (c) MediaArea.net SARL. All Rights Reserved.
+ *
+ * Use of this source code is governed by a zlib-style license that can
+ * be found in the License.txt file in the root of the source tree.
+ */
//---------------------------------------------------------------------------
#include "ZenLib/PreComp.h"
diff --git a/src/thirdparty/ZenLib/ZenLib/Format/Http/Http_Utils.h b/src/thirdparty/ZenLib/ZenLib/Format/Http/Http_Utils.h index a5ddb0888..26870fda3 100644 --- a/src/thirdparty/ZenLib/ZenLib/Format/Http/Http_Utils.h +++ b/src/thirdparty/ZenLib/ZenLib/Format/Http/Http_Utils.h @@ -1,23 +1,9 @@ -// ZenLib::Format::Http::Utils - Utils for HTTP handling
-// Copyright (C) 2008-2012 MediaArea.net SARL, Info@MediaArea.net
-//
-// This software is provided 'as-is', without any express or implied
-// warranty. In no event will the authors be held liable for any damages
-// arising from the use of this software.
-//
-// Permission is granted to anyone to use this software for any purpose,
-// including commercial applications, and to alter it and redistribute it
-// freely, subject to the following restrictions:
-//
-// 1. The origin of this software must not be misrepresented; you must not
-// claim that you wrote the original software. If you use this software
-// in a product, an acknowledgment in the product documentation would be
-// appreciated but is not required.
-// 2. Altered source versions must be plainly marked as such, and must not be
-// misrepresented as being the original software.
-// 3. This notice may not be removed or altered from any source distribution.
-//
-//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+/* Copyright (c) MediaArea.net SARL. All Rights Reserved.
+ *
+ * Use of this source code is governed by a zlib-style license that can
+ * be found in the License.txt file in the root of the source tree.
+ */
+
//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
//
// HTTP utils
diff --git a/src/thirdparty/ZenLib/ZenLib/HTTP_Client.cpp b/src/thirdparty/ZenLib/ZenLib/HTTP_Client.cpp index e0bae4f78..2dabfe8a5 100644 --- a/src/thirdparty/ZenLib/ZenLib/HTTP_Client.cpp +++ b/src/thirdparty/ZenLib/ZenLib/HTTP_Client.cpp @@ -1,24 +1,8 @@ -// ZenLib::HTTPClient - Basic HTTP client
-// Copyright (C) 2007-2012 MediaArea.net SARL, Info@MediaArea.net
-//
-// This software is provided 'as-is', without any express or implied
-// warranty. In no event will the authors be held liable for any damages
-// arising from the use of this software.
-//
-// Permission is granted to anyone to use this software for any purpose,
-// including commercial applications, and to alter it and redistribute it
-// freely, subject to the following restrictions:
-//
-// 1. The origin of this software must not be misrepresented; you must not
-// claim that you wrote the original software. If you use this software
-// in a product, an acknowledgment in the product documentation would be
-// appreciated but is not required.
-// 2. Altered source versions must be plainly marked as such, and must not be
-// misrepresented as being the original software.
-// 3. This notice may not be removed or altered from any source distribution.
-//
-//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+/* Copyright (c) MediaArea.net SARL. All Rights Reserved.
+ *
+ * Use of this source code is governed by a zlib-style license that can
+ * be found in the License.txt file in the root of the source tree.
+ */
//---------------------------------------------------------------------------
#include "ZenLib/PreComp.h"
diff --git a/src/thirdparty/ZenLib/ZenLib/HTTP_Client.h b/src/thirdparty/ZenLib/ZenLib/HTTP_Client.h index 6fd017705..7a5dc033b 100644 --- a/src/thirdparty/ZenLib/ZenLib/HTTP_Client.h +++ b/src/thirdparty/ZenLib/ZenLib/HTTP_Client.h @@ -1,23 +1,9 @@ -// ZenLib::HTTPClient - Basic HTTP client
-// Copyright (C) 2007-2012 MediaArea.net SARL, Info@MediaArea.net
-//
-// This software is provided 'as-is', without any express or implied
-// warranty. In no event will the authors be held liable for any damages
-// arising from the use of this software.
-//
-// Permission is granted to anyone to use this software for any purpose,
-// including commercial applications, and to alter it and redistribute it
-// freely, subject to the following restrictions:
-//
-// 1. The origin of this software must not be misrepresented; you must not
-// claim that you wrote the original software. If you use this software
-// in a product, an acknowledgment in the product documentation would be
-// appreciated but is not required.
-// 2. Altered source versions must be plainly marked as such, and must not be
-// misrepresented as being the original software.
-// 3. This notice may not be removed or altered from any source distribution.
-//
-//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+/* Copyright (c) MediaArea.net SARL. All Rights Reserved.
+ *
+ * Use of this source code is governed by a zlib-style license that can
+ * be found in the License.txt file in the root of the source tree.
+ */
+
//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
//
// Basic HTTP client
diff --git a/src/thirdparty/ZenLib/ZenLib/InfoMap.cpp b/src/thirdparty/ZenLib/ZenLib/InfoMap.cpp index 37a400da2..a4c10c03c 100644 --- a/src/thirdparty/ZenLib/ZenLib/InfoMap.cpp +++ b/src/thirdparty/ZenLib/ZenLib/InfoMap.cpp @@ -1,23 +1,8 @@ -// ZenLib::InfoMap - Helper for InfoMap
-// Copyright (C) 2007-2012 MediaArea.net SARL, Info@MediaArea.net
-//
-// This software is provided 'as-is', without any express or implied
-// warranty. In no event will the authors be held liable for any damages
-// arising from the use of this software.
-//
-// Permission is granted to anyone to use this software for any purpose,
-// including commercial applications, and to alter it and redistribute it
-// freely, subject to the following restrictions:
-//
-// 1. The origin of this software must not be misrepresented; you must not
-// claim that you wrote the original software. If you use this software
-// in a product, an acknowledgment in the product documentation would be
-// appreciated but is not required.
-// 2. Altered source versions must be plainly marked as such, and must not be
-// misrepresented as being the original software.
-// 3. This notice may not be removed or altered from any source distribution.
-//
-//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+/* Copyright (c) MediaArea.net SARL. All Rights Reserved.
+ *
+ * Use of this source code is governed by a zlib-style license that can
+ * be found in the License.txt file in the root of the source tree.
+ */
//---------------------------------------------------------------------------
#include "ZenLib/PreComp.h"
diff --git a/src/thirdparty/ZenLib/ZenLib/InfoMap.h b/src/thirdparty/ZenLib/ZenLib/InfoMap.h index 823cf2d9c..0711de285 100644 --- a/src/thirdparty/ZenLib/ZenLib/InfoMap.h +++ b/src/thirdparty/ZenLib/ZenLib/InfoMap.h @@ -1,27 +1,8 @@ -// ZenLib::InfoMap - Helper for InfoMap
-// Copyright (C) 2007-2012 MediaArea.net SARL, Info@MediaArea.net
-//
-// This software is provided 'as-is', without any express or implied
-// warranty. In no event will the authors be held liable for any damages
-// arising from the use of this software.
-//
-// Permission is granted to anyone to use this software for any purpose,
-// including commercial applications, and to alter it and redistribute it
-// freely, subject to the following restrictions:
-//
-// 1. The origin of this software must not be misrepresented; you must not
-// claim that you wrote the original software. If you use this software
-// in a product, an acknowledgment in the product documentation would be
-// appreciated but is not required.
-// 2. Altered source versions must be plainly marked as such, and must not be
-// misrepresented as being the original software.
-// 3. This notice may not be removed or altered from any source distribution.
-//
-//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-//
-//
-//
-//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+/* Copyright (c) MediaArea.net SARL. All Rights Reserved.
+ *
+ * Use of this source code is governed by a zlib-style license that can
+ * be found in the License.txt file in the root of the source tree.
+ */
//---------------------------------------------------------------------------
#ifndef ZenLib_InfoMapH
diff --git a/src/thirdparty/ZenLib/ZenLib/MemoryDebug.cpp b/src/thirdparty/ZenLib/ZenLib/MemoryDebug.cpp index 3315044ca..cc281f89f 100644 --- a/src/thirdparty/ZenLib/ZenLib/MemoryDebug.cpp +++ b/src/thirdparty/ZenLib/ZenLib/MemoryDebug.cpp @@ -1,23 +1,8 @@ -// ZenLib::MemoryDebug - To debug memory leaks
-// Copyright (C) 2002-2012 MediaArea.net SARL, Info@MediaArea.net
-//
-// This software is provided 'as-is', without any express or implied
-// warranty. In no event will the authors be held liable for any damages
-// arising from the use of this software.
-//
-// Permission is granted to anyone to use this software for any purpose,
-// including commercial applications, and to alter it and redistribute it
-// freely, subject to the following restrictions:
-//
-// 1. The origin of this software must not be misrepresented; you must not
-// claim that you wrote the original software. If you use this software
-// in a product, an acknowledgment in the product documentation would be
-// appreciated but is not required.
-// 2. Altered source versions must be plainly marked as such, and must not be
-// misrepresented as being the original software.
-// 3. This notice may not be removed or altered from any source distribution.
-//
-//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+/* Copyright (c) MediaArea.net SARL. All Rights Reserved.
+ *
+ * Use of this source code is governed by a zlib-style license that can
+ * be found in the License.txt file in the root of the source tree.
+ */
//---------------------------------------------------------------------------
#include "ZenLib/PreComp.h"
diff --git a/src/thirdparty/ZenLib/ZenLib/MemoryDebug.h b/src/thirdparty/ZenLib/ZenLib/MemoryDebug.h index 0f2618d6e..6111dcd05 100644 --- a/src/thirdparty/ZenLib/ZenLib/MemoryDebug.h +++ b/src/thirdparty/ZenLib/ZenLib/MemoryDebug.h @@ -1,26 +1,12 @@ -// ZenLib::MemoryDebug - To debug memory leaks
-// Copyright (C) 2002-2012 MediaArea.net SARL, Info@MediaArea.net
-//
-// This software is provided 'as-is', without any express or implied
-// warranty. In no event will the authors be held liable for any damages
-// arising from the use of this software.
-//
-// Permission is granted to anyone to use this software for any purpose,
-// including commercial applications, and to alter it and redistribute it
-// freely, subject to the following restrictions:
-//
-// 1. The origin of this software must not be misrepresented; you must not
-// claim that you wrote the original software. If you use this software
-// in a product, an acknowledgment in the product documentation would be
-// appreciated but is not required.
-// 2. Altered source versions must be plainly marked as such, and must not be
-// misrepresented as being the original software.
-// 3. This notice may not be removed or altered from any source distribution.
-//
-//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+/* Copyright (c) MediaArea.net SARL. All Rights Reserved.
+ *
+ * Use of this source code is governed by a zlib-style license that can
+ * be found in the License.txt file in the root of the source tree.
+ */
+
//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+//
// MemoryDebug
-//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
//
// Provide "new" and "delete" overloadings to be able to detect memory leaks
// Based on http://loulou.developpez.com/tutoriels/moteur3d/partie1/ 2.2.1
@@ -59,9 +45,10 @@ public : void Free(void* Ptr, bool Array);
void NextDelete(const char*, int Line); //Sauvegarde les infos sur la désallocation courante
+ void ReportLeaks();
+
private :
MemoryDebug();
- void ReportLeaks();
struct TBlock
{
std::size_t Size; // Taille allouée
diff --git a/src/thirdparty/ZenLib/ZenLib/OS_Utils.cpp b/src/thirdparty/ZenLib/ZenLib/OS_Utils.cpp index 0ed80fb5e..559a96dd1 100644 --- a/src/thirdparty/ZenLib/ZenLib/OS_Utils.cpp +++ b/src/thirdparty/ZenLib/ZenLib/OS_Utils.cpp @@ -1,24 +1,8 @@ -// ZenLib::OS_Utils - Cross platform OS utils
-// Copyright (C) 2002-2012 MediaArea.net SARL, Info@MediaArea.net
-//
-// This software is provided 'as-is', without any express or implied
-// warranty. In no event will the authors be held liable for any damages
-// arising from the use of this software.
-//
-// Permission is granted to anyone to use this software for any purpose,
-// including commercial applications, and to alter it and redistribute it
-// freely, subject to the following restrictions:
-//
-// 1. The origin of this software must not be misrepresented; you must not
-// claim that you wrote the original software. If you use this software
-// in a product, an acknowledgment in the product documentation would be
-// appreciated but is not required.
-// 2. Altered source versions must be plainly marked as such, and must not be
-// misrepresented as being the original software.
-// 3. This notice may not be removed or altered from any source distribution.
-//
-//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+/* Copyright (c) MediaArea.net SARL. All Rights Reserved.
+ *
+ * Use of this source code is governed by a zlib-style license that can
+ * be found in the License.txt file in the root of the source tree.
+ */
//---------------------------------------------------------------------------
#include "ZenLib/PreComp.h"
diff --git a/src/thirdparty/ZenLib/ZenLib/OS_Utils.h b/src/thirdparty/ZenLib/ZenLib/OS_Utils.h index 00a0f8c00..5a1bb344e 100644 --- a/src/thirdparty/ZenLib/ZenLib/OS_Utils.h +++ b/src/thirdparty/ZenLib/ZenLib/OS_Utils.h @@ -1,24 +1,8 @@ -// ZenLib::OS_Utils - Cross platform OS utils
-// Copyright (C) 2002-2012 MediaArea.net SARL, Info@MediaArea.net
-//
-// This software is provided 'as-is', without any express or implied
-// warranty. In no event will the authors be held liable for any damages
-// arising from the use of this software.
-//
-// Permission is granted to anyone to use this software for any purpose,
-// including commercial applications, and to alter it and redistribute it
-// freely, subject to the following restrictions:
-//
-// 1. The origin of this software must not be misrepresented; you must not
-// claim that you wrote the original software. If you use this software
-// in a product, an acknowledgment in the product documentation would be
-// appreciated but is not required.
-// 2. Altered source versions must be plainly marked as such, and must not be
-// misrepresented as being the original software.
-// 3. This notice may not be removed or altered from any source distribution.
-//
-//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+/* Copyright (c) MediaArea.net SARL. All Rights Reserved.
+ *
+ * Use of this source code is governed by a zlib-style license that can
+ * be found in the License.txt file in the root of the source tree.
+ */
//---------------------------------------------------------------------------
#ifndef ZenOS_UtilsH
@@ -27,6 +11,12 @@ //---------------------------------------------------------------------------
#include "ZenLib/Ztring.h"
+#ifdef WINDOWS
+#ifndef ZENLIB_NO_WIN9X_SUPPORT
+ #undef __TEXT
+ #include "windows.h"
+#endif //ZENLIB_NO_WIN9X_SUPPORT
+#endif //WINDOWS
//---------------------------------------------------------------------------
namespace ZenLib
diff --git a/src/thirdparty/ZenLib/ZenLib/PreComp.cpp b/src/thirdparty/ZenLib/ZenLib/PreComp.cpp index 4826f8438..55e856734 100644 --- a/src/thirdparty/ZenLib/ZenLib/PreComp.cpp +++ b/src/thirdparty/ZenLib/ZenLib/PreComp.cpp @@ -1,23 +1,8 @@ -// PreComp - PreComp file for ZenLib
-// Copyright (C) 2007-2012 MediaArea.net SARL, Info@MediaArea.net
-//
-// This software is provided 'as-is', without any express or implied
-// warranty. In no event will the authors be held liable for any damages
-// arising from the use of this software.
-//
-// Permission is granted to anyone to use this software for any purpose,
-// including commercial applications, and to alter it and redistribute it
-// freely, subject to the following restrictions:
-//
-// 1. The origin of this software must not be misrepresented; you must not
-// claim that you wrote the original software. If you use this software
-// in a product, an acknowledgment in the product documentation would be
-// appreciated but is not required.
-// 2. Altered source versions must be plainly marked as such, and must not be
-// misrepresented as being the original software.
-// 3. This notice may not be removed or altered from any source distribution.
-//
-//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+/* Copyright (c) MediaArea.net SARL. All Rights Reserved.
+ *
+ * Use of this source code is governed by a zlib-style license that can
+ * be found in the License.txt file in the root of the source tree.
+ */
//---------------------------------------------------------------------------
#include "ZenLib/PreComp.h"
diff --git a/src/thirdparty/ZenLib/ZenLib/PreComp.h b/src/thirdparty/ZenLib/ZenLib/PreComp.h index 999ceda7c..7941c0454 100644 --- a/src/thirdparty/ZenLib/ZenLib/PreComp.h +++ b/src/thirdparty/ZenLib/ZenLib/PreComp.h @@ -1,19 +1,9 @@ -// PreComp - PreComp file for ZenLib
-// Copyright (C) 2006-2012 MediaArea.net SARL, Info@MediaArea.net
-//
-// Permission is granted to anyone to use this software for any purpose,
-// including commercial applications, and to alter it and redistribute it
-// freely, subject to the following restrictions:
-//
-// 1. The origin of this software must not be misrepresented; you must not
-// claim that you wrote the original software. If you use this software
-// in a product, an acknowledgment in the product documentation would be
-// appreciated but is not required.
-// 2. Altered source versions must be plainly marked as such, and must not be
-// misrepresented as being the original software.
-// 3. This notice may not be removed or altered from any source distribution.
-//
-//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+/* Copyright (c) MediaArea.net SARL. All Rights Reserved.
+ *
+ * Use of this source code is governed by a zlib-style license that can
+ * be found in the License.txt file in the root of the source tree.
+ */
+
//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
//
// Helpers for compilers (precompilation)
diff --git a/src/thirdparty/ZenLib/ZenLib/Thread.cpp b/src/thirdparty/ZenLib/ZenLib/Thread.cpp index 7599ca1c7..bea649050 100644 --- a/src/thirdparty/ZenLib/ZenLib/Thread.cpp +++ b/src/thirdparty/ZenLib/ZenLib/Thread.cpp @@ -1,24 +1,8 @@ -// ZenLib::Thread - Thread functions
-// Copyright (C) 2007-2012 MediaArea.net SARL, Info@MediaArea.net
-//
-// This software is provided 'as-is', without any express or implied
-// warranty. In no event will the authors be held liable for any damages
-// arising from the use of this software.
-//
-// Permission is granted to anyone to use this software for any purpose,
-// including commercial applications, and to alter it and redistribute it
-// freely, subject to the following restrictions:
-//
-// 1. The origin of this software must not be misrepresented; you must not
-// claim that you wrote the original software. If you use this software
-// in a product, an acknowledgment in the product documentation would be
-// appreciated but is not required.
-// 2. Altered source versions must be plainly marked as such, and must not be
-// misrepresented as being the original software.
-// 3. This notice may not be removed or altered from any source distribution.
-//
-//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+/* Copyright (c) MediaArea.net SARL. All Rights Reserved.
+ *
+ * Use of this source code is governed by a zlib-style license that can
+ * be found in the License.txt file in the root of the source tree.
+ */
//---------------------------------------------------------------------------
#include "ZenLib/PreComp.h"
diff --git a/src/thirdparty/ZenLib/ZenLib/Thread.h b/src/thirdparty/ZenLib/ZenLib/Thread.h index 8b29b92f6..1c994a724 100644 --- a/src/thirdparty/ZenLib/ZenLib/Thread.h +++ b/src/thirdparty/ZenLib/ZenLib/Thread.h @@ -1,23 +1,9 @@ -// ZenLib::Thread - Thread functions
-// Copyright (C) 2007-2012 MediaArea.net SARL, Info@MediaArea.net
-//
-// This software is provided 'as-is', without any express or implied
-// warranty. In no event will the authors be held liable for any damages
-// arising from the use of this software.
-//
-// Permission is granted to anyone to use this software for any purpose,
-// including commercial applications, and to alter it and redistribute it
-// freely, subject to the following restrictions:
-//
-// 1. The origin of this software must not be misrepresented; you must not
-// claim that you wrote the original software. If you use this software
-// in a product, an acknowledgment in the product documentation would be
-// appreciated but is not required.
-// 2. Altered source versions must be plainly marked as such, and must not be
-// misrepresented as being the original software.
-// 3. This notice may not be removed or altered from any source distribution.
-//
-//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+/* Copyright (c) MediaArea.net SARL. All Rights Reserved.
+ *
+ * Use of this source code is governed by a zlib-style license that can
+ * be found in the License.txt file in the root of the source tree.
+ */
+
//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
//
// Thread functions
diff --git a/src/thirdparty/ZenLib/ZenLib/Trace.h b/src/thirdparty/ZenLib/ZenLib/Trace.h index 69e969e6f..ce791a1d3 100644 --- a/src/thirdparty/ZenLib/ZenLib/Trace.h +++ b/src/thirdparty/ZenLib/ZenLib/Trace.h @@ -1,26 +1,12 @@ -// ZenLib::Trace - To trace (in files)
-// Copyright (C) 2006-2012 MediaArea.net SARL, Info@MediaArea.net
-//
-// This software is provided 'as-is', without any express or implied
-// warranty. In no event will the authors be held liable for any damages
-// arising from the use of this software.
-//
-// Permission is granted to anyone to use this software for any purpose,
-// including commercial applications, and to alter it and redistribute it
-// freely, subject to the following restrictions:
-//
-// 1. The origin of this software must not be misrepresented; you must not
-// claim that you wrote the original software. If you use this software
-// in a product, an acknowledgment in the product documentation would be
-// appreciated but is not required.
-// 2. Altered source versions must be plainly marked as such, and must not be
-// misrepresented as being the original software.
-// 3. This notice may not be removed or altered from any source distribution.
-//
-//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+/* Copyright (c) MediaArea.net SARL. All Rights Reserved.
+ *
+ * Use of this source code is governed by a zlib-style license that can
+ * be found in the License.txt file in the root of the source tree.
+ */
+
//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+//
// Trace
-//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
//
// Provide a direct to file trace
//
diff --git a/src/thirdparty/ZenLib/ZenLib/Translation.cpp b/src/thirdparty/ZenLib/ZenLib/Translation.cpp index ec6e8fa58..77a74ff8d 100644 --- a/src/thirdparty/ZenLib/ZenLib/Translation.cpp +++ b/src/thirdparty/ZenLib/ZenLib/Translation.cpp @@ -1,23 +1,8 @@ -// ZenLib::Translation - Helper for translation
-// Copyright (C) 2007-2012 MediaArea.net SARL, Info@MediaArea.net
-//
-// This software is provided 'as-is', without any express or implied
-// warranty. In no event will the authors be held liable for any damages
-// arising from the use of this software.
-//
-// Permission is granted to anyone to use this software for any purpose,
-// including commercial applications, and to alter it and redistribute it
-// freely, subject to the following restrictions:
-//
-// 1. The origin of this software must not be misrepresented; you must not
-// claim that you wrote the original software. If you use this software
-// in a product, an acknowledgment in the product documentation would be
-// appreciated but is not required.
-// 2. Altered source versions must be plainly marked as such, and must not be
-// misrepresented as being the original software.
-// 3. This notice may not be removed or altered from any source distribution.
-//
-//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+/* Copyright (c) MediaArea.net SARL. All Rights Reserved.
+ *
+ * Use of this source code is governed by a zlib-style license that can
+ * be found in the License.txt file in the root of the source tree.
+ */
//---------------------------------------------------------------------------
#include "ZenLib/PreComp.h"
diff --git a/src/thirdparty/ZenLib/ZenLib/Translation.h b/src/thirdparty/ZenLib/ZenLib/Translation.h index d5e8d0df2..cedc455fd 100644 --- a/src/thirdparty/ZenLib/ZenLib/Translation.h +++ b/src/thirdparty/ZenLib/ZenLib/Translation.h @@ -1,27 +1,8 @@ -// ZenLib::Translation - Helper for translation
-// Copyright (C) 2007-2012 MediaArea.net SARL, Info@MediaArea.net
-//
-// This software is provided 'as-is', without any express or implied
-// warranty. In no event will the authors be held liable for any damages
-// arising from the use of this software.
-//
-// Permission is granted to anyone to use this software for any purpose,
-// including commercial applications, and to alter it and redistribute it
-// freely, subject to the following restrictions:
-//
-// 1. The origin of this software must not be misrepresented; you must not
-// claim that you wrote the original software. If you use this software
-// in a product, an acknowledgment in the product documentation would be
-// appreciated but is not required.
-// 2. Altered source versions must be plainly marked as such, and must not be
-// misrepresented as being the original software.
-// 3. This notice may not be removed or altered from any source distribution.
-//
-//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-//
-//
-//
-//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+/* Copyright (c) MediaArea.net SARL. All Rights Reserved.
+ *
+ * Use of this source code is governed by a zlib-style license that can
+ * be found in the License.txt file in the root of the source tree.
+ */
//---------------------------------------------------------------------------
#ifndef ZenLib_TranslationH
diff --git a/src/thirdparty/ZenLib/ZenLib/Utils.cpp b/src/thirdparty/ZenLib/ZenLib/Utils.cpp index b8ec0c48d..bc65f7027 100644 --- a/src/thirdparty/ZenLib/ZenLib/Utils.cpp +++ b/src/thirdparty/ZenLib/ZenLib/Utils.cpp @@ -1,24 +1,8 @@ -// ZenLib::Utils - Very small utilities
-// Copyright (C) 2002-2012 MediaArea.net SARL, Info@MediaArea.net
-//
-// This software is provided 'as-is', without any express or implied
-// warranty. In no event will the authors be held liable for any damages
-// arising from the use of this software.
-//
-// Permission is granted to anyone to use this software for any purpose,
-// including commercial applications, and to alter it and redistribute it
-// freely, subject to the following restrictions:
-//
-// 1. The origin of this software must not be misrepresented; you must not
-// claim that you wrote the original software. If you use this software
-// in a product, an acknowledgment in the product documentation would be
-// appreciated but is not required.
-// 2. Altered source versions must be plainly marked as such, and must not be
-// misrepresented as being the original software.
-// 3. This notice may not be removed or altered from any source distribution.
-//
-//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+/* Copyright (c) MediaArea.net SARL. All Rights Reserved.
+ *
+ * Use of this source code is governed by a zlib-style license that can
+ * be found in the License.txt file in the root of the source tree.
+ */
//---------------------------------------------------------------------------
#include "ZenLib/PreComp.h"
diff --git a/src/thirdparty/ZenLib/ZenLib/Utils.h b/src/thirdparty/ZenLib/ZenLib/Utils.h index 9161fec49..8845d78dc 100644 --- a/src/thirdparty/ZenLib/ZenLib/Utils.h +++ b/src/thirdparty/ZenLib/ZenLib/Utils.h @@ -1,23 +1,9 @@ -// ZenLib::Utils - Very small utilities
-// Copyright (C) 2002-2012 MediaArea.net SARL, Info@MediaArea.net
-//
-// This software is provided 'as-is', without any express or implied
-// warranty. In no event will the authors be held liable for any damages
-// arising from the use of this software.
-//
-// Permission is granted to anyone to use this software for any purpose,
-// including commercial applications, and to alter it and redistribute it
-// freely, subject to the following restrictions:
-//
-// 1. The origin of this software must not be misrepresented; you must not
-// claim that you wrote the original software. If you use this software
-// in a product, an acknowledgment in the product documentation would be
-// appreciated but is not required.
-// 2. Altered source versions must be plainly marked as such, and must not be
-// misrepresented as being the original software.
-// 3. This notice may not be removed or altered from any source distribution.
-//
-//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+/* Copyright (c) MediaArea.net SARL. All Rights Reserved.
+ *
+ * Use of this source code is governed by a zlib-style license that can
+ * be found in the License.txt file in the root of the source tree.
+ */
+
//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
//
// Integer and float manipulation
diff --git a/src/thirdparty/ZenLib/ZenLib/Ztring.cpp b/src/thirdparty/ZenLib/ZenLib/Ztring.cpp index afa8e97b7..62394e838 100644 --- a/src/thirdparty/ZenLib/ZenLib/Ztring.cpp +++ b/src/thirdparty/ZenLib/ZenLib/Ztring.cpp @@ -1,23 +1,9 @@ -// ZenLib::Ztring - std::(w)string is better
-// Copyright (C) 2002-2012 MediaArea.net SARL, Info@MediaArea.net
-//
-// This software is provided 'as-is', without any express or implied
-// warranty. In no event will the authors be held liable for any damages
-// arising from the use of this software.
-//
-// Permission is granted to anyone to use this software for any purpose,
-// including commercial applications, and to alter it and redistribute it
-// freely, subject to the following restrictions:
-//
-// 1. The origin of this software must not be misrepresented; you must not
-// claim that you wrote the original software. If you use this software
-// in a product, an acknowledgment in the product documentation would be
-// appreciated but is not required.
-// 2. Altered source versions must be plainly marked as such, and must not be
-// misrepresented as being the original software.
-// 3. This notice may not be removed or altered from any source distribution.
-//
-//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+/* Copyright (c) MediaArea.net SARL. All Rights Reserved.
+ *
+ * Use of this source code is governed by a zlib-style license that can
+ * be found in the License.txt file in the root of the source tree.
+ */
+
//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
//
// More methods for std::(w)string
@@ -52,9 +38,6 @@ #ifdef __MINGW32__
#include <windows.h>
#endif //__MINGW32__
-#ifdef SS
- #undef SS //Solaris defines this in cstdlib
-#endif
#include <algorithm>
#include <iomanip>
#include <cmath>
@@ -799,13 +782,13 @@ Ztring& Ztring::From_Number (const int8s I, int8u Radix) assign (C1);
delete[] C1; //C1=NULL;
#else
- toStringStream SS;
+ toStringStream Stream;
#ifdef UNICODE
- SS << setbase(Radix) << I;
+ Stream << setbase(Radix) << I;
#else //UNICODE
- SS << setbase(Radix) << (size_t)I; //On linux (at least), (un)signed char is detected as a char
+ Stream << setbase(Radix) << (size_t)I; //On linux (at least), (un)signed char is detected as a char
#endif //UNICODE
- assign(SS.str());
+ assign(Stream.str());
#endif
MakeUpperCase();
return *this;
@@ -840,13 +823,13 @@ Ztring& Ztring::From_Number (const int8u I, int8u Radix) }
else
{
- toStringStream SS;
+ toStringStream Stream;
#ifdef UNICODE
- SS << setbase(Radix) << I;
+ Stream << setbase(Radix) << I;
#else //UNICODE
- SS << setbase(Radix) << (size_t)I; //On linux (at least), (un)signed char is detected as a char
+ Stream << setbase(Radix) << (size_t)I; //On linux (at least), (un)signed char is detected as a char
#endif //UNICODE
- assign(SS.str());
+ assign(Stream.str());
}
#endif
MakeUpperCase();
@@ -870,9 +853,9 @@ Ztring& Ztring::From_Number (const int16s I, int8u Radix) assign (C1);
delete[] C1; //C1=NULL;
#else
- toStringStream SS;
- SS << setbase(Radix) << I;
- assign(SS.str());
+ toStringStream Stream;
+ Stream << setbase(Radix) << I;
+ assign(Stream.str());
#endif
MakeUpperCase();
return *this;
@@ -907,9 +890,9 @@ Ztring& Ztring::From_Number (const int16u I, int8u Radix) }
else
{
- toStringStream SS;
- SS << setbase(Radix) << I;
- assign(SS.str());
+ toStringStream Stream;
+ Stream << setbase(Radix) << I;
+ assign(Stream.str());
}
#endif
MakeUpperCase();
@@ -933,9 +916,9 @@ Ztring& Ztring::From_Number (const int32s I, int8u Radix) assign (C1);
delete[] C1; //C1=NULL;
#else
- toStringStream SS;
- SS << setbase(Radix) << I;
- assign(SS.str());
+ toStringStream Stream;
+ Stream << setbase(Radix) << I;
+ assign(Stream.str());
#endif
MakeUpperCase();
return *this;
@@ -970,9 +953,9 @@ Ztring& Ztring::From_Number (const int32u I, int8u Radix) }
else
{
- toStringStream SS;
- SS << setbase(Radix) << I;
- assign(SS.str());
+ toStringStream Stream;
+ Stream << setbase(Radix) << I;
+ assign(Stream.str());
}
#endif
MakeUpperCase();
@@ -996,9 +979,9 @@ Ztring& Ztring::From_Number (const int64s I, int8u Radix) assign (C1);
delete[] C1; //C1=NULL;
#else
- toStringStream SS;
- SS << setbase(Radix) << I;
- assign(SS.str());
+ toStringStream Stream;
+ Stream << setbase(Radix) << I;
+ assign(Stream.str());
#endif
MakeUpperCase();
return *this;
@@ -1033,9 +1016,9 @@ Ztring& Ztring::From_Number (const int64u I, int8u Radix) }
else
{
- toStringStream SS;
- SS << setbase(Radix) << I;
- assign(SS.str());
+ toStringStream Stream;
+ Stream << setbase(Radix) << I;
+ assign(Stream.str());
}
#endif
MakeUpperCase();
@@ -1056,9 +1039,9 @@ Ztring& Ztring::From_Number (const float32 F, int8u Precision, ztring_t Options) _tnprintf (C1, 99, (Ztring(__T("%."))+Ztring::ToZtring(Precision)+__T("f")).c_str(), F);
assign(C1);
#else
- toStringStream SS;
- SS << setprecision(Precision) << fixed << F;
- assign(SS.str());
+ toStringStream Stream;
+ Stream << setprecision(Precision) << fixed << F;
+ assign(Stream.str());
#if defined(__BORLANDC__)
FindAndReplace(__T(","), __T(".")); //Borland C++ Builder 2010+Windows Seven put a comma for istringstream, but does not support comma for ostringstream
#endif
@@ -1082,9 +1065,9 @@ Ztring& Ztring::From_Number (const float64 F, int8u Precision, ztring_t Options) _tnprintf (C1, 99, (Ztring(__T("%."))+Ztring::ToZtring(Precision)+__T("f")).c_str(), F);
assign(C1);
#else
- toStringStream SS;
- SS << setprecision(Precision) << fixed << F;
- assign(SS.str());
+ toStringStream Stream;
+ Stream << setprecision(Precision) << fixed << F;
+ assign(Stream.str());
#if defined(__BORLANDC__)
FindAndReplace(__T(","), __T(".")); //Borland C++ Builder 2010+Windows Seven put a comma for istringstream, but does not support comma for ostringstream
#endif
@@ -1108,9 +1091,9 @@ Ztring& Ztring::From_Number (const float80 F, int8u Precision, ztring_t Options) _tnprintf (C1, 99, (Ztring(__T("%."))+Ztring::ToZtring(Precision)+__T("f")).c_str(), F);
assign(C1);
#else
- toStringStream SS;
- SS << setprecision(Precision) << fixed << F;
- assign(SS.str());
+ toStringStream Stream;
+ Stream << setprecision(Precision) << fixed << F;
+ assign(Stream.str());
#if defined(__BORLANDC__)
FindAndReplace(__T(","), __T(".")); //Borland C++ Builder 2010+Windows Seven put a comma for istringstream, but does not support comma for ostringstream
#endif
@@ -1135,9 +1118,9 @@ Ztring& Ztring::From_Number (const size_t I, int8u Radix) _tnprintf(C1, 64, Radix==10?__T("%zu"):(Radix==16?__T("%zx"):(Radix==8?__T("%zo"):__T(""))), I);
assign(C1);
#else
- toStringStream SS;
- SS << setbase(Radix) << I;
- assign(SS.str());
+ toStringStream Stream;
+ Stream << setbase(Radix) << I;
+ assign(Stream.str());
#if defined(__BORLANDC__)
FindAndReplace(__T(","), __T(".")); //Borland C++ Builder 2010+Windows Seven put a comma for istringstream, but does not support comma for ostringstream
#endif
@@ -1154,10 +1137,10 @@ Ztring& Ztring::From_BCD (const int8u I) append(1, __T('0')+I/0x10);
append(1, __T('0')+I%0x10);
#else
- toStringStream SS;
- SS << I/0x10;
- SS << I%0x10;
- assign(SS.str());
+ toStringStream Stream;
+ Stream << I/0x10;
+ Stream << I%0x10;
+ assign(Stream.str());
#endif
return *this;
}
@@ -1175,8 +1158,8 @@ Ztring& Ztring::Duration_From_Milliseconds (const int64s Value_) int64u HH=(int8u)(Value/1000/60/60);
int64u MM=Value/1000/60 -((HH*60));
- int64u SS=Value/1000 -((HH*60+MM)*60);
- int64u MS=Value -((HH*60+MM)*60+SS)*1000;
+ int64u Stream=Value/1000 -((HH*60+MM)*60);
+ int64u MS=Value -((HH*60+MM)*60+Stream)*1000;
Ztring DateT;
Ztring Date;
DateT.From_Number(HH); if (DateT.size()<2){DateT=Ztring(__T("0"))+DateT;}
@@ -1185,7 +1168,7 @@ Ztring& Ztring::Duration_From_Milliseconds (const int64s Value_) DateT.From_Number(MM); if (DateT.size()<2){DateT=Ztring(__T("0"))+DateT;}
Date+=DateT;
Date+=__T(":");
- DateT.From_Number(SS); if (DateT.size()<2){DateT=Ztring(__T("0"))+DateT;}
+ DateT.From_Number(Stream); if (DateT.size()<2){DateT=Ztring(__T("0"))+DateT;}
Date+=DateT;
Date+=__T(".");
DateT.From_Number(MS); if (DateT.size()<2){DateT=Ztring(__T("00"))+DateT;} else if (DateT.size()<3){DateT=Ztring(__T("0"))+DateT;}
@@ -1205,8 +1188,8 @@ Ztring& Ztring::Duration_From_Milliseconds (const int64u Value) {
int64u HH=(int8u)(Value/1000/60/60);
int64u MM=Value/1000/60 -((HH*60));
- int64u SS=Value/1000 -((HH*60+MM)*60);
- int64u MS=Value -((HH*60+MM)*60+SS)*1000;
+ int64u Stream=Value/1000 -((HH*60+MM)*60);
+ int64u MS=Value -((HH*60+MM)*60+Stream)*1000;
Ztring DateT;
Ztring Date;
DateT.From_Number(HH); if (DateT.size()<2){DateT=Ztring(__T("0"))+DateT;}
@@ -1215,7 +1198,7 @@ Ztring& Ztring::Duration_From_Milliseconds (const int64u Value) DateT.From_Number(MM); if (DateT.size()<2){DateT=Ztring(__T("0"))+DateT;}
Date+=DateT;
Date+=__T(":");
- DateT.From_Number(SS); if (DateT.size()<2){DateT=Ztring(__T("0"))+DateT;}
+ DateT.From_Number(Stream); if (DateT.size()<2){DateT=Ztring(__T("0"))+DateT;}
Date+=DateT;
Date+=__T(".");
DateT.From_Number(MS); if (DateT.size()<2){DateT=Ztring(__T("00"))+DateT;} else if (DateT.size()<3){DateT=Ztring(__T("0"))+DateT;}
@@ -1792,9 +1775,9 @@ int8s Ztring::To_int8s (int8u Radix, ztring_t Options) const I=atoi(c_str());
#endif //UNICODE
#else
- tStringStream SS(*this);
- SS >> setbase(Radix) >> I;
- if (SS.fail())
+ tStringStream Stream(*this);
+ Stream >> setbase(Radix) >> I;
+ if (Stream.fail())
return 0;
#endif
@@ -1830,9 +1813,9 @@ int8u Ztring::To_int8u (int8u Radix, ztring_t Options) const I=atoi(c_str());
#endif //defined(UNICODE)
#else
- tStringStream SS(*this);
- SS >> setbase(Radix) >> I;
- if (SS.fail())
+ tStringStream Stream(*this);
+ Stream >> setbase(Radix) >> I;
+ if (Stream.fail())
return 0;
#endif
@@ -1868,9 +1851,9 @@ int16s Ztring::To_int16s (int8u Radix, ztring_t Options) const I=atoi(c_str());
#endif //defined(UNICODE)
#else
- tStringStream SS(*this);
- SS >> setbase(Radix) >> I;
- if (SS.fail())
+ tStringStream Stream(*this);
+ Stream >> setbase(Radix) >> I;
+ if (Stream.fail())
return 0;
#endif
@@ -1906,9 +1889,9 @@ int16u Ztring::To_int16u (int8u Radix, ztring_t Options) const I=atoi(c_str());
#endif //defined(UNICODE)
#else
- tStringStream SS(*this);
- SS >> setbase(Radix) >> I;
- if (SS.fail())
+ tStringStream Stream(*this);
+ Stream >> setbase(Radix) >> I;
+ if (Stream.fail())
return 0;
#endif
@@ -1944,9 +1927,9 @@ int32s Ztring::To_int32s (int8u Radix, ztring_t Options) const I=atol(c_str());
#endif //defined(UNICODE)
#else
- tStringStream SS(*this);
- SS >> setbase(Radix) >> I;
- if (SS.fail())
+ tStringStream Stream(*this);
+ Stream >> setbase(Radix) >> I;
+ if (Stream.fail())
return 0;
#endif
@@ -1982,9 +1965,9 @@ int32u Ztring::To_int32u (int8u Radix, ztring_t Options) const I=atol(c_str());
#endif //defined(UNICODE)
#else
- tStringStream SS(*this);
- SS >> setbase(Radix) >> I;
- if (SS.fail())
+ tStringStream Stream(*this);
+ Stream >> setbase(Radix) >> I;
+ if (Stream.fail())
return 0;
#endif
@@ -2020,9 +2003,9 @@ int64s Ztring::To_int64s (int8u Radix, ztring_t Options) const I=atoll(c_str());
#endif //defined(UNICODE)
#else
- tStringStream SS(*this);
- SS >> setbase(Radix) >> I;
- if (SS.fail())
+ tStringStream Stream(*this);
+ Stream >> setbase(Radix) >> I;
+ if (Stream.fail())
return 0;
#endif
@@ -2058,9 +2041,9 @@ int64u Ztring::To_int64u (int8u Radix, ztring_t Options) const I=atoll(c_str());
#endif //defined(UNICODE)
#else
- tStringStream SS(*this);
- SS >> setbase(Radix) >> I;
- if (SS.fail())
+ tStringStream Stream(*this);
+ Stream >> setbase(Radix) >> I;
+ if (Stream.fail())
return 0;
#endif
@@ -2156,9 +2139,9 @@ float32 Ztring::To_float32(ztring_t) const #endif
#else
float32 F;
- tStringStream SS(*this);
- SS >> F;
- if (SS.fail())
+ tStringStream Stream(*this);
+ Stream >> F;
+ if (Stream.fail())
return 0;
return F;
@@ -2182,9 +2165,9 @@ float64 Ztring::To_float64(ztring_t) const #endif
#else
float64 F;
- tStringStream SS(*this);
- SS >> F;
- if (SS.fail())
+ tStringStream Stream(*this);
+ Stream >> F;
+ if (Stream.fail())
return 0;
return F;
@@ -2208,9 +2191,9 @@ float80 Ztring::To_float80(ztring_t) const #endif
#else
float80 F;
- tStringStream SS(*this);
- SS >> F;
- if (SS.fail())
+ tStringStream Stream(*this);
+ Stream >> F;
+ if (Stream.fail())
return 0;
return F;
diff --git a/src/thirdparty/ZenLib/ZenLib/Ztring.h b/src/thirdparty/ZenLib/ZenLib/Ztring.h index b2ac6b0c9..85c38f0d9 100644 --- a/src/thirdparty/ZenLib/ZenLib/Ztring.h +++ b/src/thirdparty/ZenLib/ZenLib/Ztring.h @@ -1,23 +1,9 @@ -// ZenLib::Ztring - More methods for std::(w)string
-// Copyright (C) 2002-2012 MediaArea.net SARL, Info@MediaArea.net
-//
-// This software is provided 'as-is', without any express or implied
-// warranty. In no event will the authors be held liable for any damages
-// arising from the use of this software.
-//
-// Permission is granted to anyone to use this software for any purpose,
-// including commercial applications, and to alter it and redistribute it
-// freely, subject to the following restrictions:
-//
-// 1. The origin of this software must not be misrepresented; you must not
-// claim that you wrote the original software. If you use this software
-// in a product, an acknowledgment in the product documentation would be
-// appreciated but is not required.
-// 2. Altered source versions must be plainly marked as such, and must not be
-// misrepresented as being the original software.
-// 3. This notice may not be removed or altered from any source distribution.
-//
-//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+/* Copyright (c) MediaArea.net SARL. All Rights Reserved.
+ *
+ * Use of this source code is governed by a zlib-style license that can
+ * be found in the License.txt file in the root of the source tree.
+ */
+
//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
//
// More methods for std::(w)string
diff --git a/src/thirdparty/ZenLib/ZenLib/ZtringList.cpp b/src/thirdparty/ZenLib/ZenLib/ZtringList.cpp index b5fedb151..9e2d3f725 100644 --- a/src/thirdparty/ZenLib/ZenLib/ZtringList.cpp +++ b/src/thirdparty/ZenLib/ZenLib/ZtringList.cpp @@ -1,24 +1,8 @@ -// ZenLib::ZtringList - More methods for vector<std::(w)string>
-// Copyright (C) 2002-2012 MediaArea.net SARL, Info@MediaArea.net
-//
-// This software is provided 'as-is', without any express or implied
-// warranty. In no event will the authors be held liable for any damages
-// arising from the use of this software.
-//
-// Permission is granted to anyone to use this software for any purpose,
-// including commercial applications, and to alter it and redistribute it
-// freely, subject to the following restrictions:
-//
-// 1. The origin of this software must not be misrepresented; you must not
-// claim that you wrote the original software. If you use this software
-// in a product, an acknowledgment in the product documentation would be
-// appreciated but is not required.
-// 2. Altered source versions must be plainly marked as such, and must not be
-// misrepresented as being the original software.
-// 3. This notice may not be removed or altered from any source distribution.
-//
-//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+/* Copyright (c) MediaArea.net SARL. All Rights Reserved.
+ *
+ * Use of this source code is governed by a zlib-style license that can
+ * be found in the License.txt file in the root of the source tree.
+ */
//---------------------------------------------------------------------------
#include "ZenLib/PreComp.h"
diff --git a/src/thirdparty/ZenLib/ZenLib/ZtringList.h b/src/thirdparty/ZenLib/ZenLib/ZtringList.h index 1923fcf60..f57eee429 100644 --- a/src/thirdparty/ZenLib/ZenLib/ZtringList.h +++ b/src/thirdparty/ZenLib/ZenLib/ZtringList.h @@ -1,22 +1,9 @@ -// ZenLib::ZtringList - More methods for vector<std::(w)string>
-// Copyright (C) 2002-2012 MediaArea.net SARL, Info@MediaArea.net
-//
-// This software is provided 'as-is', without any express or implied
-// warranty. In no event will the authors be held liable for any damages
-// arising from the use of this software.
-//
-// Permission is granted to anyone to use this software for any purpose,
-// including commercial applications, and to alter it and redistribute it
-// freely, subject to the following restrictions:
-//
-// 1. The origin of this software must not be misrepresented; you must not
-// claim that you wrote the original software. If you use this software
-// in a product, an acknowledgment in the product documentation would be
-// appreciated but is not required.
-// 2. Altered source versions must be plainly marked as such, and must not be
-// misrepresented as being the original software.
-// 3. This notice may not be removed or altered from any source distribution.
-//
+/* Copyright (c) MediaArea.net SARL. All Rights Reserved.
+ *
+ * Use of this source code is governed by a zlib-style license that can
+ * be found in the License.txt file in the root of the source tree.
+ */
+
//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
//
// More methods for std::vector<std::(w)string>
diff --git a/src/thirdparty/ZenLib/ZenLib/ZtringListList.cpp b/src/thirdparty/ZenLib/ZenLib/ZtringListList.cpp index 1c2f80b55..046dcf4d1 100644 --- a/src/thirdparty/ZenLib/ZenLib/ZtringListList.cpp +++ b/src/thirdparty/ZenLib/ZenLib/ZtringListList.cpp @@ -1,23 +1,8 @@ -// ZenLib::ZtringListList - More methods for std::vector<std::vector<std::(w)string>>
-// Copyright (C) 2002-2012 MediaArea.net SARL, Info@MediaArea.net
-//
-// This software is provided 'as-is', without any express or implied
-// warranty. In no event will the authors be held liable for any damages
-// arising from the use of this software.
-//
-// Permission is granted to anyone to use this software for any purpose,
-// including commercial applications, and to alter it and redistribute it
-// freely, subject to the following restrictions:
-//
-// 1. The origin of this software must not be misrepresented; you must not
-// claim that you wrote the original software. If you use this software
-// in a product, an acknowledgment in the product documentation would be
-// appreciated but is not required.
-// 2. Altered source versions must be plainly marked as such, and must not be
-// misrepresented as being the original software.
-// 3. This notice may not be removed or altered from any source distribution.
-//
-//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+/* Copyright (c) MediaArea.net SARL. All Rights Reserved.
+ *
+ * Use of this source code is governed by a zlib-style license that can
+ * be found in the License.txt file in the root of the source tree.
+ */
//---------------------------------------------------------------------------
#include "ZenLib/PreComp.h"
diff --git a/src/thirdparty/ZenLib/ZenLib/ZtringListList.h b/src/thirdparty/ZenLib/ZenLib/ZtringListList.h index 682c166c0..f7102458d 100644 --- a/src/thirdparty/ZenLib/ZenLib/ZtringListList.h +++ b/src/thirdparty/ZenLib/ZenLib/ZtringListList.h @@ -1,22 +1,9 @@ -// ZenLib::ZtringListList - More methods for std::vector<std::vector<std::(w)string>>
-// Copyright (C) 2002-2012 MediaArea.net SARL, Info@MediaArea.net
-//
-// This software is provided 'as-is', without any express or implied
-// warranty. In no event will the authors be held liable for any damages
-// arising from the use of this software.
-//
-// Permission is granted to anyone to use this software for any purpose,
-// including commercial applications, and to alter it and redistribute it
-// freely, subject to the following restrictions:
-//
-// 1. The origin of this software must not be misrepresented; you must not
-// claim that you wrote the original software. If you use this software
-// in a product, an acknowledgment in the product documentation would be
-// appreciated but is not required.
-// 2. Altered source versions must be plainly marked as such, and must not be
-// misrepresented as being the original software.
-// 3. This notice may not be removed or altered from any source distribution.
-//
+/* Copyright (c) MediaArea.net SARL. All Rights Reserved.
+ *
+ * Use of this source code is governed by a zlib-style license that can
+ * be found in the License.txt file in the root of the source tree.
+ */
+
//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
//
// More methods for std::vector<std::vector<std::(w)string>>
diff --git a/src/thirdparty/ZenLib/ZenLib/ZtringListListF.cpp b/src/thirdparty/ZenLib/ZenLib/ZtringListListF.cpp index 15c0bf511..a89693d44 100644 --- a/src/thirdparty/ZenLib/ZenLib/ZtringListListF.cpp +++ b/src/thirdparty/ZenLib/ZenLib/ZtringListListF.cpp @@ -1,22 +1,9 @@ -// ZenLib::ZtringListListF - ZtringListList with file load/save
-// Copyright (C) 2002-2012 MediaArea.net SARL, Info@MediaArea.net
-//
-// This software is provided 'as-is', without any express or implied
-// warranty. In no event will the authors be held liable for any damages
-// arising from the use of this software.
-//
-// Permission is granted to anyone to use this software for any purpose,
-// including commercial applications, and to alter it and redistribute it
-// freely, subject to the following restrictions:
-//
-// 1. The origin of this software must not be misrepresented; you must not
-// claim that you wrote the original software. If you use this software
-// in a product, an acknowledgment in the product documentation would be
-// appreciated but is not required.
-// 2. Altered source versions must be plainly marked as such, and must not be
-// misrepresented as being the original software.
-// 3. This notice may not be removed or altered from any source distribution.
-//
+/* Copyright (c) MediaArea.net SARL. All Rights Reserved.
+ *
+ * Use of this source code is governed by a zlib-style license that can
+ * be found in the License.txt file in the root of the source tree.
+ */
+
//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
//
// ZtringListList with file load/save
diff --git a/src/thirdparty/ZenLib/ZenLib/ZtringListListF.h b/src/thirdparty/ZenLib/ZenLib/ZtringListListF.h index a5d23495e..0410fd260 100644 --- a/src/thirdparty/ZenLib/ZenLib/ZtringListListF.h +++ b/src/thirdparty/ZenLib/ZenLib/ZtringListListF.h @@ -1,22 +1,9 @@ -// ZenLib::ZtringListListF - ZtringListList with files
-// Copyright (C) 2002-2012 MediaArea.net SARL, Info@MediaArea.net
-//
-// This software is provided 'as-is', without any express or implied
-// warranty. In no event will the authors be held liable for any damages
-// arising from the use of this software.
-//
-// Permission is granted to anyone to use this software for any purpose,
-// including commercial applications, and to alter it and redistribute it
-// freely, subject to the following restrictions:
-//
-// 1. The origin of this software must not be misrepresented; you must not
-// claim that you wrote the original software. If you use this software
-// in a product, an acknowledgment in the product documentation would be
-// appreciated but is not required.
-// 2. Altered source versions must be plainly marked as such, and must not be
-// misrepresented as being the original software.
-// 3. This notice may not be removed or altered from any source distribution.
-//
+/* Copyright (c) MediaArea.net SARL. All Rights Reserved.
+ *
+ * Use of this source code is governed by a zlib-style license that can
+ * be found in the License.txt file in the root of the source tree.
+ */
+
//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
//
// ZtringListList with file load/save
diff --git a/src/thirdparty/ZenLib/ZenLib/int128s.cpp b/src/thirdparty/ZenLib/ZenLib/int128s.cpp index 74fa9ba01..e7a928ff5 100644 --- a/src/thirdparty/ZenLib/ZenLib/int128s.cpp +++ b/src/thirdparty/ZenLib/ZenLib/int128s.cpp @@ -1,23 +1,9 @@ -// int128u - integer 8 bytes
-// Copyright (C) 2007-2012 MediaArea.net SARL, Info@MediaArea.net
-//
-// This software is provided 'as-is', without any express or implied
-// warranty. In no event will the authors be held liable for any damages
-// arising from the use of this software.
-//
-// Permission is granted to anyone to use this software for any purpose,
-// including commercial applications, and to alter it and redistribute it
-// freely, subject to the following restrictions:
-//
-// 1. The origin of this software must not be misrepresented; you must not
-// claim that you wrote the original software. If you use this software
-// in a product, an acknowledgment in the product documentation would be
-// appreciated but is not required.
-// 2. Altered source versions must be plainly marked as such, and must not be
-// misrepresented as being the original software.
-// 3. This notice may not be removed or altered from any source distribution.
-//
-//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+/* Copyright (c) MediaArea.net SARL. All Rights Reserved.
+ *
+ * Use of this source code is governed by a zlib-style license that can
+ * be found in the License.txt file in the root of the source tree.
+ */
+
//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
//
// based on http://Tringi.Mx-3.cz
diff --git a/src/thirdparty/ZenLib/ZenLib/int128s.h b/src/thirdparty/ZenLib/ZenLib/int128s.h index db3e1822b..19f609a1b 100644 --- a/src/thirdparty/ZenLib/ZenLib/int128s.h +++ b/src/thirdparty/ZenLib/ZenLib/int128s.h @@ -1,23 +1,9 @@ -// int128s - integer 8 bytes
-// Copyright (C) 2007-2012 MediaArea.net SARL, Info@MediaArea.net
-//
-// This software is provided 'as-is', without any express or implied
-// warranty. In no event will the authors be held liable for any damages
-// arising from the use of this software.
-//
-// Permission is granted to anyone to use this software for any purpose,
-// including commercial applications, and to alter it and redistribute it
-// freely, subject to the following restrictions:
-//
-// 1. The origin of this software must not be misrepresented; you must not
-// claim that you wrote the original software. If you use this software
-// in a product, an acknowledgment in the product documentation would be
-// appreciated but is not required.
-// 2. Altered source versions must be plainly marked as such, and must not be
-// misrepresented as being the original software.
-// 3. This notice may not be removed or altered from any source distribution.
-//
-//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+/* Copyright (c) MediaArea.net SARL. All Rights Reserved.
+ *
+ * Use of this source code is governed by a zlib-style license that can
+ * be found in the License.txt file in the root of the source tree.
+ */
+
//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
//
// based on http://Tringi.Mx-3.cz
diff --git a/src/thirdparty/ZenLib/ZenLib/int128u.cpp b/src/thirdparty/ZenLib/ZenLib/int128u.cpp index 0f59e968e..8a04c4f2d 100644 --- a/src/thirdparty/ZenLib/ZenLib/int128u.cpp +++ b/src/thirdparty/ZenLib/ZenLib/int128u.cpp @@ -1,23 +1,9 @@ -// int128u - integer 8 bytes
-// Copyright (C) 2007-2012 MediaArea.net SARL, Info@MediaArea.net
-//
-// This software is provided 'as-is', without any express or implied
-// warranty. In no event will the authors be held liable for any damages
-// arising from the use of this software.
-//
-// Permission is granted to anyone to use this software for any purpose,
-// including commercial applications, and to alter it and redistribute it
-// freely, subject to the following restrictions:
-//
-// 1. The origin of this software must not be misrepresented; you must not
-// claim that you wrote the original software. If you use this software
-// in a product, an acknowledgment in the product documentation would be
-// appreciated but is not required.
-// 2. Altered source versions must be plainly marked as such, and must not be
-// misrepresented as being the original software.
-// 3. This notice may not be removed or altered from any source distribution.
-//
-//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+/* Copyright (c) MediaArea.net SARL. All Rights Reserved.
+ *
+ * Use of this source code is governed by a zlib-style license that can
+ * be found in the License.txt file in the root of the source tree.
+ */
+
//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
//
// based on http://Tringi.Mx-3.cz
diff --git a/src/thirdparty/ZenLib/ZenLib/int128u.h b/src/thirdparty/ZenLib/ZenLib/int128u.h index 68906d1df..9e56233ee 100644 --- a/src/thirdparty/ZenLib/ZenLib/int128u.h +++ b/src/thirdparty/ZenLib/ZenLib/int128u.h @@ -1,23 +1,9 @@ -// int128u - integer 8 bytes
-// Copyright (C) 2007-2012 MediaArea.net SARL, Info@MediaArea.net
-//
-// This software is provided 'as-is', without any express or implied
-// warranty. In no event will the authors be held liable for any damages
-// arising from the use of this software.
-//
-// Permission is granted to anyone to use this software for any purpose,
-// including commercial applications, and to alter it and redistribute it
-// freely, subject to the following restrictions:
-//
-// 1. The origin of this software must not be misrepresented; you must not
-// claim that you wrote the original software. If you use this software
-// in a product, an acknowledgment in the product documentation would be
-// appreciated but is not required.
-// 2. Altered source versions must be plainly marked as such, and must not be
-// misrepresented as being the original software.
-// 3. This notice may not be removed or altered from any source distribution.
-//
-//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+/* Copyright (c) MediaArea.net SARL. All Rights Reserved.
+ *
+ * Use of this source code is governed by a zlib-style license that can
+ * be found in the License.txt file in the root of the source tree.
+ */
+
//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
//
// based on http://Tringi.Mx-3.cz
|