[SCM] libzen/master: Imported Upstream version 0.4.34
hyperair at users.alioth.debian.org
hyperair at users.alioth.debian.org
Mon Dec 19 09:07:48 UTC 2016
The following commit has been merged in the master branch:
commit 9ee39c7472fac15bea1d4a1781563bd97536acaa
Author: Chow Loong Jin <hyperair at debian.org>
Date: Mon Dec 19 16:50:47 2016 +0800
Imported Upstream version 0.4.34
diff --git a/.travis.yml b/.travis.yml
index 0a7cc59..81b15da 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,4 +1,5 @@
-sudo: false
+sudo: required
+dist: trusty
language: cpp
compiler: gcc
-script: cd Project/GNU/Library/ && ./autogen.sh && ./configure && make
+script: cd Project/GNU/Library/ && ./autogen.sh && ./configure && make && mkdir ../../CMake/Build && cd ../../CMake/Build && cmake .. && make
diff --git a/History.txt b/History.txt
index df0dc72..f8720f2 100644
--- a/History.txt
+++ b/History.txt
@@ -1,3 +1,13 @@
+Version 0.4.34, 2016-11-30
+--------------
++ Minor performance optimizations and cleanup (Thanks to Pavel Pimenov)
++ Add PKGBUILD file for Arch Linux
++ CMake improvements (Thanks to evpobr)
++ Build scripts improvements
+x Fix for Ubuntu 16.10
+x Change lib name for Fedora and RHEL/CentOS to follow their guidelines
+x Update Visual Studio project files (support of 32-bit CPU without SSE)
+
Version 0.4.33, 2016-02-29
--------------
x File::Open(): using now FILE_APPEND_DATA on windows when append mode is requested
diff --git a/Project/CMake/CMakeLists.txt b/Project/CMake/CMakeLists.txt
index ddd0c04..060bc18 100644
--- a/Project/CMake/CMakeLists.txt
+++ b/Project/CMake/CMakeLists.txt
@@ -2,6 +2,9 @@ project(ZenLib)
cmake_minimum_required(VERSION 2.8.11)
+# Allow use of the LOCATION target property with CMake version >= 2.8.12
+cmake_policy(SET CMP0026 OLD)
+
if(WIN32)
option(BUILD_SHARED_LIBS "Build shared libs" OFF)
else()
@@ -14,7 +17,7 @@ set(ZenLib_SOURCES_PATH ${CMAKE_CURRENT_SOURCE_DIR}/../../Source)
set(ZenLib_MAJOR_VERSION "0")
set(ZenLib_MINOR_VERSION "4")
-set(ZenLib_PATCH_VERSION "33")
+set(ZenLib_PATCH_VERSION "34")
set(ZenLib_VERSION_STRING "${ZenLib_MAJOR_VERSION}.${ZenLib_MINOR_VERSION}.${ZenLib_PATCH_VERSION}")
@@ -105,8 +108,10 @@ else()
set(ZenLib_Unicode "no")
endif()
-try_compile(SIZE_T_IS_NOT_LONG ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/size_t_is_long_check.cpp)
-if(NOT SIZE_T_IS_NOT_LONG)
+include(CheckTypeSize)
+check_type_size(size_t SIZE_T_SIZE)
+check_type_size(long LONG_SIZE)
+if((LONG_SIZE GREATER 4) AND (SIZE_T_SIZE EQUAL LONG_SIZE))
target_compile_definitions(zen PUBLIC SIZE_T_IS_LONG)
endif()
diff --git a/Project/CMake/size_t_is_long_check.cpp b/Project/CMake/size_t_is_long_check.cpp
deleted file mode 100644
index c54230a..0000000
--- a/Project/CMake/size_t_is_long_check.cpp
+++ /dev/null
@@ -1,9 +0,0 @@
-#include <cstdlib>
-void foo(signed int) {}
-void foo(unsigned int) {}
-
-int main ()
-{
- foo(size_t(0));
- return 0;
-}
diff --git a/Project/GNU/Library/Makefile.am b/Project/GNU/Library/Makefile.am
index 189852d..2187ee7 100644
--- a/Project/GNU/Library/Makefile.am
+++ b/Project/GNU/Library/Makefile.am
@@ -75,8 +75,6 @@ zen_format_http_HEADERS = \
../../../Source/ZenLib/Format/Http/Http_Handler.h \
../../../Source/ZenLib/Format/Http/Http_Cookies.h
-bin_SCRIPTS = libzen-config
-
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = libzen.pc
diff --git a/Project/GNU/Library/configure.ac b/Project/GNU/Library/configure.ac
index d14724a..2344e54 100644
--- a/Project/GNU/Library/configure.ac
+++ b/Project/GNU/Library/configure.ac
@@ -5,7 +5,7 @@ dnl #########################################################################
dnl -------------------------------------------------------------------------
dnl Name and version
dnl
-AC_INIT([libzen], [0.4.33])
+AC_INIT([libzen], [0.4.34])
dnl -------------------------------------------------------------------------
dnl Test if we are at the good place
@@ -24,7 +24,7 @@ dnl
AC_PROG_CC
AC_PROG_CXX
AC_PROG_CPP
-AC_DISABLE_SHARED
+AC_DISABLE_STATIC
AC_LIBTOOL_WIN32_DLL
AC_PROG_LIBTOOL
AC_PROG_INSTALL
@@ -123,8 +123,12 @@ dnl #########################################################################
dnl -------------------------------------------------------------------------
dnl Common
dnl
-ZenLib_LIBS="-L$(pwd) -lzen -lpthread -lstdc++ $ZenLib_LIBS"
-ZenLib_LIBS_Static="$(pwd)/.libs/libzen.a -lpthread -lstdc++ $ZenLib_LIBS_Static"
+if test "$enable_shared" = "yes"; then
+ ZenLib_LIBS="-L$(pwd)/.libs -lzen -lpthread -lstdc++ $ZenLib_LIBS"
+fi
+if test "$enable_static" = "yes"; then
+ ZenLib_LIBS_Static="$(pwd)/.libs/libzen.a -lpthread -lstdc++ $ZenLib_LIBS_Static"
+fi
dnl #########################################################################
dnl ### C/C++ compiler options used to compile
diff --git a/Project/GNU/Library/libzen-config.in b/Project/GNU/Library/libzen-config.in
index 75cda8b..81d7916 100644
--- a/Project/GNU/Library/libzen-config.in
+++ b/Project/GNU/Library/libzen-config.in
@@ -1,12 +1,12 @@
-#!/bin/bash
+#!/bin/sh
if test "$1" = "CXXFLAGS"; then
echo @ZenLib_CXXFLAGS@
fi
-if test "$1" = "LIBS"; then
+if test "$1" = "LIBS" -a -n "@ZenLib_LIBS@"; then
echo @ZenLib_LIBS@
fi
-if test "$1" = "LIBS_Static"; then
+if test "$1" = "LIBS_Static" -a -n "@ZenLib_LIBS_Static@"; then
echo @ZenLib_LIBS_Static@
fi
if test "$1" = "Unicode"; then
diff --git a/Project/GNU/PKGBUILD b/Project/GNU/PKGBUILD
new file mode 100644
index 0000000..bbc86c1
--- /dev/null
+++ b/Project/GNU/PKGBUILD
@@ -0,0 +1,36 @@
+# $Id$
+# Maintainer: MediaArea.net SARL <info at mediaarea.net>
+# Contributor: hydro <hydro at freenet.de>
+
+pkgname=libzen
+pkgver=0.4.34
+pkgrel=1
+pkgdesc="shared library for libmediainfo and mediainfo"
+arch=('i686' 'x86_64')
+url="http://mediaarea.net"
+license=('BSD')
+depends=('gcc-libs')
+makedepends=('libtool' 'automake' 'autoconf')
+source=(${pkgname}_${pkgver}.orig.tar.xz)
+md5sums=('00000000000000000000000000000000')
+
+build() {
+ cd $srcdir/ZenLib/Project/GNU/Library
+ [ -x configure ] || sh ./autogen.sh
+ [ -f Makefile ] || ./configure --prefix=/usr --enable-shared --disable-static
+ make clean
+ make
+}
+
+package() {
+ cd $srcdir/ZenLib/Project/GNU/Library
+ make DESTDIR=$pkgdir install
+ install -dm 755 $pkgdir/usr/include/ZenLib
+ install -m 644 $srcdir/ZenLib/Source/ZenLib/*.h $pkgdir/usr/include/ZenLib
+ for i in HTTP_Client Format/Html Format/Http; do
+ install -dm0755 $pkgdir/usr/include/ZenLib/$i
+ install -m0644 $srcdir/ZenLib/Source/ZenLib/$i/*.h $pkgdir/usr/include/ZenLib/$i
+ done
+ install -D -m 644 $srcdir/ZenLib/License.txt $pkgdir/usr/share/licenses/libzen/License.txt
+}
+
diff --git a/Project/GNU/libzen.dsc b/Project/GNU/libzen.dsc
index 52ca451..eab6515 100644
--- a/Project/GNU/libzen.dsc
+++ b/Project/GNU/libzen.dsc
@@ -2,7 +2,7 @@ Format: 3.0 (quilt)
Source: libzen
Binary: libzen-dev, libzen0, libzen-doc
Architecture: any all
-Version: 0.4.33-1
+Version: 0.4.34-1
Maintainer: MediaArea.net SARL <info at mediaarea.net>
Homepage: http://mediainfo.sourceforge.net
Standards-Version: 3.9.6
@@ -13,12 +13,13 @@ Package-List:
libzen-dev deb libdevel optional arch=any
libzen-doc deb doc optional arch=all
libzen0 deb libs optional arch=any
+ libzen0-dbg deb debug optional arch=any
Checksums-Sha1:
- 0000000000000000000000000000000000000000 000000 libzen_0.4.33.orig.tar.xz
- 0000000000000000000000000000000000000000 000000 libzen_0.4.33-1.debian.tar.xz
+ 0000000000000000000000000000000000000000 000000 libzen_0.4.34.orig.tar.xz
+ 0000000000000000000000000000000000000000 000000 libzen_0.4.34-1.debian.tar.xz
Checksums-Sha256:
- 0000000000000000000000000000000000000000000000000000000000000000 000000 libzen_0.4.33.orig.tar.xz
- 0000000000000000000000000000000000000000000000000000000000000000 000000 libzen_0.4.33-1.debian.tar.xz
+ 0000000000000000000000000000000000000000000000000000000000000000 000000 libzen_0.4.34.orig.tar.xz
+ 0000000000000000000000000000000000000000000000000000000000000000 000000 libzen_0.4.34-1.debian.tar.xz
Files:
- 00000000000000000000000000000000 000000 libzen_0.4.33.orig.tar.xz
- 00000000000000000000000000000000 000000 libzen_0.4.33-1.debian.tar.xz
+ 00000000000000000000000000000000 000000 libzen_0.4.34.orig.tar.xz
+ 00000000000000000000000000000000 000000 libzen_0.4.34-1.debian.tar.xz
diff --git a/Project/GNU/libzen.spec b/Project/GNU/libzen.spec
index 7303fb1..7ec5373 100644
--- a/Project/GNU/libzen.spec
+++ b/Project/GNU/libzen.spec
@@ -1,15 +1,30 @@
-%define libzen_version 0.4.33
+%define libzen_version 0.4.34
-Name: libzen
+%if 0%{?fedora} || 0%{?centos_version} >= 600 || 0%{?rhel_version} >= 600
+%define package_with_0_ending 0
+%define libzen_name libzen
+%else
+%define package_with_0_ending 1
+%define libzen_name libzen0
+%endif
+
+%define name_without_0_ending libzen
+
+Name: %{libzen_name}
Version: %{libzen_version}
Release: 1
-Summary: C++ utility library
+Summary: C++ utility library -- runtime
License: Zlib
Group: System/Libraries
URL: http://sourceforge.net/projects/zenlib
Packager: MediaArea.net SARL <info at mediaarea.net>
-Source: %{name}_%{version}.tar.gz
+Source: %{name_without_0_ending}_%{version}.tar.gz
+Requires: glibc
+%if !%{package_with_0_ending}
+Provides: %{name_without_0_ending}0 = %{version}
+Obsoletes: %{name_without_0_ending}0 < %{version}
+%endif
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
BuildRequires: gcc-c++
@@ -25,38 +40,31 @@ ZenLib is a C++ utility library. It includes classes for handling strings,
configuration, bit streams, threading, translation, and cross-platform
operating system functions.
-%package -n %{name}0
-Summary: C++ utility library -- runtime
-Group: System/Libraries
-Requires: glibc
-
-%description -n %{name}0
-ZenLib is a C++ utility library. It includes classes for handling strings,
-configuration, bit streams, threading, translation, and cross-platform
-operating system functions.
-
This package contains the headers required for compiling applications/libraries
which use this library.
-%package doc
+%package -n %{name_without_0_ending}-doc
Summary: C++ utility library -- documentation
Group: Development/Libraries
-Requires: %{name}0 = %{version}
+Requires: %{name} = %{version}
+%if !0%{?suse_version} || 0%{?suse_version} >= 1200
+BuildArch: noarch
+%endif
-%description doc
+%description -n %{name_without_0_ending}-doc
ZenLib is a C++ utility library. It includes classes for handling strings,
configuration, bit streams, threading, translation, and cross-platform
operating system functions.
This package contains the documentation
-%package devel
+%package -n %{name_without_0_ending}-devel
Summary: C++ utility library -- development
Group: Development/Libraries
-Requires: %{name}0%{?_isa} = %{version}
-Requires: glibc-devel
+Requires: %{name}%{?_isa} = %{version}
+Requires: glibc-devel
-%description devel
+%description -n %{name_without_0_ending}-devel
ZenLib is a C++ utility library. It includes classes for handling strings,
configuration, bit streams, threading, translation, and cross-platform
operating system functions.
@@ -85,6 +93,7 @@ export CXXFLAGS="%{optflags}"
#Make documentation
pushd Source/Doc/
+ doxygen -u Doxyfile
doxygen Doxyfile
popd
cp Source/Doc/*.html ./
@@ -101,7 +110,7 @@ pushd Project/GNU/Library
make install DESTDIR=%{buildroot}
popd
-#Install headers and ZenLib-config
+#Install headers
install -dm 755 %{buildroot}%{_includedir}/ZenLib
install -m 644 Source/ZenLib/*.h \
%{buildroot}%{_includedir}/ZenLib
@@ -111,37 +120,39 @@ for i in HTTP_Client Format/Html Format/Http; do
%{buildroot}%{_includedir}/ZenLib/$i
done
-sed -i -e 's|Version: |Version: %{version}|g' \
- Project/GNU/Library/%{name}.pc
-install -dm 755 %{buildroot}%{_libdir}/pkgconfig
-install -m 644 Project/GNU/Library/%{name}.pc \
- %{buildroot}%{_libdir}/pkgconfig
-
+%post -p /sbin/ldconfig
-%post -n %{name}0 -p /sbin/ldconfig
+%postun -p /sbin/ldconfig
-%postun -n %{name}0 -p /sbin/ldconfig
-
-%files -n %{name}0
+%files
%defattr(-,root,root,-)
-%doc History.txt License.txt ReadMe.txt
-%{_libdir}/%{name}.so.*
-
-%files doc
+%doc History.txt ReadMe.txt
+%if 0%{?fedora} || 0%{?centos_version} >= 700 || 0%{?rhel_version} >= 700
+%license License.txt
+%else
+%doc License.txt
+%endif
+%{_libdir}/%{name_without_0_ending}.so.*
+
+%if 0%{?rhel} == 5
+%exclude %{_usr}/lib/debug
+%exclude %{_usr}/src/debug
+%endif
+
+%files -n %{name_without_0_ending}-doc
%defattr(-,root,root,-)
%doc Documentation.html
%doc Doc
-%files devel
+%files -n %{name_without_0_ending}-devel
%defattr(-,root,root,-)
-%{_bindir}/%{name}-config
%{_includedir}/ZenLib
-%{_libdir}/%{name}.so
-%{_libdir}/%{name}.la
+%{_libdir}/%{name_without_0_ending}.so
+%{_libdir}/%{name_without_0_ending}.la
%{_libdir}/pkgconfig/*.pc
%changelog
-* Thu Jan 01 2009 MediaArea.net SARL <info at mediaarea.net> - 0.4.33-0
+* Thu Jan 01 2009 MediaArea.net SARL <info at mediaarea.net> - 0.4.34-0
- See History.txt for more info and real dates
- Previous packages made by Toni Graffy <toni at links2linux.de>
- Fedora style made by Vasiliy N. Glazov <vascom2 at gmail.com>
diff --git a/Project/MSVC2013/Library/ZenLib.vcxproj b/Project/MSVC2013/Library/ZenLib.vcxproj
index f5f9d6f..0927030 100644
--- a/Project/MSVC2013/Library/ZenLib.vcxproj
+++ b/Project/MSVC2013/Library/ZenLib.vcxproj
@@ -90,6 +90,7 @@
<MultiProcessorCompilation>true</MultiProcessorCompilation>
<PrecompiledHeader>Use</PrecompiledHeader>
<PrecompiledHeaderFile>ZenLib/PreComp.h</PrecompiledHeaderFile>
+ <EnableEnhancedInstructionSet>NoExtensions</EnableEnhancedInstructionSet>
</ClCompile>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
diff --git a/Project/MSVC2015/Library/ZenLib.vcxproj b/Project/MSVC2015/Library/ZenLib.vcxproj
index 8a9fbea..f9679b4 100644
--- a/Project/MSVC2015/Library/ZenLib.vcxproj
+++ b/Project/MSVC2015/Library/ZenLib.vcxproj
@@ -93,6 +93,7 @@
<PrecompiledHeader>Use</PrecompiledHeader>
<PrecompiledHeaderFile>ZenLib/PreComp.h</PrecompiledHeaderFile>
<DebugInformationFormat>None</DebugInformationFormat>
+ <EnableEnhancedInstructionSet>NoExtensions</EnableEnhancedInstructionSet>
</ClCompile>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
diff --git a/Project/OBS/deb6.debian/changelog b/Project/OBS/deb6.debian/changelog
index f882e8f..02e2ef6 100644
--- a/Project/OBS/deb6.debian/changelog
+++ b/Project/OBS/deb6.debian/changelog
@@ -1,4 +1,4 @@
-libzen (0.4.33) unstable; urgency=low
+libzen (0.4.34) unstable; urgency=low
* See History.txt for more info and real dates
diff --git a/Project/OBS/deb6.debian/control b/Project/OBS/deb6.debian/control
index 7566aaa..e359178 100644
--- a/Project/OBS/deb6.debian/control
+++ b/Project/OBS/deb6.debian/control
@@ -18,7 +18,15 @@ Description: libmediainfo mandatory library (dev)
Package: libzen0
Section: libs
Architecture: any
-Depends:
+Depends: ${shlibs:Depends}
Replaces: libzen0-dev
Description: libmediainfo mandatory library
This package includes the shared library
+
+Package: libzen0-dbg
+Section: debug
+Architecture: any
+Priority: extra
+Depends: libzen0 (= ${binary:Version})
+Description: libmediainfo mandatory library
+ This package includes the debugging symbols
diff --git a/Project/OBS/deb6.debian/rules b/Project/OBS/deb6.debian/rules
index c0c9f88..1a1e797 100644
--- a/Project/OBS/deb6.debian/rules
+++ b/Project/OBS/deb6.debian/rules
@@ -4,13 +4,6 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-# shared library versions
-version=`ls src/.libs/lib*.so.* | \
- awk '{if (match($$0,/[0-9]+\.[0-9]+\.[0-9]+$$/)) print substr($$0,RSTART)}'`
-major=`ls src/.libs/lib*.so.* | \
- awk '{if (match($$0,/\.so\.[0-9]+$$/)) print substr($$0,RSTART+4)}'`
-
-
configure: configure-stamp
configure-stamp:
dh_testdir
@@ -62,10 +55,6 @@ install: build
install -dm 755 $(CURDIR)/debian/tmp/usr/include/ZenLib/Format/Http
install -m 644 Source/ZenLib/Format/Http/*.h $(CURDIR)/debian/tmp/usr/include/ZenLib/Format/Http
- sed -i -e 's|Version: |Version: %{version}|g' Project/GNU/Library/libzen.pc
- install -dm 755 $(CURDIR)/debian/tmp/usr/lib/pkgconfig
- install -m 644 Project/GNU/Library/libzen.pc $(CURDIR)/debian/tmp/usr/lib/pkgconfig
-
install -dm 755 $(CURDIR)/debian/tmp/usr/share/doc/libzen0
install -m 644 *.txt $(CURDIR)/debian/tmp/usr/share/doc/libzen0
install -dm 755 $(CURDIR)/debian/tmp/usr/share/doc/libzen-dev
@@ -100,7 +89,7 @@ binary-arch: build install
# dh_installinfo
dh_installman
dh_link
- dh_strip
+ dh_strip --dbg-package=libzen0-dbg
dh_compress
dh_fixperms
# dh_perl
diff --git a/Project/OBS/deb6.dsc b/Project/OBS/deb6.dsc
index f05b0ba..be61515 100644
--- a/Project/OBS/deb6.dsc
+++ b/Project/OBS/deb6.dsc
@@ -1,11 +1,11 @@
Format: 1.0
Source: libzen
-Binary: libzen-dev, libzen0
+Binary: libzen-dev, libzen0, libzen0-dbg
Architecture: any
-Version: 0.4.33
+Version: 0.4.34-1deb6
Maintainer: MediaArea.net SARL <info at mediaarea.net>
Homepage: http://mediainfo.sourceforge.net
Standards-Version: 3.7.3
Build-Depends: debhelper (>= 5), doxygen, tofrodos, automake, autoconf, libtool
-Files:
- 00000000000000000000000000000000 000000 libzen_0.4.33.tar.gz
+Files:
+ 00000000000000000000000000000000 000000 libzen_0.4.34-1deb6.tar.gz
diff --git a/Project/OBS/deb9.debian/changelog b/Project/OBS/deb9.debian/changelog
index 791a784..b1cef66 100644
--- a/Project/OBS/deb9.debian/changelog
+++ b/Project/OBS/deb9.debian/changelog
@@ -1,6 +1,6 @@
-libzen (0.4.33-1) experimental; urgency=medium
+libzen (0.4.34-1) experimental; urgency=medium
- * Upstream version 0.4.33
+ * Upstream version 0.4.34
For details, see https://github.com/MediaArea/ZenLib/blob/master/History.txt
-- MediaArea <info at mediaarea.net> Mon, 02 Nov 2015 10:30:00 +0100
diff --git a/Project/OBS/deb9.debian/control b/Project/OBS/deb9.debian/control
index 21b90ed..6d01079 100644
--- a/Project/OBS/deb9.debian/control
+++ b/Project/OBS/deb9.debian/control
@@ -51,3 +51,17 @@ Description: ZenLib C++ utility library -- documentation
.
This package contains the Doxygen generated API reference for developing
applications/libraries using this library.
+
+Package: libzen0v5-dbg
+Architecture: any
+Section: debug
+Priority: extra
+Depends: libzen0v5 (= ${binary:Version}), ${misc:Depends}
+Replaces: libzen0-dbg
+Conflicts: libzen0-dbg
+Description: ZenLib C++ utility library -- debugging symbol
+ ZenLib is a C++ utility library. It includes classes for handling strings,
+ configuration, bit streams, threading, translation, and cross-platform
+ operating system functions.
+ .
+ This package contains the debugging symbols of this library.
diff --git a/Project/OBS/deb9.debian/libzen0v5.symbols b/Project/OBS/deb9.debian/libzen0v5.symbols
index 571901c..adbe224 100644
--- a/Project/OBS/deb9.debian/libzen0v5.symbols
+++ b/Project/OBS/deb9.debian/libzen0v5.symbols
@@ -129,7 +129,6 @@ libzen.so.0 libzen0v5 #MINVER#
(c++)"ZenLib::Format::Html::Request::Request(ZenLib::Format::Html::Request const&)@Base" 0.4.23
(c++)"ZenLib::Format::Http::Char2Hex(unsigned char)@Base" 0.4.23
(c++)"ZenLib::Format::Http::Char2Hex(wchar_t)@Base" 0.4.23
- (c++)"ZenLib::Format::Http::Cookie::~Cookie()@Base" 0.4.23
(c++)"ZenLib::Format::Http::Cookies::Cookies()@Base" 0.4.23
(c++)"ZenLib::Format::Http::Cookies::Create_Lines(std::basic_ostream<char, std::char_traits<char> >&)@Base" 0.4.23
(c++)"ZenLib::Format::Http::Cookies::Set(std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, long, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, bool)@Base" 0.4.31-2~
@@ -416,4 +415,5 @@ libzen.so.0 libzen0v5 #MINVER#
(optional|c++|regex)"^std::" 0.4.23
(optional|c++|regex)"^(void|ZenLib::ZtringList\*|ZenLib::Ztring\*|bool|wchar_t\*) std::" 0.4.23
(optional|c++|regex)"^ZenLib::Ztring::ToZtring" 0.4.23
+ (optional|c++)"ZenLib::Format::Http::Cookie::~Cookie()@Base" 0.4.23
(optional|c++)"ZenLib::Ztring::From_Number(unsigned long, unsigned char)@Base" 0.4.23
diff --git a/Project/OBS/deb9.debian/rules b/Project/OBS/deb9.debian/rules
index 24ff138..0327ae4 100755
--- a/Project/OBS/deb9.debian/rules
+++ b/Project/OBS/deb9.debian/rules
@@ -1,8 +1,6 @@
#!/usr/bin/make -f
# -*- makefile -*-
-version = $(shell dpkg-parsechangelog | sed -nre 's/^Version: (.*)-.*/\1/p')
-
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
@@ -17,8 +15,6 @@ override_dh_auto_build:
cd Source/Doc && doxygen Doxyfile
cp Source/Doc/*.html ./
- sed -i -e 's|Version: |Version: $(version)|g' $(builddir)/libzen.pc
-
dh_auto_build -D$(libpath) -B$(builddir)
override_dh_auto_clean:
@@ -35,5 +31,8 @@ override_dh_installdocs:
override_dh_makeshlibs:
dh_makeshlibs -- -c4
+override_dh_strip:
+ dh_strip --dbg-package=libzen0v5-dbg
+
%:
dh $@ --parallel
diff --git a/Project/OBS/deb9.dsc b/Project/OBS/deb9.dsc
index fb9be74..ed8f70f 100644
--- a/Project/OBS/deb9.dsc
+++ b/Project/OBS/deb9.dsc
@@ -2,7 +2,7 @@ Format: 3.0 (quilt)
Source: libzen
Binary: libzen-dev, libzen0v5, libzen-doc
Architecture: any all
-Version: 0.4.33-1
+Version: 0.4.34-1deb9
Maintainer: MediaArea.net SARL <info at mediaarea.net>
Homepage: http://mediainfo.sourceforge.net
Standards-Version: 3.9.6
@@ -13,12 +13,13 @@ Package-List:
libzen-dev deb libdevel optional arch=any
libzen-doc deb doc optional arch=all
libzen0v5 deb libs optional arch=any
+ libzen0v5-dbg deb debug optional arch=any
Checksums-Sha1:
- 0000000000000000000000000000000000000000 000000 libzen_0.4.33.orig.tar.xz
- 0000000000000000000000000000000000000000 000000 libzen_0.4.33-1.debian.tar.xz
+ 0000000000000000000000000000000000000000 000000 libzen_0.4.34.orig.tar.xz
+ 0000000000000000000000000000000000000000 000000 libzen_0.4.34-1deb9.debian.tar.xz
Checksums-Sha256:
- 0000000000000000000000000000000000000000000000000000000000000000 000000 libzen_0.4.33.orig.tar.xz
- 0000000000000000000000000000000000000000000000000000000000000000 000000 libzen_0.4.33-1.debian.tar.xz
+ 0000000000000000000000000000000000000000000000000000000000000000 000000 libzen_0.4.34.orig.tar.xz
+ 0000000000000000000000000000000000000000000000000000000000000000 000000 libzen_0.4.34-1deb9.debian.tar.xz
Files:
- 00000000000000000000000000000000 000000 libzen_0.4.33.orig.tar.xz
- 00000000000000000000000000000000 000000 libzen_0.4.33-1.debian.tar.xz
+ 00000000000000000000000000000000 000000 libzen_0.4.34.orig.tar.xz
+ 00000000000000000000000000000000 000000 libzen_0.4.34-1deb9.debian.tar.xz
diff --git a/Project/Qt/ReadMe.txt b/Project/Qt/ReadMe.txt
new file mode 100644
index 0000000..aec3248
--- /dev/null
+++ b/Project/Qt/ReadMe.txt
@@ -0,0 +1,8 @@
+In order to build with qmake:
+qmake
+make
+
+This will create Library/libzen.a
+
+You may consider to add some configuration options:
+qmake CONFIG="c++11" QMAKE_CXXFLAGS_WARN_ON="-Wno-unused-private-field -Wno-unused-const-variable -Wno-pointer-sign -Wno-invalid-source-encoding -Wno-pointer-sign"
\ No newline at end of file
diff --git a/Project/Qt/ZenLib.pro b/Project/Qt/ZenLib.pro
new file mode 100644
index 0000000..7fecc8e
--- /dev/null
+++ b/Project/Qt/ZenLib.pro
@@ -0,0 +1,98 @@
+# ZenLib w/o HTTP Client (see end of file to enable)
+# in order to build with qmake just copy this file to the sources
+# then open with QtCreator and build
+TEMPLATE = lib
+CONFIG += staticlib
+TARGET = zen
+INCLUDEPATH += . .. HTTP_Client
+
+QMAKE_CXXFLAGS += -D_UNICODE
+
+# surpressing way too many warnings here, with a heavy sigh
+# these should be looked at one group at a time
+QMAKE_CFLAGS_WARN_ON -= -Wall
+QMAKE_CXXFLAGS_WARN_ON -= -Wall
+
+!win32-msvc* {
+QMAKE_CXXFLAGS_WARN_ON += -Wno-unused-parameter \
+-Wno-ignored-qualifiers \
+-Wno-missing-braces \
+-Wno-parentheses
+}
+
+INCLUDEPATH += \
+ ../../Source
+
+# Input
+HEADERS += \
+ ../../Source/ZenLib/BitStream.h \
+ ../../Source/ZenLib/BitStream_Fast.h \
+ ../../Source/ZenLib/BitStream_LE.h \
+ ../../Source/ZenLib/Conf.h \
+ ../../Source/ZenLib/Conf_Internal.h \
+ ../../Source/ZenLib/CriticalSection.h \
+ ../../Source/ZenLib/Dir.h \
+ ../../Source/ZenLib/File.h \
+ ../../Source/ZenLib/FileName.h \
+ ../../Source/ZenLib/Format/Html/Html_Handler.h \
+ ../../Source/ZenLib/Format/Html/Html_Request.h \
+ ../../Source/ZenLib/Format/Http/Http_Cookies.h \
+ ../../Source/ZenLib/Format/Http/Http_Handler.h \
+ ../../Source/ZenLib/Format/Http/Http_Request.h \
+ ../../Source/ZenLib/Format/Http/Http_Utils.h \
+ ../../Source/ZenLib/InfoMap.h \
+ ../../Source/ZenLib/int128s.h \
+ ../../Source/ZenLib/int128u.h \
+ ../../Source/ZenLib/MemoryDebug.h \
+ ../../Source/ZenLib/MemoryUtils.h \
+ ../../Source/ZenLib/OS_Utils.h \
+ ../../Source/ZenLib/PreComp.h \
+ ../../Source/ZenLib/Thread.h \
+ ../../Source/ZenLib/Trace.h \
+ ../../Source/ZenLib/Translation.h \
+ ../../Source/ZenLib/Utils.h \
+ ../../Source/ZenLib/Ztring.h \
+ ../../Source/ZenLib/ZtringList.h \
+ ../../Source/ZenLib/ZtringListList.h \
+ ../../Source/ZenLib/ZtringListListF.h
+
+SOURCES += \
+ ../../Source/ZenLib/Conf.cpp \
+ ../../Source/ZenLib/CriticalSection.cpp \
+ ../../Source/ZenLib/Dir.cpp \
+ ../../Source/ZenLib/File.cpp \
+ ../../Source/ZenLib/FileName.cpp \
+ ../../Source/ZenLib/Format/Html/Html_Handler.cpp \
+ ../../Source/ZenLib/Format/Html/Html_Request.cpp \
+ ../../Source/ZenLib/Format/Http/Http_Cookies.cpp \
+ ../../Source/ZenLib/Format/Http/Http_Handler.cpp \
+ ../../Source/ZenLib/Format/Http/Http_Request.cpp \
+ ../../Source/ZenLib/Format/Http/Http_Utils.cpp \
+ ../../Source/ZenLib/HTTP_Client.cpp \
+ ../../Source/ZenLib/InfoMap.cpp \
+ ../../Source/ZenLib/int128s.cpp \
+ ../../Source/ZenLib/int128u.cpp \
+ ../../Source/ZenLib/MemoryDebug.cpp \
+ ../../Source/ZenLib/OS_Utils.cpp \
+ ../../Source/ZenLib/PreComp.cpp \
+ ../../Source/ZenLib/Thread.cpp \
+ ../../Source/ZenLib/Translation.cpp \
+ ../../Source/ZenLib/Utils.cpp \
+ ../../Source/ZenLib/Ztring.cpp \
+ ../../Source/ZenLib/ZtringList.cpp \
+ ../../Source/ZenLib/ZtringListList.cpp \
+ ../../Source/ZenLib/ZtringListListF.cpp
+
+# not sure whats up with this guy
+#SOURCES += \
+# ../../Source/ZenLib/HTTP_Client/HTTPClient.c \
+# ../../Source/ZenLib/HTTP_Client/HTTPClientAuth.c \
+# ../../Source/ZenLib/HTTP_Client/HTTPClientString.c \
+# ../../Source/ZenLib/HTTP_Client/HTTPClientWrapper.c
+#HEADERS += \
+# ../../Source/ZenLib/HTTP_Client/HTTPClient.h \
+# ../../Source/ZenLib/HTTP_Client/HTTPClientAuth.h \
+# ../../Source/ZenLib/HTTP_Client/HTTPClientCommon.h \
+# ../../Source/ZenLib/HTTP_Client/HTTPClientString.h \
+# ../../Source/ZenLib/HTTP_Client/HTTPClientWrapper.h \
+# ../../Source/ZenLib/HTTP_Client.h
diff --git a/Project/Solaris/mkpkg b/Project/Solaris/mkpkg
index ac4ca5c..1644706 100755
--- a/Project/Solaris/mkpkg
+++ b/Project/Solaris/mkpkg
@@ -9,7 +9,7 @@ release=`uname -r`
#Creation of known directories and filenames
name="libzen0"
-version="0.4.33"
+version="0.4.34"
Home=`pwd`
install_prefix=${Home}/mk_package
packagecreation_prefix=${Home}/create_package
diff --git a/Project/version.txt b/Project/version.txt
new file mode 100644
index 0000000..93842d6
--- /dev/null
+++ b/Project/version.txt
@@ -0,0 +1 @@
+0.4.34
diff --git a/Release/Release_BCB.bat b/Release/Release_BCB.bat
index 8c76393..2b6c633 100644
--- a/Release/Release_BCB.bat
+++ b/Release/Release_BCB.bat
@@ -1,5 +1,14 @@
@echo off
+rem --- Search binaries ---
+set BPATH=
+if exist "%~dp0\..\..\..\MediaArea-Utils-Binaries" set BPATH="%~dp0\..\..\..\MediaArea-Utils-Binaries"
+if exist "%~dp0\..\..\MediaArea-Utils-Binaries" set BPATH="%~dp0\..\..\MediaArea-Utils-Binaries"
+if "%BPATH%"=="" (
+ echo "ERROR: binaries path not found"
+ exit /b 1
+)
+
rem --- Clean up ---
if exist ZenLib_BCB.7z del ZenLib_BCB.7z
rmdir ZenLib_BCB /S /Q
@@ -12,7 +21,7 @@ xcopy ..\Source\ZenLib\*.h ZenLib_BCB\Include\ZenLib\
rem --- Copying : Documentation ---
mkdir Doc
pushd ..\Source\Doc
-..\..\..\Shared\Binary\Doxygen Doxygen
+%BPATH%\Windows\Doxygen\doxygen
popd
mkdir ZenLib_BCB\Doc\
xcopy Doc\*.* ZenLib_BCB\Doc\
@@ -28,8 +37,8 @@ copy ..\*.txt ZenLib_BCB\
rem --- Compressing Archive ---
pushd ZenLib_BCB
-..\..\..\Shared\Binary\Win32\7-Zip\7z a -r -t7z -mx9 ..\ZenLib_BCB.7z *
+%BPATH%\Windows\7-Zip\7z a -r -t7z -mx9 ..\ZenLib_BCB.7z *
popd
rem --- Clean up ---
-rmdir ZenLib_BCB /S /Q
\ No newline at end of file
+rmdir ZenLib_BCB /S /Q
diff --git a/Release/Release_GNU_Prepare.bat b/Release/Release_GNU_Prepare.bat
index 4c5813a..2bf782f 100644
--- a/Release/Release_GNU_Prepare.bat
+++ b/Release/Release_GNU_Prepare.bat
@@ -1,5 +1,14 @@
@echo off
+rem --- Search binaries ---
+set BPATH=
+if exist "%~dp0\..\..\..\MediaArea-Utils-Binaries" set BPATH="%~dp0\..\..\..\MediaArea-Utils-Binaries"
+if exist "%~dp0\..\..\MediaArea-Utils-Binaries" set BPATH="%~dp0\..\..\MediaArea-Utils-Binaries"
+if "%BPATH%"=="" (
+ echo "ERROR: binaries path not found"
+ exit /b 1
+)
+
rem --- Clean up ---
if exist ZenLib_GNU_Prepare.7z del ZenLib_GNU_Prepare.7z
if exist ZenLib_GNU_Prepare rmdir ZenLib_GNU_Prepare /S /Q
@@ -23,7 +32,7 @@ copy ..\*.txt ZenLib_GNU_Prepare\
rem --- Compressing Archive ---
if "%2"=="SkipCompression" goto SkipCompression
-..\..\Shared\Binary\Win32\7-Zip\7z a -r -t7z -mx9 ZenLib_GNU_Prepare.7z ZenLib_GNU_Prepare\*
+%BPATH%\Windows\7-Zip\7z a -r -t7z -mx9 ZenLib_GNU_Prepare.7z ZenLib_GNU_Prepare\*
:SkipCompression
rem --- Clean up ---
diff --git a/Release/Release_Source.bat b/Release/Release_Source.bat
index 1740e1c..23d8c48 100644
--- a/Release/Release_Source.bat
+++ b/Release/Release_Source.bat
@@ -1,5 +1,14 @@
@echo off
+rem --- Search binaries ---
+set BPATH=
+if exist "%~dp0\..\..\..\MediaArea-Utils-Binaries" set BPATH="%~dp0\..\..\..\MediaArea-Utils-Binaries"
+if exist "%~dp0\..\..\MediaArea-Utils-Binaries" set BPATH="%~dp0\..\..\MediaArea-Utils-Binaries"
+if "%BPATH%"=="" (
+ echo "ERROR: binaries path not found"
+ exit /b 1
+)
+
rem --- Clean up ---
if exist ZenLib_Source del ZenLib_Source.7z
if exist ZenLib_Source rmdir ZenLib_Source /S /Q
@@ -67,9 +76,9 @@ copy ..\*.cvsignore ZenLib_Source\
rem --- Compressing Archive ---
if "%2"=="SkipCompression" goto SkipCompression
move ZenLib_Source ZenLib
-..\..\Shared\Binary\Windows_i386\7-Zip\7z a -r -ttar -mx9 ZenLib_Source.tar ZenLib\*
-..\..\Shared\Binary\Windows_i386\7-Zip\7z a -r -tbzip2 -mx9 libzen_.tar.bz2 ZenLib_Source.tar
-..\..\Shared\Binary\Windows_i386\7-Zip\7z a -r -tgzip -mx9 libzen_-1.tar.gz ZenLib_Source.tar
+%BPATH%\Windows\7-Zip\7z a -r -ttar -mx9 ZenLib_Source.tar ZenLib\*
+%BPATH%\Windows\7-Zip\7z a -r -tbzip2 -mx9 libzen_.tar.bz2 ZenLib_Source.tar
+%BPATH%\Windows\7-Zip\7z a -r -tgzip -mx9 libzen_-1.tar.gz ZenLib_Source.tar
del ZenLib_Source.tar
move ZenLib ZenLib_Source
:SkipCompression
diff --git a/Source/ZenLib/Dir.cpp b/Source/ZenLib/Dir.cpp
index ccf3542..e84e4a2 100644
--- a/Source/ZenLib/Dir.cpp
+++ b/Source/ZenLib/Dir.cpp
@@ -302,7 +302,7 @@ ZtringList Dir::GetAllFileNames(const Ztring &Dir_Name_, dirlist_t Options)
glob_t globbuf;
if (glob(Dir_Name.To_Local().c_str(), GLOB_NOSORT, NULL, &globbuf)==0)
{
- for (int Pos=0; Pos<globbuf.gl_pathc; Pos++)
+ for (size_t Pos=0; Pos<globbuf.gl_pathc; Pos++)
ToReturn.push_back(Ztring().From_Local(globbuf.gl_pathv[Pos]));
}
}
diff --git a/Source/ZenLib/Format/Http/Http_Request.cpp b/Source/ZenLib/Format/Http/Http_Request.cpp
index 4d7994f..ce27329 100644
--- a/Source/ZenLib/Format/Http/Http_Request.cpp
+++ b/Source/ZenLib/Format/Http/Http_Request.cpp
@@ -96,7 +96,7 @@ bool Request::Http_Begin(std::istream &In, std::ostream &Out)
Out << "\r\n";
return false; //Problem
}
- if (Http->Path.find("%")!=string::npos)
+ if (Http->Path.find('%')!=string::npos)
Http->Path=Format::Http::URL_Encoded_Decode(Http->Path);
//-Norm
string Line;
diff --git a/Source/ZenLib/MemoryDebug.cpp b/Source/ZenLib/MemoryDebug.cpp
index cc281f8..73f51ce 100644
--- a/Source/ZenLib/MemoryDebug.cpp
+++ b/Source/ZenLib/MemoryDebug.cpp
@@ -35,6 +35,7 @@ using namespace std;
namespace ZenLib
{
+bool MemoryDebug::g_IsShutdown = false;
//***************************************************************************
// Constructors/destructor
//***************************************************************************
@@ -47,6 +48,7 @@ MemoryDebug::~MemoryDebug()
{
if (!m_Blocks.empty())
ReportLeaks();
+ g_IsShutdown = true;
}
//***************************************************************************
diff --git a/Source/ZenLib/MemoryDebug.h b/Source/ZenLib/MemoryDebug.h
index 6111dcd..189c1bf 100644
--- a/Source/ZenLib/MemoryDebug.h
+++ b/Source/ZenLib/MemoryDebug.h
@@ -40,7 +40,7 @@ class MemoryDebug
public :
~MemoryDebug();
static MemoryDebug& Instance();
-
+ static bool g_IsShutdown;
void* Allocate(std::size_t Size, const char* File, int Line, bool Array);
void Free(void* Ptr, bool Array);
void NextDelete(const char*, int Line); //Sauvegarde les infos sur la désallocation courante
@@ -79,12 +79,18 @@ inline void* operator new[](std::size_t Size, const char* File, int Line)
inline void operator delete(void* Ptr)
{
- ZenLib::MemoryDebug::Instance().Free(Ptr, false);
+ if (ZenLib::MemoryDebug::g_IsShutdown)
+ free(Ptr);
+ else
+ ZenLib::MemoryDebug::Instance().Free(Ptr, false);
}
inline void operator delete[](void* Ptr)
{
- ZenLib::MemoryDebug::Instance().Free(Ptr, true);
+ if (ZenLib::MemoryDebug::g_IsShutdown)
+ free(Ptr);
+ else
+ ZenLib::MemoryDebug::Instance().Free(Ptr, true);
}
#if !defined(__BORLANDC__) // Borland does not support overloaded delete
diff --git a/Source/ZenLib/Ztring.cpp b/Source/ZenLib/Ztring.cpp
index d4aca2f..cb2e906 100644
--- a/Source/ZenLib/Ztring.cpp
+++ b/Source/ZenLib/Ztring.cpp
@@ -1820,7 +1820,7 @@ int8s Ztring::To_int8s (int8u Radix, ztring_t Options) const
#endif
//Rounded
- if (Options==Ztring_Rounded && find(__T("."))!=Error)
+ if (Options==Ztring_Rounded && find(__T('.'))!=Error)
{
float80 F=To_float80();
F-=I;
@@ -1858,7 +1858,7 @@ int8u Ztring::To_int8u (int8u Radix, ztring_t Options) const
#endif
//Rounded
- if (Options==Ztring_Rounded && find(__T("."))!=std::string::npos)
+ if (Options==Ztring_Rounded && find(__T('.'))!=std::string::npos)
{
float32 F=To_float32();
F-=I;
@@ -1896,7 +1896,7 @@ int16s Ztring::To_int16s (int8u Radix, ztring_t Options) const
#endif
//Rounded
- if (Options==Ztring_Rounded && find(__T("."))!=Error)
+ if (Options==Ztring_Rounded && find(__T('.'))!=Error)
{
float80 F=To_float80();
F-=I;
@@ -1934,7 +1934,7 @@ int16u Ztring::To_int16u (int8u Radix, ztring_t Options) const
#endif
//Rounded
- if (Options==Ztring_Rounded && find(__T("."))!=std::string::npos)
+ if (Options==Ztring_Rounded && find(__T('.'))!=std::string::npos)
{
float32 F=To_float32();
F-=I;
@@ -1972,7 +1972,7 @@ int32s Ztring::To_int32s (int8u Radix, ztring_t Options) const
#endif
//Rounded
- if (Options==Ztring_Rounded && find(__T("."))!=Error)
+ if (Options==Ztring_Rounded && find(__T('.'))!=Error)
{
float80 F=To_float80();
F-=I;
@@ -2010,7 +2010,7 @@ int32u Ztring::To_int32u (int8u Radix, ztring_t Options) const
#endif
//Rounded
- if (Options==Ztring_Rounded && find(__T("."))!=std::string::npos)
+ if (Options==Ztring_Rounded && find(__T('.'))!=std::string::npos)
{
float32 F=To_float32();
F-=I;
@@ -2048,7 +2048,7 @@ int64s Ztring::To_int64s (int8u Radix, ztring_t Options) const
#endif
//Rounded
- if (Options==Ztring_Rounded && find(__T("."))!=std::string::npos)
+ if (Options==Ztring_Rounded && find(__T('.'))!=std::string::npos)
{
float32 F=To_float32();
F-=I;
@@ -2086,7 +2086,7 @@ int64u Ztring::To_int64u (int8u Radix, ztring_t Options) const
#endif
//Rounded
- if (Options==Ztring_Rounded && find(__T("."))!=std::string::npos)
+ if (Options==Ztring_Rounded && find(__T('.'))!=std::string::npos)
{
float32 F=To_float32();
F-=I;
diff --git a/Source/ZenLib/ZtringList.cpp b/Source/ZenLib/ZtringList.cpp
index 841fa8a..a58f9fd 100644
--- a/Source/ZenLib/ZtringList.cpp
+++ b/Source/ZenLib/ZtringList.cpp
@@ -17,7 +17,6 @@
//---------------------------------------------------------------------------
#include <algorithm>
-#include <functional>
#include "ZenLib/ZtringList.h"
using namespace std;
#if defined(_MSC_VER) && _MSC_VER <= 1200
diff --git a/Source/ZenLib/ZtringListListF.cpp b/Source/ZenLib/ZtringListListF.cpp
index a89693d..fd520a9 100644
--- a/Source/ZenLib/ZtringListListF.cpp
+++ b/Source/ZenLib/ZtringListListF.cpp
@@ -190,8 +190,8 @@ bool ZtringListListF::CFG_Charger ()
for (size_t Pos=0; Pos<List.size(); Pos++)
{
- Ztring &Lu=List(Pos);
- if (Lu.find(__T("="))>0)
+ const Ztring &Lu=List(Pos);
+ if (Lu.find(__T('='))>0)
{
//Obtention du Name
Propriete=Lu.SubString(Ztring(), __T("="));
diff --git a/Source/ZenLib/int128s.cpp b/Source/ZenLib/int128s.cpp
index 5d597e1..d6c3f73 100644
--- a/Source/ZenLib/int128s.cpp
+++ b/Source/ZenLib/int128s.cpp
@@ -35,9 +35,7 @@
Version: 1.1
*/
-#include <memory>
#include <cmath>
-#include <cstring>
#if defined (__BORLANDC__) || defined (__SUNPRO_CC)
#define fmodf fmod
#endif
@@ -102,8 +100,8 @@ int128::int128 (const char * sz) throw ()
++i;
};
};
-
- for (; i < strlen (sz); ++i) {
+ const unsigned int len = strlen(sz);
+ for (; i < len; ++i) {
unsigned int n = 0;
if (sz [i] >= '0' && sz [i] <= (('0' + (int) radix) < '9'?('0' + (int) radix):'9')) //if (sz [i] >= '0' && sz [i] <= (('0' + (int) radix) <? '9'))
n = sz [i] - '0';
diff --git a/Source/ZenLib/int128u.cpp b/Source/ZenLib/int128u.cpp
index e0603a3..1bb28ae 100644
--- a/Source/ZenLib/int128u.cpp
+++ b/Source/ZenLib/int128u.cpp
@@ -35,9 +35,7 @@
Version: 1.1
*/
-#include <memory>
#include <cmath>
-#include <cstring>
#if defined (__BORLANDC__) || defined (__SUNPRO_CC)
#define fmodf fmod
#endif
@@ -99,8 +97,8 @@ uint128::uint128 (const char * sz) throw ()
++i;
};
};
-
- for (; i < strlen (sz); ++i) {
+ const unsigned int len = strlen(sz);
+ for (; i < len; ++i) {
unsigned int n = 0;
if (sz [i] >= '0' && sz [i] <= (('0' + (int) radix) < '9'?('0' + (int) radix):'9')) //if (sz [i] >= '0' && sz [i] <= (('0' + (int) radix) <? '9'))
n = sz [i] - '0';
--
libzen packaging
More information about the pkg-multimedia-commits
mailing list