June 2023 - openSUSE Commits - openSUSE Mailing Lists

commit python-uvicorn for openSUSE:Factory
by Source-Sync 30 Jun '23

30 Jun '23

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package python-uvicorn for openSUSE:Factory checked in at 2023-06-30 19:58:08 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-uvicorn (Old) and /work/SRC/openSUSE:Factory/.python-uvicorn.new.13546 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-uvicorn" Fri Jun 30 19:58:08 2023 rev:12 rq:1096010 version:0.22.0 Changes: -------- --- /work/SRC/openSUSE:Factory/python-uvicorn/python-uvicorn.changes 2023-05-13 17:17:15.302247779 +0200 +++ /work/SRC/openSUSE:Factory/.python-uvicorn.new.13546/python-uvicorn.changes 2023-06-30 19:58:18.525442379 +0200 @@ -1,0 +2,5 @@ +Thu Jun 22 15:25:56 UTC 2023 - Dirk M��ller <dmueller(a)suse.com> + +- limit to newer python versions, older are no longer needed + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-uvicorn.spec ++++++ --- /var/tmp/diff_new_pack.ksMkHs/_old 2023-06-30 19:58:19.165446185 +0200 +++ /var/tmp/diff_new_pack.ksMkHs/_new 2023-06-30 19:58:19.173446232 +0200 @@ -26,7 +26,7 @@ Source: https://github.com/encode/uvicorn/archive/%{version}.tar.gz#/uvicorn-%{vers… # PATCH-FIX-UPSTREAM fix-websocket-tests.patch -- gh#encode/uvicorn#1929 Patch0: fix-websocket-tests.patch -BuildRequires: %{python_module base >= 3.7} +BuildRequires: %{python_module base >= 3.8} BuildRequires: %{python_module hatchling} BuildRequires: %{python_module pip} BuildRequires: %{python_module setuptools} @@ -35,9 +35,6 @@ BuildRequires: python-rpm-macros Requires: python-click >= 7.0 Requires: python-h11 >= 0.8.0 -%if 0%{python_version_nodots} < 38 -Requires: python-typing_extensions -%endif Recommends: python-PyYAML >= 5.1 Recommends: python-httptools >= 0.4.0 Recommends: python-websockets >= 8.0 @@ -61,7 +58,6 @@ BuildRequires: %{python_module python-dotenv} BuildRequires: %{python_module requests} BuildRequires: %{python_module trustme} -BuildRequires: %{python_module typing_extensions if %python-base < 3.8} %if 0%{?suse_version} > 1500 BuildRequires: %{python_module uvloop >= 0.14.0} %endif

1 0

commit python-PyICU for openSUSE:Factory
by Source-Sync 30 Jun '23

30 Jun '23

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package python-PyICU for openSUSE:Factory checked in at 2023-06-30 19:58:07 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-PyICU (Old) and /work/SRC/openSUSE:Factory/.python-PyICU.new.13546 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-PyICU" Fri Jun 30 19:58:07 2023 rev:17 rq:1095995 version:2.11 Changes: -------- --- /work/SRC/openSUSE:Factory/python-PyICU/python-PyICU.changes 2023-06-27 23:15:39.935038134 +0200 +++ /work/SRC/openSUSE:Factory/.python-PyICU.new.13546/python-PyICU.changes 2023-06-30 19:58:16.857432457 +0200 @@ -1,0 +2,6 @@ +Thu Jun 29 07:13:31 UTC 2023 - Andreas Schneider <asn(a)cryptomilk.org> + +- Disable testTransition on Leap +- Fix position of sle15_python_module_pythons + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-PyICU.spec ++++++ --- /var/tmp/diff_new_pack.i7Jxsf/_old 2023-06-30 19:58:18.381441522 +0200 +++ /var/tmp/diff_new_pack.i7Jxsf/_new 2023-06-30 19:58:18.401441641 +0200 @@ -16,6 +16,7 @@ # +%{?sle15_python_module_pythons} %global modname PyICU Name: python-%{modname} Version: 2.11 @@ -41,7 +42,6 @@ Provides: %{modname} = %{version} Provides: python-ICU = %{version} Obsoletes: python-ICU < 1.2 -%{?sle15_python_module_pythons} %python_subpackages %description @@ -61,7 +61,12 @@ %python_expand %fdupes %{buildroot}%{$python_sitearch} %check +%if 0%{?sle_version} && 0%{?sle_version} <= 150500 +# The timezone package is not up to date +%pytest_arch -v -k 'not (testAcceptLanguage or testAcceptLanguageFromHTTP or testTransition)' -rs test +%else %pytest_arch -v -k 'not (testAcceptLanguage or testAcceptLanguageFromHTTP)' -rs test +%endif %files %{python_files} %license LICENSE

1 0

commit python-pygraphviz for openSUSE:Factory
by Source-Sync 30 Jun '23

30 Jun '23

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package python-pygraphviz for openSUSE:Factory checked in at 2023-06-30 19:58:07 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-pygraphviz (Old) and /work/SRC/openSUSE:Factory/.python-pygraphviz.new.13546 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-pygraphviz" Fri Jun 30 19:58:07 2023 rev:12 rq:1095994 version:1.11 Changes: -------- --- /work/SRC/openSUSE:Factory/python-pygraphviz/python-pygraphviz.changes 2023-06-16 16:51:46.576611810 +0200 +++ /work/SRC/openSUSE:Factory/.python-pygraphviz.new.13546/python-pygraphviz.changes 2023-06-30 19:58:16.001427366 +0200 @@ -1,0 +2,9 @@ +Thu Jun 29 07:00:11 UTC 2023 - Andreas Schneider <asn(a)cryptomilk.org> + +- Update to version 1.11 + * Update to SWIG 4.1.1 + * Require Graphviz 2.46+ + * Fix passthrough of graph attributes when copying + * Update install instructions + +------------------------------------------------------------------- Old: ---- pygraphviz-1.10.zip New: ---- pygraphviz-1.11.zip ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-pygraphviz.spec ++++++ --- /var/tmp/diff_new_pack.9aeiC7/_old 2023-06-30 19:58:16.705431553 +0200 +++ /var/tmp/diff_new_pack.9aeiC7/_new 2023-06-30 19:58:16.709431577 +0200 @@ -16,11 +16,10 @@ # -%global skip_python2 1 %bcond_without tests %{?sle15_python_module_pythons} Name: python-pygraphviz -Version: 1.10 +Version: 1.11 Release: 0 Summary: Python interface to Graphviz License: BSD-3-Clause

1 0

commit busybox-links for openSUSE:Factory
by Source-Sync 30 Jun '23

30 Jun '23

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package busybox-links for openSUSE:Factory checked in at 2023-06-30 19:58:06 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/busybox-links (Old) and /work/SRC/openSUSE:Factory/.busybox-links.new.13546 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "busybox-links" Fri Jun 30 19:58:06 2023 rev:27 rq:1095992 version:MACRO Changes: -------- --- /work/SRC/openSUSE:Factory/busybox-links/busybox-links.changes 2023-01-10 14:59:22.337065653 +0100 +++ /work/SRC/openSUSE:Factory/.busybox-links.new.13546/busybox-links.changes 2023-06-30 19:58:15.001421418 +0200 @@ -1,0 +2,6 @@ +Thu Jun 29 13:34:39 UTC 2023 - Thorsten Kukuk <kukuk(a)suse.com> + +- Make sure last stays in busybox-util-linux, even if we moved + the original binary from util-linux to wtmpdb + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ busybox-links.spec ++++++ --- /var/tmp/diff_new_pack.Cv2ASd/_old 2023-06-30 19:58:15.741425819 +0200 +++ /var/tmp/diff_new_pack.Cv2ASd/_new 2023-06-30 19:58:15.745425843 +0200 @@ -208,6 +208,8 @@ %package -n busybox-util-linux Summary: Busybox applets replacing util-linux Requires: busybox = %{version} +# wtmpdb contains now /usr/bin/last +Conflicts: wtmpdb Conflicts: util-linux Conflicts: util-linux-systemd @@ -640,6 +642,13 @@ rm apps/$i done +# /usr/bin/last is now in wtmpdb, but should stay in busybox-util-linux +if [ -e apps/last ]; then + echo -e "/usr/bin/last" >> filelist-util-linux.txt + touch used/last + rm -f apps/last +fi + for i in `cat %{_datadir}/busybox/busybox.links` ; do prog=`basename $i` if [ -f apps/$prog ]; then

1 0

commit libwps for openSUSE:Factory
by Source-Sync 30 Jun '23

30 Jun '23

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package libwps for openSUSE:Factory checked in at 2023-06-30 19:58:05 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libwps (Old) and /work/SRC/openSUSE:Factory/.libwps.new.13546 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libwps" Fri Jun 30 19:58:05 2023 rev:49 rq:1095986 version:0.4.14 Changes: -------- --- /work/SRC/openSUSE:Factory/libwps/libwps.changes 2022-12-07 17:33:51.992178248 +0100 +++ /work/SRC/openSUSE:Factory/.libwps.new.13546/libwps.changes 2023-06-30 19:58:13.577412948 +0200 @@ -1,0 +2,7 @@ +Thu Jun 29 09:11:18 UTC 2023 - Danilo Spinella <danilo.spinella(a)suse.com> + +- Update to 0.4.14: + * autoupdate configure.ac + * correct various warnings + +------------------------------------------------------------------- Old: ---- libwps-0.4.13.tar.xz New: ---- libwps-0.4.14.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libwps.spec ++++++ --- /var/tmp/diff_new_pack.4IY8KY/_old 2023-06-30 19:58:14.313417326 +0200 +++ /var/tmp/diff_new_pack.4IY8KY/_new 2023-06-30 19:58:14.329417421 +0200 @@ -1,7 +1,7 @@ # # spec file for package libwps # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2023 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,7 +19,7 @@ %{!?make_build:%global make_build make %{?_smp_mflags}} %define libname libwps-0_4-4 Name: libwps -Version: 0.4.13 +Version: 0.4.14 Release: 0 Summary: Library for the Microsoft Works text and spreadsheet formats License: LGPL-2.1-or-later AND MPL-2.0 ++++++ libwps-0.4.13.tar.xz -> libwps-0.4.14.tar.xz ++++++ ++++ 7712 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libwps-0.4.13/ChangeLog new/libwps-0.4.14/ChangeLog --- old/libwps-0.4.13/ChangeLog 2022-11-21 15:03:05.000000000 +0100 +++ new/libwps-0.4.14/ChangeLog 2023-05-05 11:29:06.000000000 +0200 @@ -1,3 +1,18 @@ +2023-05-03 ALONSO Laurent <laurent.alonso(a)inria.fr> [c0392a9cefde3aa0f6495eed451c838bdc9f7f98] + + clang --analyze: correct some warnings + + +2023-05-03 ALONSO Laurent <laurent.alonso(a)inria.fr> [f351b8be66cd102bf926f6472644317b25dfbee6] + + cppcheck: correct some warnings + + +2022-11-22 ALONSO Laurent <laurent.alonso(a)inria.fr> [05de4b29f1ff82a0ef5b324f3f02f3ce200baa79] + + update configure.ac to be compatible with autoconf 2.71 (to try to generate package compatible with arch linux) + + 2021-12-07 ALONSO Laurent <laurent.alonso(a)inria.fr> [674ed9e955773b32cd8fa02fed6b6355c5dd6a78] Quattro Dos: try to retrieve correctly the spreadsheet's name when creating some charts, Quattro: try to avoid potential spreadsheet names clashes diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libwps-0.4.13/NEWS new/libwps-0.4.14/NEWS --- old/libwps-0.4.13/NEWS 2020-09-04 14:02:32.000000000 +0200 +++ new/libwps-0.4.14/NEWS 2023-05-05 10:57:05.000000000 +0200 @@ -1,3 +1,6 @@ +0.4.12 -> 0.4.14 +- autoupdate configure.ac + correct various warnings + 0.4.11 -> 0.4.12 - add a minimalist parser for Pocket Word .psw and .pwi files diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libwps-0.4.13/ar-lib new/libwps-0.4.14/ar-lib --- old/libwps-0.4.13/ar-lib 2014-02-04 09:33:52.000000000 +0100 +++ new/libwps-0.4.14/ar-lib 2023-05-03 14:29:19.000000000 +0200 @@ -2,9 +2,9 @@ # Wrapper for Microsoft lib.exe me=ar-lib -scriptversion=2012-03-01.08; # UTC +scriptversion=2019-07-04.01; # UTC -# Copyright (C) 2010-2013 Free Software Foundation, Inc. +# Copyright (C) 2010-2021 Free Software Foundation, Inc. # Written by Peter Rosin <peda(a)lysator.liu.se>. # # This program is free software; you can redistribute it and/or modify @@ -18,7 +18,7 @@ # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# along with this program. If not, see <https://www.gnu.org/licenses/>. # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -53,7 +53,7 @@ MINGW*) file_conv=mingw ;; - CYGWIN*) + CYGWIN* | MSYS*) file_conv=cygwin ;; *) @@ -65,7 +65,7 @@ mingw) file=`cmd //C echo "$file " | sed -e 's/"$.*$ " *$/\1/'` ;; - cygwin) + cygwin | msys) file=`cygpath -m "$file" || echo "$file"` ;; wine) @@ -224,10 +224,11 @@ esac done else - $AR -NOLOGO -LIST "$archive" | sed -e 's/\\/\\\\/g' | while read member - do - $AR -NOLOGO -EXTRACT:"$member" "$archive" || exit $? - done + $AR -NOLOGO -LIST "$archive" | tr -d '\r' | sed -e 's/\\/\\\\/g' \ + | while read member + do + $AR -NOLOGO -EXTRACT:"$member" "$archive" || exit $? + done fi elif test -n "$quick$replace"; then diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libwps-0.4.13/compile new/libwps-0.4.14/compile --- old/libwps-0.4.13/compile 2020-09-03 10:28:26.000000000 +0200 +++ new/libwps-0.4.14/compile 2023-05-03 14:29:19.000000000 +0200 @@ -3,7 +3,7 @@ scriptversion=2018-03-07.03; # UTC -# Copyright (C) 1999-2018 Free Software Foundation, Inc. +# Copyright (C) 1999-2021 Free Software Foundation, Inc. # Written by Tom Tromey <tromey(a)cygnus.com>. # # This program is free software; you can redistribute it and/or modify @@ -53,7 +53,7 @@ MINGW*) file_conv=mingw ;; - CYGWIN*) + CYGWIN* | MSYS*) file_conv=cygwin ;; *) @@ -67,7 +67,7 @@ mingw/*) file=`cmd //C echo "$file " | sed -e 's/"$.*$ " *$/\1/'` ;; - cygwin/*) + cygwin/* | msys/*) file=`cygpath -m "$file" || echo "$file"` ;; wine/*) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libwps-0.4.13/configure.ac new/libwps-0.4.14/configure.ac --- old/libwps-0.4.13/configure.ac 2022-11-21 15:00:32.000000000 +0100 +++ new/libwps-0.4.14/configure.ac 2023-05-05 10:54:05.000000000 +0200 @@ -7,7 +7,7 @@ # ==================== m4_define([libwps_version_major],[0]) m4_define([libwps_version_minor],[4]) -m4_define([libwps_version_micro],[13]) +m4_define([libwps_version_micro],[14]) m4_define([libwps_version],[libwps_version_major.libwps_version_minor.libwps_version_micro]) # ============= diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libwps-0.4.13/m4/libtool.m4 new/libwps-0.4.14/m4/libtool.m4 --- old/libwps-0.4.13/m4/libtool.m4 2020-09-03 10:28:22.000000000 +0200 +++ new/libwps-0.4.14/m4/libtool.m4 2023-05-03 14:29:15.000000000 +0200 @@ -1068,8 +1068,8 @@ darwin1.*) _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;; darwin*) - case ${MACOSX_DEPLOYMENT_TARGET},$host in - 10.[[012]],*|,*powerpc*) + case $MACOSX_DEPLOYMENT_TARGET,$host in + 10.[[012]],*|,*powerpc*-darwin[[5-8]]*) _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;; *) _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libwps-0.4.13/missing new/libwps-0.4.14/missing --- old/libwps-0.4.13/missing 2020-09-03 10:28:26.000000000 +0200 +++ new/libwps-0.4.14/missing 2023-05-03 14:29:19.000000000 +0200 @@ -3,7 +3,7 @@ scriptversion=2018-03-07.03; # UTC -# Copyright (C) 1996-2018 Free Software Foundation, Inc. +# Copyright (C) 1996-2021 Free Software Foundation, Inc. # Originally written by Fran,cois Pinard <pinard(a)iro.umontreal.ca>, 1996. # This program is free software; you can redistribute it and/or modify diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libwps-0.4.13/src/lib/Lotus.cpp new/libwps-0.4.14/src/lib/Lotus.cpp --- old/libwps-0.4.13/src/lib/Lotus.cpp 2019-02-12 13:30:11.000000000 +0100 +++ new/libwps-0.4.14/src/lib/Lotus.cpp 2023-05-04 14:21:48.000000000 +0200 @@ -145,7 +145,7 @@ for (size_t i=0; i<m_sheetZoneIdList.size(); ++i) zoneIdToSheetMap[m_sheetZoneIdList[i]]=int(i); std::map<int,int> res; - for (auto it : m_dataZoneIdToSheetZoneIdMap) + for (auto const &it : m_dataZoneIdToSheetZoneIdMap) { if (zoneIdToSheetMap.find(it.second)==zoneIdToSheetMap.end()) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libwps-0.4.13/src/lib/LotusChart.cpp new/libwps-0.4.14/src/lib/LotusChart.cpp --- old/libwps-0.4.13/src/lib/LotusChart.cpp 2020-09-01 15:31:21.000000000 +0200 +++ new/libwps-0.4.14/src/lib/LotusChart.cpp 2023-05-04 12:30:54.000000000 +0200 @@ -185,7 +185,7 @@ std::map<std::string,int> LotusChart::getNameToChartIdMap() const { std::map<std::string,int> res; - for (auto it : m_state->m_idChartMap) + for (auto const &it : m_state->m_idChartMap) { auto const &chart = it.second; if (chart || !chart->m_name.empty()) @@ -205,7 +205,7 @@ In mac's wk3 files, all used files are named, so this must be ok */ bool removeNoName=version()==1 && m_state->m_idChartMap.size()>1; - for (auto &it : m_state->m_idChartMap) + for (auto const &it : m_state->m_idChartMap) { auto id=it.first; auto chart=it.second; @@ -797,12 +797,12 @@ } auto chart=m_state->getChart(m_state->m_chartId,*this,stream); auto id=int(libwps::readU8(input)); - if (id<0||id>=3) + if (id>=3) { WPS_DEBUG_MSG(("LotusChart::readMacAxis: the id seems bad\n")); f << "###"; } - auto &axis=chart->getAxis((id<0||id>=3) ? 4 : id); + auto &axis=chart->getAxis(id>=3 ? 4 : id); f << "id[axis]=" << id << ","; auto format=int(libwps::readU8(input)); if ((format&0x20)==0) @@ -1019,7 +1019,7 @@ f << "title,"; if ((val&0x10)==0) { - WKSChart::TextZone::Type allTypes[]= {WKSChart::TextZone::T_Title, WKSChart::TextZone::T_SubTitle}; + WKSChart::TextZone::Type const allTypes[]= {WKSChart::TextZone::T_Title, WKSChart::TextZone::T_SubTitle}; for (auto type : allTypes) chart->getTextZone(type,true)->m_show=false; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libwps-0.4.13/src/lib/LotusGraph.cpp new/libwps-0.4.14/src/lib/LotusGraph.cpp --- old/libwps-0.4.13/src/lib/LotusGraph.cpp 2019-02-12 13:30:11.000000000 +0100 +++ new/libwps-0.4.14/src/lib/LotusGraph.cpp 2023-05-02 09:28:46.000000000 +0200 @@ -2124,7 +2124,7 @@ } } -void LotusGraph::sendZone(LotusGraphInternal::ZonePcList const &zoneList, size_t id, WPSTransformation &transf) +void LotusGraph::sendZone(LotusGraphInternal::ZonePcList const &zoneList, size_t id, WPSTransformation const &transf) { if (!m_listener) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libwps-0.4.13/src/lib/LotusGraph.h new/libwps-0.4.14/src/lib/LotusGraph.h --- old/libwps-0.4.13/src/lib/LotusGraph.h 2017-10-24 12:24:42.000000000 +0200 +++ new/libwps-0.4.14/src/lib/LotusGraph.h 2023-05-02 09:29:01.000000000 +0200 @@ -86,7 +86,7 @@ //! send the graphics corresponding to a sheetId void sendGraphics(int sheetId); //! try to send a shape: 123 pc - void sendZone(LotusGraphInternal::ZonePcList const &zoneList, size_t id, WPSTransformation &transf); + void sendZone(LotusGraphInternal::ZonePcList const &zoneList, size_t id, WPSTransformation const &transf); //! try to send a picture: 123 mac void sendPicture(LotusGraphInternal::ZoneMac const &zone); //! try to send a textbox content's diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libwps-0.4.13/src/lib/LotusSpreadsheet.cpp new/libwps-0.4.14/src/lib/LotusSpreadsheet.cpp --- old/libwps-0.4.13/src/lib/LotusSpreadsheet.cpp 2020-09-01 15:31:21.000000000 +0200 +++ new/libwps-0.4.14/src/lib/LotusSpreadsheet.cpp 2023-05-04 14:21:07.000000000 +0200 @@ -179,7 +179,7 @@ //! returns true if all style are empty bool empty() const { - for (auto it : m_colsToStyleMap) + for (auto const &it : m_colsToStyleMap) { if (!it.second.empty()) return false; } @@ -840,7 +840,7 @@ { std::set<Vec2i> seens; std::stack<Vec2i> toDo; - for (auto it : m_state->m_rowSheetIdToStyleIdMap) + for (auto const &it : m_state->m_rowSheetIdToStyleIdMap) toDo.push(it.first); while (!toDo.empty()) { @@ -995,7 +995,7 @@ } f << "row" << n << "[bound]=" << Vec2i(rowPos[0], rowPos[1]) << ","; } - if (sheetId<0||sheetId>=m_state->getNumSheet()) + if (sheetId>=m_state->getNumSheet()) { WPS_DEBUG_MSG(("LotusSpreadsheet::readColumnDefinition the zone id seems bad\n")); f << "##id"; @@ -1043,7 +1043,7 @@ auto sheetId=int(libwps::readU8(input)); f << "id[sheet]=" << sheetId << ","; LotusSpreadsheetInternal::Spreadsheet empty, *sheet=nullptr; - if (sheetId<0||sheetId>=int(m_state->m_spreadsheetList.size())) + if (sheetId>=int(m_state->m_spreadsheetList.size())) { WPS_DEBUG_MSG(("LotusSpreadsheet::readColumnSizes: can find spreadsheet %d\n", sheetId)); sheet=∅ @@ -1419,7 +1419,7 @@ } auto sz = long(libwps::readU16(input)); long endPos = pos+4+sz; - if (sz<0 || !stream->checkFilePosition(endPos)) + if (!stream->checkFilePosition(endPos)) { input->seek(pos, librevenge::RVNG_SEEK_SET); return false; @@ -1778,7 +1778,7 @@ auto sheetId=int(libwps::readU8(input)); f << "id[sheet]=" << sheetId << ","; LotusSpreadsheetInternal::Spreadsheet empty, *sheet=nullptr; - if (sheetId<0||sheetId>=int(m_state->m_spreadsheetList.size())) + if (sheetId>=int(m_state->m_spreadsheetList.size())) { WPS_DEBUG_MSG(("LotusSpreadsheet::readRowSizes: can find spreadsheet %d\n", sheetId)); sheet=∅ @@ -1864,7 +1864,7 @@ f << "##"; ascFile.addDelimiter(input->tell(), '|'); } - if (sheetId<0||sheetId>=m_state->getNumSheet()) + if (sheetId>=m_state->getNumSheet()) { WPS_DEBUG_MSG(("LotusSpreadsheet::readSheetName: the zone id seems bad\n")); f << "##id"; @@ -2156,7 +2156,7 @@ if (sheetId) f << "sheet[id]=" << sheetId << ","; LotusSpreadsheetInternal::Spreadsheet empty, *sheet=nullptr; - if (sheetId<0||sheetId>=int(m_state->m_spreadsheetList.size())) + if (sheetId>=int(m_state->m_spreadsheetList.size())) { WPS_DEBUG_MSG(("LotusSpreadsheet::readCell: can find spreadsheet %d\n", sheetId)); sheet=∅ @@ -2437,7 +2437,7 @@ newRowSet.insert(prevRow+1); } size_t numRowStyle=m_state->m_rowStylesList.size(); - for (auto rIt : sheet.m_rowToStyleIdMap) + for (auto const &rIt : sheet.m_rowToStyleIdMap) { Vec2i const &rows=rIt.first; size_t listId=rIt.second; @@ -2449,13 +2449,13 @@ newRowSet.insert(rows[0]); newRowSet.insert(rows[1]+1); } - for (auto rIt : sheet.m_rowHeightMap) + for (auto const &rIt : sheet.m_rowHeightMap) { Vec2i const &rows=rIt.first; newRowSet.insert(rows[0]); newRowSet.insert(rows[1]+1); } - for (auto rIt : sheet.m_rowToExtraStyleMap) + for (auto const &rIt : sheet.m_rowToExtraStyleMap) { if (rIt.second.empty()) continue; newRowSet.insert(rIt.first); @@ -2465,19 +2465,19 @@ LotusSpreadsheetInternal::Table123Styles const *table123Styles=m_state->getTableStyle(sheetId); if (table123Styles) { - for (auto rIt : table123Styles->m_rowsToColsToCellIdMap) + for (auto const &rIt : table123Styles->m_rowsToColsToCellIdMap) { Vec2i const &rows=rIt.first; newRowSet.insert(rows[0]); newRowSet.insert(rows[1]+1); } - for (auto rIt : table123Styles->m_rowsToColsToExtraStyleMap) + for (auto const &rIt : table123Styles->m_rowsToColsToExtraStyleMap) { Vec2i const &rows=rIt.first; newRowSet.insert(rows[0]); newRowSet.insert(rows[1]+1); } - for (auto rIt : table123Styles->m_rowsToColsToFormatStyleMap) + for (auto const &rIt : table123Styles->m_rowsToColsToFormatStyleMap) { Vec2i const &rows = rIt.first; newRowSet.insert(rows[0]); @@ -2576,10 +2576,10 @@ std::map<int,int> potentialMergeMap; if (table123Styles) { - for (auto rIt : table123Styles->m_rowsToColsToCellIdMap) + for (auto const &rIt : table123Styles->m_rowsToColsToCellIdMap) { if (rIt.first[0]>row || rIt.first[1]<row) continue; - for (auto colIt : rIt.second) + for (auto const &colIt : rIt.second) { LotusSpreadsheetInternal::Style style(defFontType); WPSFont font; @@ -2591,20 +2591,20 @@ newColSet.insert(colIt.first[1]+1); } } - for (auto rIt : table123Styles->m_rowsToColsToExtraStyleMap) + for (auto const &rIt : table123Styles->m_rowsToColsToExtraStyleMap) { if (rIt.first[0]>row || rIt.first[1]<row) continue; - for (auto colIt : rIt.second) + for (auto const &colIt : rIt.second) { colToExtraStyleMap.insert(std::map<Vec2i, LotusSpreadsheetInternal::Extra123Style>::value_type(colIt.first,colIt.second)); newColSet.insert(colIt.first[0]); newColSet.insert(colIt.first[1]+1); } } - for (auto rIt : table123Styles->m_rowsToColsToFormatStyleMap) + for (auto const &rIt : table123Styles->m_rowsToColsToFormatStyleMap) { if (rIt.first[0]>row || rIt.first[1]<row) continue; - for (auto colIt : rIt.second) + for (auto const &colIt : rIt.second) { colToFormatStyleMap.insert(std::map<Vec2i, LotusSpreadsheetInternal::Format123Style>::value_type(colIt.first,colIt.second)); newColSet.insert(colIt.first[0]); @@ -2722,10 +2722,7 @@ { int newEndCol=potentialMergeMap.find(col)->second; while (colIt!=newColSet.end() && *colIt<newEndCol) - { ++colIt; - continue; - } auto cell=cIt->second; cell.setNumSpannedCells(Vec2i(newEndCol-col,1)); sendCellContent(cell, style, 1); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libwps-0.4.13/src/lib/LotusStyleManager.h new/libwps-0.4.14/src/lib/LotusStyleManager.h --- old/libwps-0.4.13/src/lib/LotusStyleManager.h 2020-04-01 08:57:58.000000000 +0200 +++ new/libwps-0.4.14/src/lib/LotusStyleManager.h 2023-05-03 12:45:17.000000000 +0200 @@ -29,9 +29,12 @@ #include <librevenge-stream/librevenge-stream.h> #include "libwps_internal.h" +#include "libwps_tools_win.h" #include "WPSDebug.h" +class WPSGraphicStyle; + namespace LotusStyleManagerInternal { struct CellStyleEntry; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libwps-0.4.13/src/lib/MSWrite.cpp new/libwps-0.4.14/src/lib/MSWrite.cpp --- old/libwps-0.4.13/src/lib/MSWrite.cpp 2020-04-01 08:57:58.000000000 +0200 +++ new/libwps-0.4.14/src/lib/MSWrite.cpp 2023-05-02 10:33:42.000000000 +0200 @@ -1714,7 +1714,7 @@ } } -void MSWriteParser::insertNote(bool annotation, uint32_t fcPos, librevenge::RVNGString &label) +void MSWriteParser::insertNote(bool annotation, uint32_t fcPos, librevenge::RVNGString const &label) { std::vector<MSWriteParserInternal::Footnote>::iterator iter; @@ -1751,7 +1751,7 @@ WPS_DEBUG_MSG(("MSWriteParser::insertNote note not found!\n")); } -void MSWriteParser::startSection(MSWriteParserInternal::Section &section) +void MSWriteParser::startSection(MSWriteParserInternal::Section const &section) { std::vector<int> widths; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libwps-0.4.13/src/lib/MSWrite.h new/libwps-0.4.14/src/lib/MSWrite.h --- old/libwps-0.4.13/src/lib/MSWrite.h 2019-02-12 13:29:53.000000000 +0100 +++ new/libwps-0.4.14/src/lib/MSWrite.h 2023-05-02 10:33:36.000000000 +0200 @@ -169,11 +169,11 @@ bool readString(std::string &res, unsigned long lastPos); virtual void insertSpecial(uint8_t val, uint32_t fc, MSWriteParserInternal::Paragraph::Location location); virtual void insertControl(uint8_t val, uint32_t fc); - void insertNote(bool annotation, uint32_t fcPos, librevenge::RVNGString &label); + void insertNote(bool annotation, uint32_t fcPos, librevenge::RVNGString const &label); unsigned insertString(const unsigned char *str, unsigned size, libwps_tools_win::Font::Type type); static void getPageStyle(MSWriteParserInternal::Section &sep, WPSPageSpan &pageSpan); void getHeaderFooters(uint32_t first, MSWriteParserInternal::Section &sep, WPSPageSpan &pageSpan); - void startSection(MSWriteParserInternal::Section &section); + void startSection(MSWriteParserInternal::Section const &section); //! check if the file position is correct or not bool checkFilePosition(uint32_t pos) const diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libwps-0.4.13/src/lib/Multiplan.cpp new/libwps-0.4.14/src/lib/Multiplan.cpp --- old/libwps-0.4.13/src/lib/Multiplan.cpp 2020-04-01 08:57:58.000000000 +0200 +++ new/libwps-0.4.14/src/lib/Multiplan.cpp 2023-05-04 14:22:11.000000000 +0200 @@ -1285,9 +1285,9 @@ stack.back().push_back(instr); continue; } - std::vector<WKSContentListener::FormulaInstruction> child; if (instr.m_type!=WKSContentListener::FormulaInstruction::F_Function) { + std::vector<WKSContentListener::FormulaInstruction> child; child.push_back(instr); stack.push_back(child); continue; @@ -1424,9 +1424,9 @@ } std::vector<std::vector<WKSContentListener::FormulaInstruction> > stack; auto const &listOperators=MultiplanParserInternal::s_listOperatorsV2; - int const numOperators=int(WPS_N_ELEMENTS(listOperators)); + int const numOperators=int(WPS_N_ELEMENTS(MultiplanParserInternal::s_listOperatorsV2)); auto const &listFunctions=MultiplanParserInternal::s_listFunctionsV2; - int const numFunctions=int(WPS_N_ELEMENTS(listFunctions)); + int const numFunctions=int(WPS_N_ELEMENTS(MultiplanParserInternal::s_listFunctionsV2)); bool ok=true; input->seek(pos+1, librevenge::RVNG_SEEK_SET); while (input->tell()<endPos) @@ -1751,9 +1751,9 @@ break; } if (noneInstr) continue; - std::vector<WKSContentListener::FormulaInstruction> child; if (instr.m_type!=WKSContentListener::FormulaInstruction::F_Function) { + std::vector<WKSContentListener::FormulaInstruction> child; child.push_back(instr); stack.push_back(child); continue; @@ -2670,7 +2670,7 @@ WPSRowFormat rowFormat(16); rowFormat.m_isMinimalHeight=true; int lastRow=0; - for (auto it : m_state->m_cellPositionsMap) + for (auto const &it : m_state->m_cellPositionsMap) { int r=it.first; auto const &row = it.second; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libwps-0.4.13/src/lib/PocketWord.cpp new/libwps-0.4.14/src/lib/PocketWord.cpp --- old/libwps-0.4.13/src/lib/PocketWord.cpp 2021-12-06 13:35:58.000000000 +0100 +++ new/libwps-0.4.14/src/lib/PocketWord.cpp 2023-05-04 14:19:27.000000000 +0200 @@ -84,7 +84,7 @@ //! try to retrieve a color bool getColor(int id, WPSColor &col) const { - static WPSColor colors[16]= + static WPSColor const colors[16]= { WPSColor(0,0,0), WPSColor(128,128,128), WPSColor(192,192,192), WPSColor(255,255,255), WPSColor(255,0,0), WPSColor(0,255,0), WPSColor(0,0,255), WPSColor(0,255,255), @@ -614,8 +614,6 @@ { switch (val) { - case 0: - break; case 1: para.m_justify=libwps::JustificationRight; break; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libwps-0.4.13/src/lib/Quattro.cpp new/libwps-0.4.14/src/lib/Quattro.cpp --- old/libwps-0.4.13/src/lib/Quattro.cpp 2020-09-01 15:31:21.000000000 +0200 +++ new/libwps-0.4.14/src/lib/Quattro.cpp 2023-05-03 12:51:09.000000000 +0200 @@ -239,7 +239,7 @@ 0x808000, 0x008000, 0x800000, 0x008080 }; for (uint32_t i : quattroColorMap) - THIS->m_colorsList.push_back(WPSColor(quattroColorMap[i])); + THIS->m_colorsList.push_back(WPSColor(i)); } if (id < 0 || id >= int(m_colorsList.size())) { @@ -690,11 +690,17 @@ bool QuattroParser::checkHeader(std::shared_ptr<WPSStream> stream, bool strict) { + if (!stream) + { + WPS_DEBUG_MSG(("QuattroParser::checkHeader: called without stream\n")); + return false; + } + RVNGInputStreamPtr input = stream->m_input; libwps::DebugFile &ascFile=stream->m_ascii; libwps::DebugStream f; - if (!stream || !stream->checkFilePosition(12)) + if (!input || !stream->checkFilePosition(12)) { WPS_DEBUG_MSG(("QuattroParser::checkHeader: file is too short\n")); return false; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libwps-0.4.13/src/lib/Quattro9.h new/libwps-0.4.14/src/lib/Quattro9.h --- old/libwps-0.4.13/src/lib/Quattro9.h 2020-04-01 08:57:58.000000000 +0200 +++ new/libwps-0.4.14/src/lib/Quattro9.h 2023-05-03 12:56:09.000000000 +0200 @@ -31,6 +31,7 @@ #include "libwps_internal.h" #include "libwps_tools_win.h" +#include "WPSEntry.h" #include "WKSParser.h" #include "WPSGraphicStyle.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libwps-0.4.13/src/lib/Quattro9Graph.cpp new/libwps-0.4.14/src/lib/Quattro9Graph.cpp --- old/libwps-0.4.13/src/lib/Quattro9Graph.cpp 2020-04-01 08:57:58.000000000 +0200 +++ new/libwps-0.4.14/src/lib/Quattro9Graph.cpp 2023-05-02 13:27:06.000000000 +0200 @@ -779,7 +779,7 @@ // we must update the style here if (patId==0) style.setSurfaceColor(surfColor[0]); - else if (patId>0) + else { WPSGraphicStyle::Pattern pattern; if (m_state->getPattern32(patId, pattern)) @@ -1717,7 +1717,7 @@ { for (auto it=m_state->m_sheetIdToGraphMap.lower_bound(sheetId); it!=m_state->m_sheetIdToGraphMap.upper_bound(sheetId); ++it) { - auto &graph=it->second; + auto const &graph=it->second; if (!graph) continue; if (graph->m_type==graph->OLE) sendOLE(*graph, sheetId); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libwps-0.4.13/src/lib/Quattro9Spreadsheet.cpp new/libwps-0.4.14/src/lib/Quattro9Spreadsheet.cpp --- old/libwps-0.4.13/src/lib/Quattro9Spreadsheet.cpp 2020-09-01 15:31:21.000000000 +0200 +++ new/libwps-0.4.14/src/lib/Quattro9Spreadsheet.cpp 2023-05-02 13:32:44.000000000 +0200 @@ -101,7 +101,7 @@ if (m_fileFormat!=st.m_fileFormat) return false; int diff = WPSCellFormat::compare(st); if (diff) return false; - return m_fileFormat==st.m_fileFormat && m_alignAcrossColumn==st.m_alignAcrossColumn && m_extra==st.m_extra; + return m_alignAcrossColumn==st.m_alignAcrossColumn && m_extra==st.m_extra; } //! a cellule of a Quattro spreadsheet @@ -532,7 +532,6 @@ // we need to split the last data auto rows=rIt->first; auto cell=rIt->second; - ++rIt; column.m_rowsToCellMap.erase(rows); cell.m_rows[0]=maxRow+1; listCellToAdd.push_back(cell); @@ -554,7 +553,7 @@ { std::vector<WPSColumnFormat> widths; // g++-mp-7 does not like float(m_defaultSizes[0])/20.f), but this->m_default is ok... - WPSColumnFormat defWidth(float(this->m_defaultSizes[0])/20.f), actWidth; + WPSColumnFormat defWidth(float(this->m_defaultSizes[0])/20.f); defWidth.m_useOptimalWidth=true; int prevRow=-1; for (auto const &it : m_sizesMap[0]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libwps-0.4.13/src/lib/QuattroDos.cpp new/libwps-0.4.14/src/lib/QuattroDos.cpp --- old/libwps-0.4.13/src/lib/QuattroDos.cpp 2021-12-06 15:06:32.000000000 +0100 +++ new/libwps-0.4.14/src/lib/QuattroDos.cpp 2023-05-02 13:33:38.000000000 +0200 @@ -665,7 +665,7 @@ f << "_"; } else if (val==0xFF) f << "protected,"; - else if (val) f << "#protected=" << val << ","; + else f << "#protected=" << val << ","; isParsed=needWriteInAscii=true; break; case 0x25: // footer diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libwps-0.4.13/src/lib/QuattroDosSpreadsheet.cpp new/libwps-0.4.14/src/lib/QuattroDosSpreadsheet.cpp --- old/libwps-0.4.13/src/lib/QuattroDosSpreadsheet.cpp 2021-12-06 15:00:57.000000000 +0100 +++ new/libwps-0.4.14/src/lib/QuattroDosSpreadsheet.cpp 2023-05-04 12:32:49.000000000 +0200 @@ -301,7 +301,7 @@ enum Type { T_Spreadsheet, T_Filter, T_Report }; //! a constructor - Spreadsheet(Type type=T_Spreadsheet, int id=0) + explicit Spreadsheet(Type type=T_Spreadsheet, int id=0) : m_type(type) , m_id(id) , m_numCols(0) @@ -334,7 +334,7 @@ void insertChartPositions(std::map<Vec2i,Vec2i> const &chartPosMap, libwps_tools_win::Font::Type type) { int maxCol=-1; - for (auto it : chartPosMap) + for (auto const &it : chartPosMap) { if (it.second[0]>maxCol) maxCol=it.second[0]; if (m_positionToCellMap.find(it.first)!=m_positionToCellMap.end()) @@ -450,7 +450,7 @@ m_rowHeightMap.clear(); int actHeight=-1; Vec2i actPos(0,-1); - for (auto rIt : oldMap) + for (auto const &rIt : oldMap) { // first check for not filled row if (rIt.first[0]!=actPos[1]+1) @@ -525,7 +525,7 @@ int getMaximalSheet(Spreadsheet::Type type=Spreadsheet::T_Spreadsheet) const { int max=-1; - for (auto sheet : m_spreadsheetList) + for (auto const &sheet : m_spreadsheetList) { if (!sheet || sheet->m_type != type || sheet->m_id<=max || sheet->empty()) continue; max=sheet->m_id; @@ -535,7 +535,7 @@ //! returns the ith real spreadsheet std::shared_ptr<Spreadsheet> getSheet(Spreadsheet::Type type, int id) { - for (auto sheet : m_spreadsheetList) + for (auto const &sheet : m_spreadsheetList) { if (!sheet || sheet->m_type!=type || sheet->m_id!=id) continue; @@ -1534,7 +1534,6 @@ { cell.m_content.m_contentType=WKSContentListener::CellContent::C_TEXT; long begText=m_input->tell()+2, endText=begText+dataSz-2; - std::string s(""); // pascal string auto align=char(libwps::readU8(m_input)); if (align=='\'') cell.setHAlignment(WPSCellFormat::HALIGN_DEFAULT); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libwps-0.4.13/src/lib/QuattroFormula.cpp new/libwps-0.4.14/src/lib/QuattroFormula.cpp --- old/libwps-0.4.13/src/lib/QuattroFormula.cpp 2018-07-30 20:35:18.000000000 +0200 +++ new/libwps-0.4.14/src/lib/QuattroFormula.cpp 2023-05-02 13:37:58.000000000 +0200 @@ -227,7 +227,6 @@ } else listCellsPos.push_back(cell); - continue; } if (input->tell() !=endPos) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libwps-0.4.13/src/lib/QuattroGraph.cpp new/libwps-0.4.14/src/lib/QuattroGraph.cpp --- old/libwps-0.4.13/src/lib/QuattroGraph.cpp 2020-04-01 08:57:58.000000000 +0200 +++ new/libwps-0.4.14/src/lib/QuattroGraph.cpp 2023-05-02 13:40:58.000000000 +0200 @@ -1929,7 +1929,7 @@ bool find=false; while (it!=m_state->m_sheetIdToGraphMap.end() && it->first==sheetId) { - auto &graph=it++->second; + auto const &graph=it++->second; if (!graph || graph->m_cellBox[0]!=cell) continue; sendGraphic(*graph); find=true; @@ -1945,7 +1945,7 @@ { for (auto it=m_state->m_sheetIdToGraphMap.lower_bound(sheetId); it!=m_state->m_sheetIdToGraphMap.upper_bound(sheetId); ++it) { - auto &graph=it->second; + auto const &graph=it->second; if (!graph) continue; if (graph->m_type==graph->Shape) sendShape(*graph, sheetId); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libwps-0.4.13/src/lib/QuattroSpreadsheet.cpp new/libwps-0.4.14/src/lib/QuattroSpreadsheet.cpp --- old/libwps-0.4.13/src/lib/QuattroSpreadsheet.cpp 2021-12-06 14:39:32.000000000 +0100 +++ new/libwps-0.4.14/src/lib/QuattroSpreadsheet.cpp 2023-05-04 14:20:38.000000000 +0200 @@ -105,7 +105,7 @@ if (m_fontType!=st.m_fontType || m_fileFormat!=st.m_fileFormat) return false; int diff = WPSCellFormat::compare(st); if (diff) return false; - return m_fileFormat==st.m_fileFormat && m_alignAcrossColumn==st.m_alignAcrossColumn && m_extra==st.m_extra; + return m_alignAcrossColumn==st.m_alignAcrossColumn && m_extra==st.m_extra; } //! a cellule of a Quattro spreadsheet @@ -393,7 +393,7 @@ m_rowHeightMap.clear(); int actHeight=-1; Vec2i actPos(0,-1); - for (auto rIt : oldMap) + for (auto const &rIt : oldMap) { // first check for not filled row if (rIt.first[0]!=actPos[1]+1) @@ -439,7 +439,7 @@ c+=float(w)/20.f; } int r=0, prevR=0; - for (auto it : m_rowHeightMap) + for (auto const &it : m_rowHeightMap) { int maxR=std::min(it.first[1],cell[1]-1); if (prevR<it.first[0]) @@ -757,7 +757,6 @@ case 0x33: // formula res { long begText=input->tell()+1; - std::string s(""); // align + c string auto align=char(libwps::readU8(input)); if (align=='\'') cell.setHAlignment(WPSCellFormat::HALIGN_DEFAULT); @@ -1477,7 +1476,6 @@ instr=WKSContentListener::FormulaInstruction(); instr.m_type=WKSContentListener::FormulaInstruction::F_Cell; instr.m_fileName=fName; - bool ok = true; int pos[3]; // col, sheet, fl|row bool relative[3] = { false, false, false}; for (int d=0; d<2; ++d) pos[d]=int(libwps::readU8(input)); @@ -1501,10 +1499,7 @@ pos[2] &= 0x1fff; if (pos[0] < 0 || pos[0] > 255 || pos[2] < 0) { - if (ok) - { - WPS_DEBUG_MSG(("QuattroSpreadsheet::readCell: can not read cell position\n")); - } + WPS_DEBUG_MSG(("QuattroSpreadsheet::readCell: can not read cell position\n")); return false; } instr.m_position[0]=Vec2i(pos[0],pos[2]); @@ -1517,7 +1512,7 @@ } else instr.m_sheetId[0]=pos[1]; - return ok; + return true; } bool QuattroSpreadsheet::readCellReference(std::shared_ptr<WPSStream> const &stream, long endPos, @@ -1620,7 +1615,7 @@ } auto defFontType=m_mainParser.getDefaultFontType(); auto sheet = m_state->getSheet(sId, defFontType); - for (auto c: listGraphicCells) + for (auto const &c: listGraphicCells) sheet->getCell(c, defFontType).m_hasGraphic=true; m_listener->openSheet(sheet->getWidths(), m_state->getSheetName(sId)); m_mainParser.sendPageGraphics(sId); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libwps-0.4.13/src/lib/WKS4.cpp new/libwps-0.4.14/src/lib/WKS4.cpp --- old/libwps-0.4.13/src/lib/WKS4.cpp 2019-10-31 10:47:17.000000000 +0100 +++ new/libwps-0.4.14/src/lib/WKS4.cpp 2023-05-02 13:45:05.000000000 +0200 @@ -805,7 +805,7 @@ f << "_"; } else if (val==0xFF) f << "protected,"; - else if (val) f << "#protected=" << val << ","; + else f << "#protected=" << val << ","; isParsed=needWriteInAscii=true; break; case 0x25: // footer @@ -1164,7 +1164,7 @@ f << "_"; } else if (val==0xFF) f << "protected,"; - else if (val) f << "#protected=" << val << ","; + else f << "#protected=" << val << ","; isParsed=needWriteInAscii=true; break; case 0x40: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libwps-0.4.13/src/lib/WKS4Chart.cpp new/libwps-0.4.14/src/lib/WKS4Chart.cpp --- old/libwps-0.4.13/src/lib/WKS4Chart.cpp 2020-04-01 08:57:58.000000000 +0200 +++ new/libwps-0.4.14/src/lib/WKS4Chart.cpp 2023-05-04 14:22:49.000000000 +0200 @@ -236,7 +236,7 @@ int WKS4Chart::getNumCharts() const { int num=0; - for (auto chart : m_state->m_chartList) + for (auto const &chart : m_state->m_chartList) { if (chart && !chart->empty()) ++num; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libwps-0.4.13/src/lib/WKS4Spreadsheet.cpp new/libwps-0.4.14/src/lib/WKS4Spreadsheet.cpp --- old/libwps-0.4.13/src/lib/WKS4Spreadsheet.cpp 2020-04-01 08:57:58.000000000 +0200 +++ new/libwps-0.4.14/src/lib/WKS4Spreadsheet.cpp 2023-05-04 14:15:10.000000000 +0200 @@ -259,7 +259,7 @@ enum Type { T_Spreadsheet, T_Filter, T_Report }; //! a constructor - Spreadsheet(Type type=T_Spreadsheet, int id=0) + explicit Spreadsheet(Type type=T_Spreadsheet, int id=0) : m_type(type) , m_id(id) , m_numCols(0) @@ -335,7 +335,7 @@ int actHeight=-1; Vec2i actPos(0,-1); int const defHeight=m_heightDefault*20; // conversion from point to TWIP - for (auto rIt : oldMap) + for (auto const &rIt : oldMap) { // first check for not filled row if (rIt.first[0]!=actPos[1]+1) @@ -439,7 +439,7 @@ int getMaximalSheet(Spreadsheet::Type type=Spreadsheet::T_Spreadsheet) const { int max=-1; - for (auto sheet : m_spreadsheetList) + for (auto const &sheet : m_spreadsheetList) { if (!sheet || sheet->m_type != type || sheet->m_id<=max || sheet->empty()) continue; max=sheet->m_id; @@ -449,7 +449,7 @@ //! returns the ith real spreadsheet std::shared_ptr<Spreadsheet> getSheet(Spreadsheet::Type type, int id) { - for (auto sheet : m_spreadsheetList) + for (auto const &sheet : m_spreadsheetList) { if (!sheet || sheet->m_type!=type || sheet->m_id!=id) continue; @@ -1792,7 +1792,6 @@ { instr=WKSContentListener::FormulaInstruction(); instr.m_type=WKSContentListener::FormulaInstruction::F_Cell; - bool ok = true; int pos[2]; bool absolute[2] = { true, true}; for (int dim = 0; dim < 2; dim++) @@ -1832,15 +1831,12 @@ { std::stringstream f; f << "###[" << pos[1] << "," << pos[0] << "]"; - if (ok) - { - WPS_DEBUG_MSG(("WKS4Spreadsheet::readCell: can not read cell position\n")); - } + WPS_DEBUG_MSG(("WKS4Spreadsheet::readCell: can not read cell position\n")); return false; } instr.m_position[0]=Vec2i(pos[0],pos[1]); instr.m_positionRelative[0]=Vec2b(!absolute[0],!absolute[1]); - return ok; + return true; } namespace WKS4SpreadsheetInternal diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libwps-0.4.13/src/lib/WKSChart.cpp new/libwps-0.4.14/src/lib/WKSChart.cpp --- old/libwps-0.4.13/src/lib/WKSChart.cpp 2018-07-30 17:00:47.000000000 +0200 +++ new/libwps-0.4.14/src/lib/WKSChart.cpp 2023-05-04 12:22:55.000000000 +0200 @@ -329,7 +329,7 @@ interface->insertChartAxis(axis); } // series - for (auto it : m_serieMap) + for (auto const &it : m_serieMap) { auto const &serie = it.second; if (!serie.valid()) continue; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libwps-0.4.13/src/lib/WKSChart.h new/libwps-0.4.14/src/lib/WKSChart.h --- old/libwps-0.4.13/src/lib/WKSChart.h 2021-12-07 09:57:45.000000000 +0100 +++ new/libwps-0.4.14/src/lib/WKSChart.h 2023-05-02 09:24:34.000000000 +0200 @@ -257,7 +257,7 @@ return m_cell.valid(); if (m_contentType!=C_Text) return false; - for (auto &e : m_textEntryList) + for (auto const &e : m_textEntryList) { if (e.valid()) return true; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libwps-0.4.13/src/lib/WKSContentListener.cpp new/libwps-0.4.14/src/lib/WKSContentListener.cpp --- old/libwps-0.4.13/src/lib/WKSContentListener.cpp 2020-04-01 08:57:58.000000000 +0200 +++ new/libwps-0.4.14/src/lib/WKSContentListener.cpp 2023-05-04 12:31:52.000000000 +0200 @@ -617,7 +617,7 @@ } void WKSContentListener::insertPicture -(WPSPosition const &pos, const librevenge::RVNGBinaryData &binaryData, std::string type, +(WPSPosition const &pos, const librevenge::RVNGBinaryData &binaryData, std::string const &type, WPSGraphicStyle const &style) { if (!_openFrame(pos, style)) return; @@ -939,7 +939,7 @@ // Check whether the document is calling itself bool sendDoc = true; - for (auto subDoc : m_ds->m_subDocuments) + for (auto const &subDoc : m_ds->m_subDocuments) { if (!subDocument) break; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libwps-0.4.13/src/lib/WKSContentListener.h new/libwps-0.4.14/src/lib/WKSContentListener.h --- old/libwps-0.4.13/src/lib/WKSContentListener.h 2018-07-30 16:45:21.000000000 +0200 +++ new/libwps-0.4.14/src/lib/WKSContentListener.h 2023-05-03 09:23:29.000000000 +0200 @@ -203,7 +203,7 @@ void insertComment(WPSSubDocumentPtr &subDocument); /** adds a picture in given position */ void insertPicture(WPSPosition const &pos, const librevenge::RVNGBinaryData &binaryData, - std::string type="image/pict", WPSGraphicStyle const &style=WPSGraphicStyle::emptyStyle()); + std::string const &type="image/pict", WPSGraphicStyle const &style=WPSGraphicStyle::emptyStyle()); /** adds an object with replacement picture in given position */ void insertObject(WPSPosition const &pos, const WPSEmbeddedObject &obj, WPSGraphicStyle const &style=WPSGraphicStyle::emptyStyle()); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libwps-0.4.13/src/lib/WPS4.cpp new/libwps-0.4.14/src/lib/WPS4.cpp --- old/libwps-0.4.13/src/lib/WPS4.cpp 2019-02-12 13:30:11.000000000 +0100 +++ new/libwps-0.4.14/src/lib/WPS4.cpp 2023-05-03 09:38:12.000000000 +0200 @@ -371,7 +371,7 @@ m_listener->insertLabelNote(WPSContentListener::FOOTNOTE, label, subdoc); } -void WPS4Parser::createTextBox(WPSEntry const &entry, WPSPosition const &pos, librevenge::RVNGPropertyList &extras) +void WPS4Parser::createTextBox(WPSEntry const &entry, WPSPosition const &pos, librevenge::RVNGPropertyList const &extras) { if (m_listener.get() == nullptr) return; WPSSubDocumentPtr subdoc(new WPS4ParserInternal::SubDocument diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libwps-0.4.13/src/lib/WPS4.h new/libwps-0.4.14/src/lib/WPS4.h --- old/libwps-0.4.13/src/lib/WPS4.h 2019-02-12 13:29:53.000000000 +0100 +++ new/libwps-0.4.14/src/lib/WPS4.h 2023-05-03 09:38:21.000000000 +0200 @@ -104,7 +104,7 @@ /** creates a document for a footnote entry with label and then send the data*/ void createNote(WPSEntry const &entry, librevenge::RVNGString const &label); //! creates a textbox and then send the data - void createTextBox(WPSEntry const &entry, WPSPosition const &pos, librevenge::RVNGPropertyList &extras); + void createTextBox(WPSEntry const &entry, WPSPosition const &pos, librevenge::RVNGPropertyList const &extras); //! sends text corresponding to the entry to the listener (via WPS4Text) void send(WPSEntry const &entry, libwps::SubDocumentType type); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libwps-0.4.13/src/lib/WPS4Graph.cpp new/libwps-0.4.14/src/lib/WPS4Graph.cpp --- old/libwps-0.4.13/src/lib/WPS4Graph.cpp 2017-11-14 11:01:33.000000000 +0100 +++ new/libwps-0.4.14/src/lib/WPS4Graph.cpp 2023-05-04 14:17:36.000000000 +0200 @@ -96,7 +96,7 @@ // update the positions and send data to the listener void WPS4Graph::storeObjects(std::map<int,WPSEmbeddedObject> const &objectsMap) { - for (auto it : objectsMap) + for (auto const &it : objectsMap) { if (m_state->m_idToObjectMap.find(it.first)!=m_state->m_idToObjectMap.end()) continue; @@ -138,7 +138,7 @@ #ifdef DEBUG bool firstSend = false; #endif - for (auto it : m_state->m_idToObjectMap) + for (auto const &it : m_state->m_idToObjectMap) { if (it.second.m_sent) continue; #ifdef DEBUG diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libwps-0.4.13/src/lib/WPS4Text.cpp new/libwps-0.4.14/src/lib/WPS4Text.cpp --- old/libwps-0.4.13/src/lib/WPS4Text.cpp 2018-08-01 20:06:00.000000000 +0200 +++ new/libwps-0.4.14/src/lib/WPS4Text.cpp 2023-05-04 12:37:30.000000000 +0200 @@ -550,7 +550,7 @@ { if (libwps::readU8(m_input.get()) == 0x0C) numPage++; } - for (auto it : m_state->m_objectMap) + for (auto const &it : m_state->m_objectMap) { if (it.second.m_page<=numPage) continue; if (it.second.m_page<=numPage+10) @@ -566,7 +566,7 @@ // page object void WPS4Text::sendObjects(int page) { - for (auto it : m_state->m_objectMap) + for (auto const &it : m_state->m_objectMap) { auto const &obj=it.second; if (obj.m_page<=0 || obj.m_id<0) continue; @@ -1262,7 +1262,7 @@ char const *indexName = which ? "BTEC" : "BTEP"; char const *sIndexName = which ? "FDPC" : "FDPP"; - auto &nameMultiMap =getNameEntryMap(); + auto const &nameMultiMap =getNameEntryMap(); auto pos = nameMultiMap.find(indexName); if (pos == nameMultiMap.end()) return false; @@ -2342,7 +2342,7 @@ auto pos = long(libwps::readU32(m_input)); actPos = m_input->tell(); - if (pos >= 0 && size > 0 && mainParser().checkFilePosition(pos+size)) + if (pos >= 0 && size > 0 && (long)((unsigned long) pos+(unsigned long) size)>pos && mainParser().checkFilePosition(pos+size)) { obj.m_pos.setBegin(pos); obj.m_pos.setLength(size); @@ -2454,7 +2454,7 @@ typedef enum { T_CST=0, T_COMPLEX, T_UNKNOWN} Type; //! constructor - PLC(PLCType w= WPS4TextInternal::Unknown, Position p=P_UNKNOWN, Type t=T_UNKNOWN, unsigned char tChar='\0', int f=1) : + explicit PLC(PLCType w= WPS4TextInternal::Unknown, Position p=P_UNKNOWN, Type t=T_UNKNOWN, unsigned char tChar='\0', int f=1) : m_type(w), m_pos(p), m_contentType(t), m_textChar(tChar), m_cstFactor(f) {} PLC(PLC const &orig)=default; PLC(PLC &&orig)=default; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libwps-0.4.13/src/lib/WPS8.cpp new/libwps-0.4.14/src/lib/WPS8.cpp --- old/libwps-0.4.13/src/lib/WPS8.cpp 2020-09-01 15:31:21.000000000 +0200 +++ new/libwps-0.4.14/src/lib/WPS8.cpp 2023-05-04 12:28:42.000000000 +0200 @@ -2097,7 +2097,7 @@ f << "SPELLING:"; if (vers != 6) f << "version = " << vers << ", "; f << "list=["; - for (auto it : listIds) + for (auto const &it : listIds) { uint32_t val = it.first; f << "SP" << std::dec << it.second << "(" << (val&0xFF) << ":" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libwps-0.4.13/src/lib/WPS8Graph.cpp new/libwps-0.4.14/src/lib/WPS8Graph.cpp --- old/libwps-0.4.13/src/lib/WPS8Graph.cpp 2020-09-01 15:31:21.000000000 +0200 +++ new/libwps-0.4.14/src/lib/WPS8Graph.cpp 2023-05-04 14:16:43.000000000 +0200 @@ -150,7 +150,7 @@ //////////////////////////////////////////////////////////// bool WPS8Graph::readStructures(RVNGInputStreamPtr const &input) { - auto &nameTable = m_mainParser.getNameEntryMap(); + auto const &nameTable = m_mainParser.getNameEntryMap(); // contains a text and 8 borders cells? auto pos = nameTable.lower_bound("BDR "); @@ -293,7 +293,7 @@ #ifdef DEBUG // check the border - for (auto pos : m_state->m_borderMap) + for (auto const &pos : m_state->m_borderMap) { int id = pos.first; bool parsed = pos.second.m_parsed; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libwps-0.4.13/src/lib/WPS8Table.cpp new/libwps-0.4.14/src/lib/WPS8Table.cpp --- old/libwps-0.4.13/src/lib/WPS8Table.cpp 2018-07-31 12:42:12.000000000 +0200 +++ new/libwps-0.4.14/src/lib/WPS8Table.cpp 2023-05-03 09:56:09.000000000 +0200 @@ -318,7 +318,7 @@ { m_state->m_tableMap.clear(); - auto &nameTable = m_mainParser.getNameEntryMap(); + auto const &nameTable = m_mainParser.getNameEntryMap(); auto pos = nameTable.lower_bound("MCLD"); while (pos != nameTable.end()) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libwps-0.4.13/src/lib/WPS8Text.cpp new/libwps-0.4.14/src/lib/WPS8Text.cpp --- old/libwps-0.4.13/src/lib/WPS8Text.cpp 2020-04-01 10:23:19.000000000 +0200 +++ new/libwps-0.4.14/src/lib/WPS8Text.cpp 2023-05-04 14:14:09.000000000 +0200 @@ -951,7 +951,7 @@ */ bool WPS8Text::readStructures() { - auto &nameTable = getNameEntryMap(); + auto const &nameTable = getNameEntryMap(); /* What is the total length of the text? */ auto pos = nameTable.lower_bound("TEXT"); if (nameTable.end() == pos) @@ -1299,7 +1299,7 @@ nMap[&note] = nSameNote; } - for (auto it : nMap) + for (auto const &it : nMap) { auto &notes = const_cast<Notes &>(*it.first); if (it.second != 0) @@ -1946,7 +1946,7 @@ typedef enum { T_CST=0, T_STRUCT, T_COMPLEX, T_UNKNOWN} Type; //! constructor - PLC(PLCType w= WPS8TextInternal::Unknown, Position p=P_UNKNOWN, Type t=T_UNKNOWN) + explicit PLC(PLCType w= WPS8TextInternal::Unknown, Position p=P_UNKNOWN, Type t=T_UNKNOWN) : m_type(w) , m_pos(p) , m_contentType(t) {} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libwps-0.4.13/src/lib/WPS8TextStyle.cpp new/libwps-0.4.14/src/lib/WPS8TextStyle.cpp --- old/libwps-0.4.13/src/lib/WPS8TextStyle.cpp 2020-04-01 08:57:58.000000000 +0200 +++ new/libwps-0.4.14/src/lib/WPS8TextStyle.cpp 2023-05-03 09:59:51.000000000 +0200 @@ -177,7 +177,7 @@ //////////////////////////////////////////////////////////// bool WPS8TextStyle::readStructures() { - auto &nameTable = m_mainParser.getNameEntryMap(); + auto const &nameTable = m_mainParser.getNameEntryMap(); /* read fonts table */ auto pos = nameTable.find("FONT"); @@ -896,8 +896,7 @@ if (nChild == 1) break; auto numTabs = int(data.m_recursData[0].m_value); - if (numTabs == 0 || nChild < 2 || - data.m_recursData[1].isBad() || data.m_recursData[1].id() != 0x28) + if (numTabs == 0 || data.m_recursData[1].isBad() || data.m_recursData[1].id() != 0x28) { WPS_DEBUG_MSG(("WPS8TextStyle::readParagraph can not find second child\n")); ok = false; @@ -1163,7 +1162,6 @@ } case 0: { - WPS8Struct::FileData mainData; auto dataSz = int(libwps::readU16(m_input)); if (dataSz+2 != 2*size) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libwps-0.4.13/src/lib/WPSContentListener.cpp new/libwps-0.4.14/src/lib/WPSContentListener.cpp --- old/libwps-0.4.13/src/lib/WPSContentListener.cpp 2020-04-01 08:57:58.000000000 +0200 +++ new/libwps-0.4.14/src/lib/WPSContentListener.cpp 2023-05-03 10:00:37.000000000 +0200 @@ -1141,7 +1141,7 @@ } void WPSContentListener::insertPicture -(WPSPosition const &pos, const librevenge::RVNGBinaryData &binaryData, std::string type, +(WPSPosition const &pos, const librevenge::RVNGBinaryData &binaryData, std::string const &type, librevenge::RVNGPropertyList frameExtras) { if (!_openFrame(pos, frameExtras)) return; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libwps-0.4.13/src/lib/WPSContentListener.h new/libwps-0.4.14/src/lib/WPSContentListener.h --- old/libwps-0.4.13/src/lib/WPSContentListener.h 2017-08-08 09:36:24.000000000 +0200 +++ new/libwps-0.4.14/src/lib/WPSContentListener.h 2023-05-03 10:00:51.000000000 +0200 @@ -106,7 +106,7 @@ /** adds a picture in given position */ void insertPicture(WPSPosition const &pos, const librevenge::RVNGBinaryData &binaryData, - std::string type="image/pict", + std::string const &type="image/pict", librevenge::RVNGPropertyList frameExtras=librevenge::RVNGPropertyList()); /** adds an object with replacement picture in given position */ void insertObject(WPSPosition const &pos, const WPSEmbeddedObject &obj, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libwps-0.4.13/src/lib/WPSDebug.cpp new/libwps-0.4.14/src/lib/WPSDebug.cpp --- old/libwps-0.4.13/src/lib/WPSDebug.cpp 2018-07-30 16:19:00.000000000 +0200 +++ new/libwps-0.4.14/src/lib/WPSDebug.cpp 2023-05-04 13:06:28.000000000 +0200 @@ -89,15 +89,15 @@ for (auto const &note : m_notes) map[note] = 0; size_t i = 0; - for (auto it : map) + for (auto const &it : map) m_notes[i++] = it.first; if (i != numNotes) m_notes.resize(i); std::map<Vec2<long>,int,Vec2<long>::PosSizeLtX> sMap; - for (auto s : m_skipZones) sMap[s] = 0; + for (auto const &s : m_skipZones) sMap[s] = 0; i = 0; - for (auto it : sMap) + for (auto const &it : sMap) m_skipZones[i++] = it.first; if (i < m_skipZones.size()) m_skipZones.resize(i); } @@ -188,7 +188,7 @@ //////////////////////////////////////////////////////////// namespace Debug { -bool dumpFile(librevenge::RVNGBinaryData &data, char const *fileName) +bool dumpFile(librevenge::RVNGBinaryData const &data, char const *fileName) { if (!fileName) return false; if (!data.size() || !data.getDataBuffer()) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libwps-0.4.13/src/lib/WPSDebug.h new/libwps-0.4.14/src/lib/WPSDebug.h --- old/libwps-0.4.13/src/lib/WPSDebug.h 2017-11-14 11:56:11.000000000 +0100 +++ new/libwps-0.4.14/src/lib/WPSDebug.h 2023-05-03 10:01:46.000000000 +0200 @@ -45,7 +45,7 @@ //! a debug function to store in a datafile in the current directory //! WARNING: this function erase the file fileName if it exists //! (if debug_with_files is not defined, does nothing) -bool dumpFile(librevenge::RVNGBinaryData &data, char const *fileName); +bool dumpFile(librevenge::RVNGBinaryData const &data, char const *fileName); //! returns a file name from an ole/... name std::string flattenFileName(std::string const &name); @@ -177,7 +177,7 @@ { namespace Debug { -inline bool dumpFile(librevenge::RVNGBinaryData &, char const *) +inline bool dumpFile(librevenge::RVNGBinaryData const &, char const *) { return true; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libwps-0.4.13/src/lib/WPSGraphicShape.h new/libwps-0.4.14/src/lib/WPSGraphicShape.h --- old/libwps-0.4.13/src/lib/WPSGraphicShape.h 2018-01-21 12:16:28.000000000 +0100 +++ new/libwps-0.4.14/src/lib/WPSGraphicShape.h 2023-05-02 09:28:04.000000000 +0200 @@ -42,7 +42,7 @@ struct PathData { //! constructor - PathData(char type, Vec2f const &x=Vec2f(), Vec2f const &x1=Vec2f(), Vec2f const &x2=Vec2f()) + explicit PathData(char type, Vec2f const &x=Vec2f(), Vec2f const &x1=Vec2f(), Vec2f const &x2=Vec2f()) : m_type(type) , m_x(x) , m_x1(x1) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libwps-0.4.13/src/lib/WPSGraphicStyle.cpp new/libwps-0.4.14/src/lib/WPSGraphicStyle.cpp --- old/libwps-0.4.13/src/lib/WPSGraphicStyle.cpp 2020-04-01 08:57:58.000000000 +0200 +++ new/libwps-0.4.14/src/lib/WPSGraphicStyle.cpp 2023-05-04 13:05:50.000000000 +0200 @@ -306,7 +306,7 @@ else { librevenge::RVNGPropertyListVector gradient; - for (auto s : m_gradientStopList) + for (auto const &s : m_gradientStopList) { librevenge::RVNGPropertyList grad; grad.insert("svg:offset", double(s.m_offset), librevenge::RVNG_PERCENT); @@ -469,7 +469,7 @@ if (m_gradientAngle > a.m_gradientAngle) return 1; if (m_gradientStopList.size() < a.m_gradientStopList.size()) return 1; if (m_gradientStopList.size() > a.m_gradientStopList.size()) return -1; - for (auto c : m_gradientStopList) + for (auto const &c : m_gradientStopList) { diff = c.cmp(c); if (diff) return diff; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libwps-0.4.13/src/lib/WPSGraphicStyle.h new/libwps-0.4.14/src/lib/WPSGraphicStyle.h --- old/libwps-0.4.13/src/lib/WPSGraphicStyle.h 2020-09-01 15:31:21.000000000 +0200 +++ new/libwps-0.4.14/src/lib/WPSGraphicStyle.h 2023-05-02 09:23:11.000000000 +0200 @@ -48,7 +48,7 @@ struct GradientStop { //! constructor - GradientStop(float offset=0.0, WPSColor const &col=WPSColor::black(), float opacity=1.0) + explicit GradientStop(float offset=0.0, WPSColor const &col=WPSColor::black(), float opacity=1.0) : m_offset(offset) , m_color(col) , m_opacity(opacity) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libwps-0.4.13/src/lib/WPSList.cpp new/libwps-0.4.14/src/lib/WPSList.cpp --- old/libwps-0.4.13/src/lib/WPSList.cpp 2017-08-08 10:56:32.000000000 +0200 +++ new/libwps-0.4.14/src/lib/WPSList.cpp 2023-05-03 10:03:36.000000000 +0200 @@ -136,7 +136,7 @@ if (m_id == newId) return; m_previousId = m_id; m_id = newId; - for (auto &level : m_levels) + for (auto const &level : m_levels) level.resetSendToInterface(); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libwps-0.4.13/src/lib/WPSOLE1Parser.cpp new/libwps-0.4.14/src/lib/WPSOLE1Parser.cpp --- old/libwps-0.4.13/src/lib/WPSOLE1Parser.cpp 2018-08-02 10:19:11.000000000 +0200 +++ new/libwps-0.4.14/src/lib/WPSOLE1Parser.cpp 2023-05-04 14:18:01.000000000 +0200 @@ -108,7 +108,7 @@ { if (m_pictureIdToZoneIdListCreated) return; m_pictureIdToZoneIdListCreated=true; - for (auto it : m_idToZoneMap) + for (auto const &it : m_idToZoneMap) { if (it.second.m_names[1]=="Lotus:TOOLS:OEMString") m_pictureIdToZoneIdList.push_back(it.first); @@ -127,7 +127,7 @@ WPSOLE1Parser::~WPSOLE1Parser() { #ifdef DEBUG - for (auto oIt : m_state->m_idToZoneMap) + for (auto const &oIt : m_state->m_idToZoneMap) { if (oIt.first>=0) checkIfParsed(oIt.second); } @@ -268,7 +268,7 @@ auto dSz=long(libwps::readU32(input)); if (dSz>0) { - if (dPtr<0 || dSz<0 || dPtr+dSz<0 || !stream.checkFilePosition(dPtr+dSz)) + if (dPtr<0 || (long)((unsigned long)dPtr+(unsigned long)dSz)<dPtr || !stream.checkFilePosition(dPtr+dSz)) { WPS_DEBUG_MSG(("WPSOLE1Parser::createZones: oops some zone seems bad\n")); f << "###"; @@ -346,7 +346,7 @@ std::shared_ptr<WPSStream> WPSOLE1Parser::getStreamForName(std::string const &name) const { if (name.empty()) return std::shared_ptr<WPSStream>(); - for (auto oIt : m_state->m_idToZoneMap) + for (auto const &oIt : m_state->m_idToZoneMap) { if (oIt.second.m_names[1]==name) return getStream(oIt.second); @@ -481,7 +481,7 @@ bool WPSOLE1Parser::updateMetaData(librevenge::RVNGPropertyList &metadata, libwps_tools_win::Font::Type encoding) const { - for (auto oIt : m_state->m_idToZoneMap) + for (auto const &oIt : m_state->m_idToZoneMap) { WPSOLE1ParserInternal::OLEZone const &zone=oIt.second; if (zone.m_names[1]!="Doc Info Object") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libwps-0.4.13/src/lib/WPSOLEObject.cpp new/libwps-0.4.14/src/lib/WPSOLEObject.cpp --- old/libwps-0.4.13/src/lib/WPSOLEObject.cpp 2018-07-31 13:19:25.000000000 +0200 +++ new/libwps-0.4.14/src/lib/WPSOLEObject.cpp 2023-05-03 10:36:40.000000000 +0200 @@ -140,7 +140,6 @@ { if (!stream) return false; RVNGInputStreamPtr &input=stream->m_input; - libwps::DebugFile &ascFile=stream->m_ascii; libwps::DebugStream f; if (endPos<=0) endPos=stream->m_eof; @@ -179,6 +178,7 @@ } if (!ok) { + libwps::DebugFile &ascFile=stream->m_ascii; f << "###"; input->seek(pos, librevenge::RVNG_SEEK_SET); ascFile.addPos(pos); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libwps-0.4.13/src/lib/WPSOLEStream.cpp new/libwps-0.4.14/src/lib/WPSOLEStream.cpp --- old/libwps-0.4.13/src/lib/WPSOLEStream.cpp 2020-04-01 08:57:58.000000000 +0200 +++ new/libwps-0.4.14/src/lib/WPSOLEStream.cpp 2023-05-03 10:41:54.000000000 +0200 @@ -1290,7 +1290,7 @@ // read block one by one, seems fast enough unsigned long bytes = 0; - for (unsigned long i=0; (i < blocks.size()) & (bytes<maxlen); i++) + for (unsigned long i=0; (i < blocks.size()) && (bytes<maxlen); i++) { unsigned long block = blocks[i]; unsigned long pos = m_bbat.m_blockSize * (block+1); @@ -1333,7 +1333,7 @@ // read small block one by one unsigned long bytes = 0; - for (unsigned long i=0; (i<blocks.size()) & (bytes<maxlen); i++) + for (unsigned long i=0; (i<blocks.size()) && (bytes<maxlen); i++) { unsigned long block = blocks[i]; @@ -1881,7 +1881,7 @@ RVNGInputStreamPtr getOLEInputStream(RVNGInputStreamPtr input) { RVNGInputStreamPtr ole=std::make_shared<WPSOLEStream>(input); - if (!ole || !ole->isStructured()) + if (!ole->isStructured()) return RVNGInputStreamPtr(); return ole; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libwps-0.4.13/src/lib/WPSOLEStream.h new/libwps-0.4.14/src/lib/WPSOLEStream.h --- old/libwps-0.4.13/src/lib/WPSOLEStream.h 2017-10-12 21:20:08.000000000 +0200 +++ new/libwps-0.4.14/src/lib/WPSOLEStream.h 2023-05-03 12:47:24.000000000 +0200 @@ -30,10 +30,7 @@ #include <string> #include <vector> -namespace librevenge -{ -class RVNGInputStream; -} +#include "libwps_internal.h" namespace libwps_OLE { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libwps-0.4.13/src/lib/WPSParagraph.h new/libwps-0.4.14/src/lib/WPSParagraph.h --- old/libwps-0.4.13/src/lib/WPSParagraph.h 2018-07-30 21:27:32.000000000 +0200 +++ new/libwps-0.4.14/src/lib/WPSParagraph.h 2023-05-02 09:21:26.000000000 +0200 @@ -37,7 +37,7 @@ struct WPSTabStop { enum Alignment { LEFT, RIGHT, CENTER, DECIMAL, BAR }; - WPSTabStop(double position = 0.0, Alignment alignment = LEFT, uint16_t leaderCharacter='\0', uint8_t leaderNumSpaces = 0) + explicit WPSTabStop(double position = 0.0, Alignment alignment = LEFT, uint16_t leaderCharacter='\0', uint8_t leaderNumSpaces = 0) : m_position(position) , m_alignment(alignment) , m_leaderCharacter(leaderCharacter) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libwps-0.4.13/src/lib/WPSPosition.h new/libwps-0.4.14/src/lib/WPSPosition.h --- old/libwps-0.4.13/src/lib/WPSPosition.h 2020-09-01 15:31:21.000000000 +0200 +++ new/libwps-0.4.14/src/lib/WPSPosition.h 2023-05-02 09:25:20.000000000 +0200 @@ -50,7 +50,7 @@ public: //! constructor - WPSPosition(Vec2f const &orig=Vec2f(), Vec2f const &sz=Vec2f(), librevenge::RVNGUnit unt=librevenge::RVNG_INCH) + explicit WPSPosition(Vec2f const &orig=Vec2f(), Vec2f const &sz=Vec2f(), librevenge::RVNGUnit unt=librevenge::RVNG_INCH) : m_anchorTo(Char) , m_anchorCellName() , m_xPos(XLeft) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libwps-0.4.13/src/lib/WPSSubDocument.h new/libwps-0.4.14/src/lib/WPSSubDocument.h --- old/libwps-0.4.13/src/lib/WPSSubDocument.h 2017-11-14 11:58:37.000000000 +0100 +++ new/libwps-0.4.14/src/lib/WPSSubDocument.h 2023-05-02 09:27:46.000000000 +0200 @@ -34,7 +34,7 @@ { public: /// constructor - WPSSubDocument(RVNGInputStreamPtr const &input, int id=0); + explicit WPSSubDocument(RVNGInputStreamPtr const &input, int id=0); /// destructor virtual ~WPSSubDocument(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libwps-0.4.13/src/lib/WPSTable.cpp new/libwps-0.4.14/src/lib/WPSTable.cpp --- old/libwps-0.4.13/src/lib/WPSTable.cpp 2018-07-30 15:43:13.000000000 +0200 +++ new/libwps-0.4.14/src/lib/WPSTable.cpp 2023-05-04 14:20:11.000000000 +0200 @@ -140,7 +140,7 @@ std::vector<float> positions; float maxPosiblePos=0; int actCell = -1; - for (auto it : set) + for (auto const &it : set) { float pos = it.getPos(dim); if (actCell < 0 || pos > maxPosiblePos) @@ -156,15 +156,15 @@ } std::vector<int> numYSet(listPositions[1].size(), 0); std::vector<int> numYUnset(listPositions[1].size(), 0); - for (auto &cell : m_cellsList) + for (auto const &cell : m_cellsList) { int cellPos[2], spanCell[2]; for (int dim = 0; dim < 2; dim++) { - float pt[2] = { cell->box().min()[dim], - cell->box().max()[dim] - }; - std::vector<float> &pos = listPositions[dim]; + float const pt[2] = { cell->box().min()[dim], + cell->box().max()[dim] + }; + std::vector<float> const &pos = listPositions[dim]; size_t numPos = pos.size(); size_t i = 0; while (i+1 < numPos && pos[i+1] < pt[0]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libwps-0.4.13/src/lib/libwps_internal.h new/libwps-0.4.14/src/lib/libwps_internal.h --- old/libwps-0.4.13/src/lib/libwps_internal.h 2018-07-30 16:15:54.000000000 +0200 +++ new/libwps-0.4.14/src/lib/libwps_internal.h 2023-05-02 09:21:04.000000000 +0200 @@ -1084,8 +1084,8 @@ WPSEmbeddedObject(WPSEmbeddedObject &&) = default; WPSEmbeddedObject &operator=(WPSEmbeddedObject &&) = default; //! constructor - WPSEmbeddedObject(librevenge::RVNGBinaryData const &binaryData, - std::string const &type="image/pict") : m_size(), m_dataList(), m_typeList(), m_sent(false) + explicit WPSEmbeddedObject(librevenge::RVNGBinaryData const &binaryData, std::string const &type="image/pict") : + m_size(), m_dataList(), m_typeList(), m_sent(false) { add(binaryData, type); }

1 0

commit libunwind for openSUSE:Factory
by Source-Sync 30 Jun '23

30 Jun '23

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package libunwind for openSUSE:Factory checked in at 2023-06-30 19:58:03 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libunwind (Old) and /work/SRC/openSUSE:Factory/.libunwind.new.13546 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libunwind" Fri Jun 30 19:58:03 2023 rev:49 rq:1095981 version:1.7.0 Changes: -------- --- /work/SRC/openSUSE:Factory/libunwind/libunwind.changes 2022-05-24 20:31:18.886916615 +0200 +++ /work/SRC/openSUSE:Factory/.libunwind.new.13546/libunwind.changes 2023-06-30 19:58:10.481394533 +0200 @@ -1,0 +2,58 @@ +Fri Jun 23 18:49:48 UTC 2023 - Pedro Monreal <pmonreal(a)suse.com> + +- Update to 1.7.0: + * DWARF: dwarf4 fix cie parsing. + * x86_64: Stop aliasing RSP and CFA. + * Prefer EXTBL unwinding on ARM. + * [GCC pedantic] Fix "error: comma at end of enumerator list" + when linking to libunwind. + * Fix table indexing in dwarf_search_unwind_table. + * Expose function-pointer-to-name API. + * Add port for Linux on LoongArch. + * Add more POSIX polyfills for nix cross-build on win. + * DWARF: avoid a data race. + * skip latex2man check with --disable-documentation. + * Skip init_mem_validate calls during remote unwind. + * [Loongarch64] amend the LoongArch64's CMakeLists.txt and compiling error. + * Update license in pal-single-threaded.c. + * Fix to malloc call in tdep_get_elf_image. + * Updated to determine PAGE_SIZE dynamically. + * Unwind with pointer authentication on arm64. + * Make some structs non-empty. + * DWARF: avoid invalid memory access with invalid CFI. + * fix incorrect store in AArch64 getcontext. + * avoid leaking registers across sigreturn. + * Use constant for array size in os-linux. + * added coredump support for s390x. + * Allow an alternate LOG_DRIVER to be specified. + * Remove bashisms from tests/check-namespace.sh. + * Add autodetection of procfs_status type. + * Add remote unwinding support for macOS. + * Expose get_proc_info_in_range API. + * Autodetect presence of elf_fpregset_t. + * coredump: stop assuming .text and .eh_frame are both in the first + segment of an ELF file. + * Make sigaltstack() optional. + * Add support for arm fp registers unwind. + * updated dist to focal for s390x jobs. + * Add RISC-V machine value in remote unwind. + * Fix SOFTFP case for arm getcontext. + * Added support for unwinding from the vsyscall region. + * Stop the autotools nag about AC_CONFIG_MACRO_DIRS. + * Fix make distcheck due to missing coredump header. + * Fix undefined behavior issues in aarch64. + * Account for lr in aarch64's uc_addr. + * tests/run-coredump-unwind: Skip test if no coredump has been created. + * [LoongArch64] Update the port to latest kernel ABI. + * arm64: Add support for unwinding in SVE functions + * check-namespace.sh: adjust aarch64 symbols. + * Updated to determine PAGE_SIZE dynamically for loongarch64. + * Gia64-test-nat.c: #include <signal.h> for sigaction(). + * Fix for unw_backtrace fast path does not work on x86_64. + * fix the way load offset is detected so it works with lld linker. + * Remove the unused powerpc setcontext() dummies. + * Add unw_backtrace2 function. +- Include the man pages, README and LICENSE files. +- Update libunwind.keyring file. + +------------------------------------------------------------------- Old: ---- libunwind-1.6.2.tar.gz libunwind-1.6.2.tar.gz.sig New: ---- libunwind-1.7.0.tar.gz libunwind-1.7.0.tar.gz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libunwind.spec ++++++ --- /var/tmp/diff_new_pack.ICilhc/_old 2023-06-30 19:58:11.489400529 +0200 +++ /var/tmp/diff_new_pack.ICilhc/_new 2023-06-30 19:58:11.497400576 +0200 @@ -1,7 +1,7 @@ # # spec file for package libunwind # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2023 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,20 +16,25 @@ # +# Note the wrong version number from upstream +%global _bversion 1.70 Name: libunwind -Version: 1.6.2 +Version: 1.7.0 Release: 0 Summary: Call chain detection library License: MIT Group: System/Base URL: https://savannah.nongnu.org/projects/libunwind/ -Source0: https://download.savannah.gnu.org/releases/%{name}/%{name}-%{version}.tar.gz -Source1: https://download.savannah.gnu.org/releases/%{name}/%{name}-%{version}.tar.g… +Source0: https://github.com/libunwind/libunwind/releases/download/v1.7.0/libunwind-%… +Source1: https://github.com/libunwind/libunwind/releases/download/v1.7.0/libunwind-%… Source2: %{name}.keyring Source3: baselibs.conf +BuildRequires: automake >= 1.14 BuildRequires: gcc-c++ +BuildRequires: libtool BuildRequires: lzma-devel BuildRequires: pkgconfig +BuildRequires: texlive-latex2man ExcludeArch: s390 %description @@ -90,9 +95,10 @@ process (libunwind-ptrace). %prep -%autosetup +%autosetup -p1 -n %{name}-%{_bversion} %build +autoreconf -fiv %configure \ --enable-minidebuginfo %make_build @@ -104,7 +110,7 @@ %install %make_install find %{buildroot} -iregex '.*\.l?a$' -delete -print -# Help packagers with %files +# Help packagers with %%files find %{buildroot}/%{_libdir} -type f | sort %post -n libunwind8 -p /sbin/ldconfig @@ -117,6 +123,8 @@ %postun -n libunwind-setjmp0 -p /sbin/ldconfig %files -n libunwind8 +%license COPYING +%doc README NEWS %{_libdir}/libunwind.so.8* %ifarch %arm %{_libdir}/libunwind-arm.so.8* @@ -155,5 +163,6 @@ %{_includedir}/* %{_libdir}/%{name}*.so %{_libdir}/pkgconfig/%{name}*.pc +%{_mandir}/man3/* %changelog ++++++ libunwind-1.6.2.tar.gz -> libunwind-1.7.0.tar.gz ++++++ ++++ 38987 lines of diff (skipped) ++++++ libunwind.keyring ++++++ ++++ 3363 lines (skipped) ++++ between /work/SRC/openSUSE:Factory/libunwind/libunwind.keyring ++++ and /work/SRC/openSUSE:Factory/.libunwind.new.13546/libunwind.keyring

1 0

commit colord-gtk for openSUSE:Factory
by Source-Sync 30 Jun '23

30 Jun '23

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package colord-gtk for openSUSE:Factory checked in at 2023-06-30 19:58:02 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/colord-gtk (Old) and /work/SRC/openSUSE:Factory/.colord-gtk.new.13546 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "colord-gtk" Fri Jun 30 19:58:02 2023 rev:14 rq:1095980 version:0.3.0 Changes: -------- --- /work/SRC/openSUSE:Factory/colord-gtk/colord-gtk.changes 2022-06-09 14:09:56.024378497 +0200 +++ /work/SRC/openSUSE:Factory/.colord-gtk.new.13546/colord-gtk.changes 2023-06-30 19:58:09.049386016 +0200 @@ -1,0 +2,6 @@ +Thu Jun 29 07:46:18 UTC 2023 - Michal Kubecek <mkubecek(a)suse.cz> + +- fix segfault when turning monitor back on (bsc#1212840): + Fix-the-callback-signature-to-fix-a-crash.patch + +------------------------------------------------------------------- New: ---- Fix-the-callback-signature-to-fix-a-crash.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ colord-gtk.spec ++++++ --- /var/tmp/diff_new_pack.T0vVsl/_old 2023-06-30 19:58:10.233393058 +0200 +++ /var/tmp/diff_new_pack.T0vVsl/_new 2023-06-30 19:58:10.237393082 +0200 @@ -1,7 +1,7 @@ # # spec file for package colord-gtk # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2023 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -27,6 +27,8 @@ Source1: https://www.freedesktop.org/software/colord/releases/colord-gtk-%{version}.… Source2: %{name}.keyring Source99: baselibs.conf +# PATCH-FIX-UPSTREAM Fix-the-callback-signature-to-fix-a-crash.patch bsc#1212840 gh#hughsie/colord-gtk#22 -- Fix segfault when turning monitor back on +Patch1: Fix-the-callback-signature-to-fix-a-crash.patch BuildRequires: docbook5-xsl-stylesheets BuildRequires: gtk-doc BuildRequires: meson ++++++ Fix-the-callback-signature-to-fix-a-crash.patch ++++++ From: Richard Hughes <richard(a)hughsie.com> Date: Sat, 24 Jun 2023 12:06:12 +0100 Subject: Fix the callback signature to fix a crash Patch-mainline: 0.4.0? Git-commit: c620b4a4b3dfc2ce58cd60b9d5209fb19396fc42 References: bsc#1212840 https://github.com/hughsie/colord-gtk/issues/22 Fixes https://github.com/hughsie/colord-gtk/issues/22 --- libcolord-gtk/cd-window.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/libcolord-gtk/cd-window.c +++ b/libcolord-gtk/cd-window.c @@ -295,7 +295,7 @@ cd_window_get_profile_device_find_cb (GObject *source, } static void -cd_window_device_changed_cb (CdDevice *device, CdWindow *window) +cd_window_device_changed_cb (CdClient *client, CdDevice *device, CdWindow *window) { CdProfile *profile;

1 0

commit docker for openSUSE:Factory
by Source-Sync 30 Jun '23

30 Jun '23

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package docker for openSUSE:Factory checked in at 2023-06-30 19:58:02 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/docker (Old) and /work/SRC/openSUSE:Factory/.docker.new.13546 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "docker" Fri Jun 30 19:58:02 2023 rev:133 rq:1095978 version:24.0.2_ce Changes: -------- --- /work/SRC/openSUSE:Factory/docker/docker.changes 2023-06-17 22:20:22.435559832 +0200 +++ /work/SRC/openSUSE:Factory/.docker.new.13546/docker.changes 2023-06-30 19:58:07.741378236 +0200 @@ -1,0 +2,13 @@ +Thu Jun 29 10:07:13 UTC 2023 - Danish Prakash <danish.prakash(a)suse.com> + +- Recommend docker-rootless-extras instead of Require(ing) it, given + it's an additional functionality and not inherently required for + docker to function. + +------------------------------------------------------------------- +Tue Jun 20 15:28:13 UTC 2023 - Danish Prakash <danish.prakash(a)suse.com> + +- Add docker-rootless-extras subpackage + (https://docs.docker.com/engine/security/rootless) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ docker.spec ++++++ --- /var/tmp/diff_new_pack.H2U6KS/_old 2023-06-30 19:58:08.597383328 +0200 +++ /var/tmp/diff_new_pack.H2U6KS/_new 2023-06-30 19:58:08.601383352 +0200 @@ -129,7 +129,8 @@ Recommends: lvm2 >= 2.2.89 Recommends: git-core >= 1.7 # Required for "docker buildx" support. -Recommends: docker-buildx +Recommends: %{name}-buildx +Recommends: %{name}-rootless-extras ExcludeArch: s390 ppc %description @@ -141,6 +142,20 @@ web deployments, database clusters, continuous deployment systems, private PaaS, service-oriented architectures, etc. +%package rootless-extras +Summary: Rootless support for Docker +Group: System/Management +Requires: %{name} = %{version} +Requires: slirp4netns >= 0.4 +Requires: fuse-overlayfs >= 0.7 +Requires: rootlesskit +BuildArch: noarch + +%description rootless-extras +Rootless support for Docker. +Use dockerd-rootless.sh to run the daemon. +Use dockerd-rootless-setuptool.sh to setup systemd for dockerd-rootless.sh. + %package bash-completion Summary: Bash Completion for %{name} Group: System/Shells @@ -297,6 +312,10 @@ # sysusers.d install -D -m0644 %{SOURCE106} %{buildroot}%{_sysusersdir}/%{name}.conf +# rootless extras +install -D -p -m 0755 contrib/dockerd-rootless.sh %{buildroot}/%{_bindir}/dockerd-rootless.sh +install -D -p -m 0755 contrib/dockerd-rootless-setuptool.sh %{buildroot}/%{_bindir}/dockerd-rootless-setuptool.sh + %fdupes %{buildroot} %pre -f %{name}.pre @@ -367,4 +386,9 @@ %defattr(-,root,root) %{_datadir}/fish/vendor_completions.d/%{name}.fish +%files rootless-extras +%defattr(-,root,root) +%{_bindir}/dockerd-rootless.sh +%{_bindir}/dockerd-rootless-setuptool.sh + %changelog

1 0

commit ImageMagick for openSUSE:Factory
by Source-Sync 30 Jun '23

30 Jun '23

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package ImageMagick for openSUSE:Factory checked in at 2023-06-30 19:58:00 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ImageMagick (Old) and /work/SRC/openSUSE:Factory/.ImageMagick.new.13546 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ImageMagick" Fri Jun 30 19:58:00 2023 rev:277 rq:1095937 version:7.1.1.12 Changes: -------- --- /work/SRC/openSUSE:Factory/ImageMagick/ImageMagick.changes 2023-06-16 16:54:02.681421197 +0200 +++ /work/SRC/openSUSE:Factory/.ImageMagick.new.13546/ImageMagick.changes 2023-06-30 19:58:06.529371027 +0200 @@ -1,0 +2,8 @@ +Thu Jun 29 09:17:27 UTC 2023 - pgajdos(a)suse.com + +- version update to 7.1.1.12 +- added patches + fix CVE-2023-3428 [bsc#1212847], heap-buffer-overflow in coders/tiff.c + + ImageMagick-CVE-2023-3428.patch + +------------------------------------------------------------------- Old: ---- ImageMagick-7.1.1-11.tar.xz ImageMagick-7.1.1-11.tar.xz.asc New: ---- ImageMagick-7.1.1-12.tar.xz ImageMagick-7.1.1-12.tar.xz.asc ImageMagick-CVE-2023-3428.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ImageMagick.spec ++++++ --- /var/tmp/diff_new_pack.eHoOL2/_old 2023-06-30 19:58:07.453376523 +0200 +++ /var/tmp/diff_new_pack.eHoOL2/_new 2023-06-30 19:58:07.457376547 +0200 @@ -20,7 +20,7 @@ %define asan_build 0 %define maj 7 %define mfr_version %{maj}.1.1 -%define mfr_revision 11 +%define mfr_revision 12 %define quantum_depth 16 %define source_version %{mfr_version}-%{mfr_revision} %define clibver 10 @@ -55,6 +55,8 @@ Patch4: ImageMagick-filter.t-disable-Contrast.patch #%%endif #%%endif +# CVE-2023-3428 [bsc#1212847], heap-buffer-overflow in coders/tiff.c +Patch5: ImageMagick-CVE-2023-3428.patch BuildRequires: chrpath BuildRequires: dejavu-fonts BuildRequires: fdupes @@ -297,6 +299,7 @@ %patch4 -p1 %endif %endif +%patch5 -p1 %build # bsc#1088463 ++++++ ImageMagick-7.1.1-11.tar.xz -> ImageMagick-7.1.1-12.tar.xz ++++++ /work/SRC/openSUSE:Factory/ImageMagick/ImageMagick-7.1.1-11.tar.xz /work/SRC/openSUSE:Factory/.ImageMagick.new.13546/ImageMagick-7.1.1-12.tar.xz differ: char 26, line 1 ++++++ ImageMagick-CVE-2023-3428.patch ++++++ diff --git a/coders/tiff.c b/coders/tiff.c index 9e0d0b1201..df4274cacd 100644 --- a/coders/tiff.c +++ b/coders/tiff.c @@ -2010,7 +2010,7 @@ static Image *ReadTIFFImage(const ImageInfo *image_info, number_pixels=(MagickSizeType) columns*rows; if (HeapOverflowSanityCheck(rows,sizeof(*tile_pixels)) != MagickFalse) ThrowTIFFException(ResourceLimitError,"MemoryAllocationFailed"); - extent=4*(samples_per_pixel+1)*MagickMax(rows*TIFFTileRowSize(tiff), + extent=4*(samples_per_pixel+1)*MagickMax((rows+1)*TIFFTileRowSize(tiff), TIFFTileSize(tiff)); tile_pixels=(unsigned char *) AcquireQuantumMemory(extent, sizeof(*tile_pixels));

1 0

commit libopenmpt for openSUSE:Factory
by Source-Sync 30 Jun '23

30 Jun '23

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package libopenmpt for openSUSE:Factory checked in at 2023-06-30 19:57:59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libopenmpt (Old) and /work/SRC/openSUSE:Factory/.libopenmpt.new.13546 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libopenmpt" Fri Jun 30 19:57:59 2023 rev:43 rq:1095930 version:0.7.2 Changes: -------- --- /work/SRC/openSUSE:Factory/libopenmpt/libopenmpt.changes 2023-04-20 15:14:15.625898187 +0200 +++ /work/SRC/openSUSE:Factory/.libopenmpt.new.13546/libopenmpt.changes 2023-06-30 19:58:04.045356253 +0200 @@ -1,0 +2,191 @@ +Thu Jun 29 09:03:50 UTC 2023 - Danilo Spinella <danilo.spinella(a)suse.com> + +- Update to 0.7.2: + * [New] MOD: Can now read modified 8-channel MOD files from the DOS game Aleshar - The World Of Ice. + * [Sec] Possible out-of-bounds read or write when reading malformed MED files. (r19389) + * [Bug] The Opal OPL3 emulator symbols were not namespaced properly. + +------------------------------------------------------------------- +Mon May 8 08:37:38 UTC 2023 - Mia Herkt <mia(a)0x0.st> + +- Update to 0.7.1 + * IT: Improved fingerprinting of early ModPlug Tracker versions. + * XMF: Modules from Astroidea demos can now be read as well. +- Changes in 0.7.0: + * [New] 667 files from Composer 667 are now supported. + * [New] GTK and GT2 files from Gramouf Tracker are now supported. + * [New] Can now read a variant of the DSMI AMF format called DMF, + as found in various DOS games distributed by Webfoot (Tronic, + H2O, PowBall, etc.). + * [New] DSM files from Dynamic Studio are now supported. + * [New] XMF files from the DOS game Imperium Galactica are now + supported. + * [New] Can now read the hacked MOD format (DMF) from the game + ��Apocalypse Abyss��. + * [New] libopenmpt: New APIs for getting the current tempo as a + floating point value: openmpt::module::get_current_tempo2() + (C++), and openmpt_module_get_current_tempo2() (C). + * [New] C API: New stream callbacks for various platform + extensions to the C stdio interface: + openmpt_stream_get_file_posix_lfs64_callbacks() + in libopenmpt/libopenmpt_stream_callbacks_file_posix_lfs64.h + for explicit off64_t on Posix systems, + openmpt_stream_get_file_posix_callbacks() + in libopenmpt/libopenmpt_stream_callbacks_file_posix.h + for off_t on Posix systems, + openmpt_stream_get_file_msvcrt_callbacks() + in libopenmpt/libopenmpt_stream_callbacks_file_msvcrt.h + for 64bit file support on Windows systems with the Microsoft + C runtime, and openmpt_stream_get_file_mingw_callbacks() + in libopenmpt/libopenmpt_stream_callbacks_file_mingw.h + for 64bit file support when targetting MinGW. + The old openmpt_stream_get_file_callbacks() has been + deprecated in favour of a stricly standard conforming + openmpt_stream_get_file_callbacks2() in the same + libopenmpt/libopenmpt_stream_callbacks_file.h header. + libopenmpt/libopenmpt.h defines + LIBOPENMPT_STREAM_CALLBACKS_FILE_POSIX_LFS64, + LIBOPENMPT_STREAM_CALLBACKS_FILE_POSIX, + LIBOPENMPT_STREAM_CALLBACKS_FILE_MSVCRT, + and LIBOPENMPT_STREAM_CALLBACKS_FILE_MINGW respectively + in order to allow for checking header availability. + * [New] C API: New stream callbacks for memory buffers. + openmpt_stream_get_buffer_callbacks() and + openmpt_stream_buffer_init() are deprecated. + Use openmpt_stream_get_buffer_callbacks2() and + openmpt_stream_buffer_init2() instead. + The new variants do not support loading only a file prefix and + checking for overflow any more. This was only useful when using + the old openmpt_could_open_probability2() style interface from + the libopenmpt 0.2 API, which has been superseded by + openmpt_probe_file_header(), + openmpt_probe_file_header_without_filesize(), and + openmpt_probe_file_header_from_stream() in libopenmpt 0.3.0. + * [New] libopenmpt_ext: New interface interactive3 adding + openmpt::ext::interactive3::set_current_tempo2() (C++) and + openmpt_module_ext_interface_interactive3.set_current_tempo2() + (C) which allow setting non-integer tempo values. + * [New] New Makefile option CONFIG=mingw-w64 which consolidates + all MinGW-w64 build configurations with the following options: + MINGW_FLAVOUR=[|-posix|-win32], WINDOWS_ARCH=[x86|amd64], + WINDOWS_FAMILY=[|desktop-app|app|phone-app|pc-app], + and WINDOWS_VERSION=[win95|win98|winme|winnt4|win2000|winxp|winxp64|winvista|win7|win8|win8.1|win10|win11]. + * [New] New Makefile option CONFIG=mingw which consolidates all + MinGW build configurations with the following options: + MINGW_FLAVOUR=[|-posix|-win32], + and WINDOWS_VERSION=[win95|win98|winme|winnt4|win2000|winxp]. + * [New] Building with MSYS2 is now fully supported for Makefile + and Autotools build systems. + * [New] Makefile CONFIG=djgpp now supports CPU= option to build + optimized for a particular CPU. See build/make/config-djgpp.mk + for all available options. FLAVOURED_DIR=1 places the + CPU-specific optimized builds in separate folders below bin/. + * [New] Building with a MinGW32 CRTDLL toolchain is now supported + via Makefile option CONFIG=mingw32crt. + * [New] Makefile now uses PKG_CONFIG as path to pkg-config. + * [New] The C++ API is now also enabled for Emscripten builds + by default. + * [New] Support for GCC 7 has been restored. + * [New] Support for Clang 6 has been restored. + * [New] Support for Android NDK 18 has been restored. + * [New] openmpt123: --banner [0|1|2] allows changing the + openmpt123 banner style to hidden, shown, or verbose, + respectively. + * [New] openmpt123: --assume-terminal allows skipping the + openmpt123 terminal check, and thus allows running the UI with + non-terminal stdin, which can be useful for some very basic + remote control functionality. + * [Change] xmp-openmpt: The Amiga resampler emulation is now + enabled by default. + * [Change] in_openmpt: The Amiga resampler emulation is now + enabled by default. + * [Change] The official Windows builds (x86, amd64, arm, arm64) + now require Windows 10 21H2 (or later). The official legacy + Windows builds (x86-legacy, amd64-legacy) are unchanged and + still require Windows 7 (or later). + * [Change] "date" metadata will now exlude the UTC time zone + signifier Z if the precise time zone is unknown. + * [Change] ctl seek.sync_samples now defaults to 1. + * [Change] Makefile CONFIG=generic is gone. Please use + CONFIG=standard instead. + * [Change] Makefile CONFIG=macosx and CONFIG=haiku have been + removed. The OS is auto-detected. + * [Change] Makefile options CONFIG=mingw64-win32, + CONFIG=mingw64-win64, CONFIG=mingw64-winrt-x86, + CONFIG=mingw64-winrt-amd64, and CONFIG=mingw-win9x have been + replaced by CONFIG=mingw-w64, and CONFIG=mingw. + * [Change] Autotools now default to C++20 and only fall back to + C++17 when C++20 is not supported. + * [Change] Makefile now defaults to C++20 and only falls back to + C++17 when C++20 is not supported by the compiler. + * [Change] Makefile now defaults to C17 and only falls back to + C11 when C17 is not supported by the compiler. + * [Change] Makefile CONFIG=djgpp option USE_ALLEGRO42 now + defaults to 1 and implies building a liballegro42 locally. + This requires executing build/download_externals.sh before + building to download the liballegro42 sources. + * [Change] in_openmpt: The Winamp input plugin in_openmpt is now + deprecated for use with the latest Winamp or WACUP releases. + Please use the native implementations available in + Winamp >=5.9.0 or WACUP instead. This does not mean that + in_openmpt/in_mod will not receive further development, + it just means that the responsibility now lies with the player + implementors themselves. We will still maintain the status quo + of our in_openmpt input plugin for users of earlier Winamp + version, or users on older systems, or users of compatible + players. + * [Change] The POSIX fd file callbacks implementation now handles + EINTR and retries the read() call. + * [Regression] Full support for Visual Studio 2017 has been + removed. We still support targeting Windows XP with + Visual Studio 2017. + * [Regression] Support for mingw-std-threads has been removed. + If you require a thread-safe libopenmpt, please build with + POSIX threading model and/or complain to MinGW/GCC about not + properly supporting C++11 features in 2023. + * [Regression] Support for Emscripten versions older than 3.1.1 + has been removed. + * [Regression] C API: openmpt_stream_get_file_callbacks() used to + provide 64bit file access on some platforms where long is + 32bit. This never worked reliably for all platforms though. + The behaviour is now changed to always stick to what standard + C supports with fseek and ftell, where the offset type is long. + openmpt_stream_get_file_callbacks() is deprecated now due to + behavioral change. + Please migrate to openmpt_stream_get_file_callbacks2(). + * [Regression] Using the system-provided liballegro42 is no + longer supported. The option BUNDLED_ALLEGRO42=1 does not exist + any more. + * Reduced aliasing when downsampling with the Sinc + Low-Pass + resampler. + * The sample position is now rounded instead of truncated when + resampling without interpolation. + * Seeking with sample sync now supports portamento up / down + commands as well as IMF/ PTM note slides. Tone portamento is + now synchronized correctly when seeking in DBM, 669 and MED + with fast slides (first tick of portamento was previously not + executed). + * The filter cutoff frequency is no longer rounded to integer + frequency values. + * MED: Tempos higher than 255 BPM can now be imported in pattern + data. + * MED: MMD1 files with more than 16 channels are now supported. + * ULT: Import 8-bit volume commands with full precision. + * IT: Initial ��last note memory�� of every channel is C-0, so a + lone instrument number without note triggers that note. + * S3M: Better approximation of old ��stereo control�� SAx command + used in Purple Motion��s PANIC.S3M. + * S3M: In ScreamTracker 3.03 and later, OPL notes with tone + portamento next to them are delayed until the next row and then + the new pitch is used instantly. + * MO3: Envelope sustain was not imported correctly if the source + file was an XM. + * MOD: Lone instrument number with retrigger effect swap sample + immediately. + * Recalling a sample��s default volume using an instrument number + (as opposed to regular volume commands) previously ramped the + volume change smoothly over a whole tick. Now the + user-configured ramp settings are used instead (as it would + happen when using a volume command to achieve the same effect). + +------------------------------------------------------------------- Old: ---- libopenmpt-0.6.10+release.autotools.tar.gz New: ---- libopenmpt-0.7.2+release.autotools.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libopenmpt.spec ++++++ --- /var/tmp/diff_new_pack.oPh4DH/_old 2023-06-30 19:58:05.649365793 +0200 +++ /var/tmp/diff_new_pack.oPh4DH/_new 2023-06-30 19:58:05.657365841 +0200 @@ -21,7 +21,7 @@ %define libopenmpt_modplug_version 0.8.9.0 Name: libopenmpt -Version: 0.6.10 +Version: 0.7.2 Release: 0 Summary: C++ and C library to decode tracker music files License: BSD-3-Clause @@ -130,15 +130,7 @@ %dir %{_docdir}/%{name}-devel/ %{_docdir}/%{name}-devel/* %dir %{_includedir}/libopenmpt/ -%{_includedir}/libopenmpt/libopenmpt.h -%{_includedir}/libopenmpt/libopenmpt.hpp -%{_includedir}/libopenmpt/libopenmpt_config.h -%{_includedir}/libopenmpt/libopenmpt_ext.hpp -%{_includedir}/libopenmpt/libopenmpt_stream_callbacks_fd.h -%{_includedir}/libopenmpt/libopenmpt_stream_callbacks_file.h -%{_includedir}/libopenmpt/libopenmpt_version.h -%{_includedir}/libopenmpt/libopenmpt_ext.h -%{_includedir}/libopenmpt/libopenmpt_stream_callbacks_buffer.h +%{_includedir}/libopenmpt/* %{_libdir}/libopenmpt.so %{_libdir}/pkgconfig/libopenmpt.pc ++++++ libopenmpt-0.6.10+release.autotools.tar.gz -> libopenmpt-0.7.2+release.autotools.tar.gz ++++++ ++++ 84427 lines of diff (skipped)

1 0