Hello community, here is the log from the commit of package kimageformats for openSUSE:Factory checked in at 2019-04-19 21:22:55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kimageformats (Old) and /work/SRC/openSUSE:Factory/.kimageformats.new.5536 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kimageformats" Fri Apr 19 21:22:55 2019 rev:67 rq:695229 version:5.57.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kimageformats/kimageformats.changes 2019-03-21 09:46:20.694896923 +0100 +++ /work/SRC/openSUSE:Factory/.kimageformats.new.5536/kimageformats.changes 2019-04-19 21:22:58.579766648 +0200 @@ -1,0 +2,14 @@ +Sun Apr 14 20:21:43 UTC 2019 - [email protected] + +- Update to 5.57.0 + * New feature release + * For more details please see: + * https://www.kde.org/announcements/kde-frameworks-5.57.0.php +- Changes since 5.56.0: + * Fix compilation + * ora:kra: qstrcmp -> memcmp + * autotests: Also exercise canRead + * Fix RGBHandler::canRead + * xcf: Don't crash with files with unsupported layer modes + +------------------------------------------------------------------- Old: ---- kimageformats-5.56.0.tar.xz New: ---- kimageformats-5.57.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kimageformats.spec ++++++ --- /var/tmp/diff_new_pack.Nl6IvH/_old 2019-04-19 21:22:59.055767253 +0200 +++ /var/tmp/diff_new_pack.Nl6IvH/_new 2019-04-19 21:22:59.059767259 +0200 @@ -16,13 +16,13 @@ # -%define _tar_path 5.56 +%define _tar_path 5.57 # Full KF5 version (e.g. 5.33.0) %{!?_kf5_version: %global _kf5_version %{version}} # Last major and minor KF5 version (e.g. 5.33) %{!?_kf5_bugfix_version: %define _kf5_bugfix_version %(echo %{_kf5_version} | awk -F. '{print $1"."$2}')} Name: kimageformats -Version: 5.56.0 +Version: 5.57.0 Release: 0 Summary: Image format plugins for Qt License: LGPL-2.1-or-later ++++++ kimageformats-5.56.0.tar.xz -> kimageformats-5.57.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kimageformats-5.56.0/.gitignore new/kimageformats-5.57.0/.gitignore --- old/kimageformats-5.56.0/.gitignore 1970-01-01 01:00:00.000000000 +0100 +++ new/kimageformats-5.57.0/.gitignore 2019-04-07 09:18:46.000000000 +0200 @@ -0,0 +1,21 @@ +# Ignore the following files +*~ +*.[oa] +*.diff +*.kate-swp +*.kdev4 +.kdev_include_paths +*.kdevelop.pcs +*.moc +*.moc.cpp +*.orig +*.user +.*.swp +.swp.* +Doxyfile +Makefile +avail +random_seed +/build*/ +CMakeLists.txt.user* +*.unc-backup* diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kimageformats-5.56.0/CMakeLists.txt new/kimageformats-5.57.0/CMakeLists.txt --- old/kimageformats-5.56.0/CMakeLists.txt 2019-03-02 14:27:12.000000000 +0100 +++ new/kimageformats-5.57.0/CMakeLists.txt 2019-04-07 09:18:46.000000000 +0200 @@ -3,7 +3,7 @@ project(KImageFormats) include(FeatureSummary) -find_package(ECM 5.56.0 NO_MODULE) +find_package(ECM 5.57.0 NO_MODULE) set_package_properties(ECM PROPERTIES TYPE REQUIRED DESCRIPTION "Extra CMake Modules." URL "https://projects.kde.org/projects/kdesupport/extra-cmake-modules") feature_summary(WHAT REQUIRED_PACKAGES_NOT_FOUND FATAL_ON_MISSING_REQUIRED_PACKAGES) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kimageformats-5.56.0/autotests/readtest.cpp new/kimageformats-5.57.0/autotests/readtest.cpp --- old/kimageformats-5.56.0/autotests/readtest.cpp 2019-03-02 14:27:12.000000000 +0100 +++ new/kimageformats-5.57.0/autotests/readtest.cpp 2019-04-07 09:18:46.000000000 +0200 @@ -148,6 +148,14 @@ ++failed; continue; } + if (!inputReader.canRead()) { + QTextStream(stdout) << "FAIL : " << fi.fileName() + << ": failed can read: " + << inputReader.errorString() + << "\n"; + ++failed; + continue; + } if (!inputReader.read(&inputImage)) { QTextStream(stdout) << "FAIL : " << fi.fileName() << ": failed to load: " diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kimageformats-5.56.0/src/imageformats/kra.cpp new/kimageformats-5.57.0/src/imageformats/kra.cpp --- old/kimageformats-5.56.0/src/imageformats/kra.cpp 2019-03-02 14:27:12.000000000 +0100 +++ new/kimageformats-5.57.0/src/imageformats/kra.cpp 2019-04-07 09:18:46.000000000 +0200 @@ -18,6 +18,9 @@ #include <QIODevice> #include <QFile> +static constexpr char s_magic[] = "application/x-krita"; +static constexpr int s_magic_size = sizeof(s_magic) - 1; // -1 to remove the last \0 + KraHandler::KraHandler() { } @@ -55,7 +58,7 @@ char buff[57]; if (device->peek(buff, sizeof(buff)) == sizeof(buff)) - return qstrcmp(buff + 0x26, "application/x-krita") == 0; + return memcmp(buff + 0x26, s_magic, s_magic_size) == 0; return false; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kimageformats-5.56.0/src/imageformats/ora.cpp new/kimageformats-5.57.0/src/imageformats/ora.cpp --- old/kimageformats-5.56.0/src/imageformats/ora.cpp 2019-03-02 14:27:12.000000000 +0100 +++ new/kimageformats-5.57.0/src/imageformats/ora.cpp 2019-04-07 09:18:46.000000000 +0200 @@ -17,6 +17,9 @@ #include <kzip.h> +static constexpr char s_magic[] = "image/openraster"; +static constexpr int s_magic_size = sizeof(s_magic) - 1; // -1 to remove the last \0 + OraHandler::OraHandler() { } @@ -54,7 +57,7 @@ char buff[54]; if (device->peek(buff, sizeof(buff)) == sizeof(buff)) - return qstrcmp(buff + 0x26, "image/openraster") == 0; + return memcmp(buff + 0x26, s_magic, s_magic_size) == 0; return false; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kimageformats-5.56.0/src/imageformats/rgb.cpp new/kimageformats-5.57.0/src/imageformats/rgb.cpp --- old/kimageformats-5.56.0/src/imageformats/rgb.cpp 2019-03-02 14:27:12.000000000 +0100 +++ new/kimageformats-5.57.0/src/imageformats/rgb.cpp 2019-04-07 09:18:46.000000000 +0200 @@ -709,7 +709,7 @@ device->seek(oldPos); } - return head.size() >= 4 && head.startsWith("\x01\xda\x01") && (head[3] == 1 || head[3] == 2); + return head.size() >= 4 && head.startsWith("\x01\xda") && (head[2] == 0 || head[2] == 1) && (head[3] == 1 || head[3] == 2); } /////////////////////////////////////////////////////////////////////////////// diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kimageformats-5.56.0/src/imageformats/xcf.cpp new/kimageformats-5.57.0/src/imageformats/xcf.cpp --- old/kimageformats-5.56.0/src/imageformats/xcf.cpp 2019-03-02 14:27:12.000000000 +0100 +++ new/kimageformats-5.57.0/src/imageformats/xcf.cpp 2019-04-07 09:18:46.000000000 +0200 @@ -244,6 +244,12 @@ QVector<QRgb> XCFImageFormat::grayTable; +template <typename T, size_t N> +constexpr size_t countof(T(&)[N]) +{ + return N; +} + const XCFImageFormat::LayerModes XCFImageFormat::layer_modes[] = { {true}, // NORMAL_MODE {true}, // DISSOLVE_MODE @@ -709,6 +715,10 @@ case PROP_MODE: property >> layer.mode; + if (layer.mode >= countof(layer_modes)) { + qWarning() << "Found layer with unsupported mode" << layer.mode << "Defaulting to mode 0"; + layer.mode = 0; + } break; case PROP_TATTOO:
