Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package qt6-imageformats for
openSUSE:Factory checked in at 2023-10-13 23:14:14
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/qt6-imageformats (Old)
and /work/SRC/openSUSE:Factory/.qt6-imageformats.new.20540 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "qt6-imageformats"
Fri Oct 13 23:14:14 2023 rev:24 rq:1116935 version:6.6.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/qt6-imageformats/qt6-imageformats.changes
2023-10-02 20:07:18.432618695 +0200
+++
/work/SRC/openSUSE:Factory/.qt6-imageformats.new.20540/qt6-imageformats.changes
2023-10-13 23:14:41.087045132 +0200
@@ -1,0 +2,6 @@
+Tue Oct 10 09:39:51 UTC 2023 - Christophe Marin <[email protected]>
+
+- Update to 6.6.0
+ * https://www.qt.io/blog/qt-6.6-released
+
+-------------------------------------------------------------------
Old:
----
qtimageformats-everywhere-src-6.5.3.tar.xz
New:
----
qtimageformats-everywhere-src-6.6.0.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ qt6-imageformats.spec ++++++
--- /var/tmp/diff_new_pack.CegMVU/_old 2023-10-13 23:14:41.703067476 +0200
+++ /var/tmp/diff_new_pack.CegMVU/_new 2023-10-13 23:14:41.703067476 +0200
@@ -16,8 +16,8 @@
#
-%define real_version 6.5.3
-%define short_version 6.5
+%define real_version 6.6.0
+%define short_version 6.6
%define short_name qtimageformats
%define tar_name qtimageformats-everywhere-src
%define tar_suffix %{nil}
@@ -28,7 +28,7 @@
%endif
#
Name: qt6-imageformats%{?pkg_suffix}
-Version: 6.5.3
+Version: 6.6.0
Release: 0
Summary: Qt 6 ImageFormat Plugins
License: LGPL-3.0-only OR (GPL-2.0-only OR GPL-3.0-or-later)
++++++ qtimageformats-everywhere-src-6.5.3.tar.xz ->
qtimageformats-everywhere-src-6.6.0.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/qtimageformats-everywhere-src-6.5.3/.cmake.conf
new/qtimageformats-everywhere-src-6.6.0/.cmake.conf
--- old/qtimageformats-everywhere-src-6.5.3/.cmake.conf 2023-09-24
09:06:24.000000000 +0200
+++ new/qtimageformats-everywhere-src-6.6.0/.cmake.conf 2023-10-02
05:05:47.000000000 +0200
@@ -1,3 +1,3 @@
-set(QT_REPO_MODULE_VERSION "6.5.3")
+set(QT_REPO_MODULE_VERSION "6.6.0")
set(QT_REPO_MODULE_PRERELEASE_VERSION_SEGMENT "alpha1")
set(QT_EXTRA_INTERNAL_TARGET_DEFINES "QT_NO_AS_CONST=1")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/qtimageformats-everywhere-src-6.5.3/.tag
new/qtimageformats-everywhere-src-6.6.0/.tag
--- old/qtimageformats-everywhere-src-6.5.3/.tag 2023-09-24
09:06:24.000000000 +0200
+++ new/qtimageformats-everywhere-src-6.6.0/.tag 2023-10-02
05:05:47.000000000 +0200
@@ -1 +1 @@
-4f89d7ef7d4f30c1907915435b432d957b62b7ff
+4993279e9ee56381a4fefbeb0c95685af98551f6
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtimageformats-everywhere-src-6.5.3/coin/axivion/ci_config_linux.json
new/qtimageformats-everywhere-src-6.6.0/coin/axivion/ci_config_linux.json
--- old/qtimageformats-everywhere-src-6.5.3/coin/axivion/ci_config_linux.json
1970-01-01 01:00:00.000000000 +0100
+++ new/qtimageformats-everywhere-src-6.6.0/coin/axivion/ci_config_linux.json
2023-10-02 05:05:47.000000000 +0200
@@ -0,0 +1,59 @@
+{
+ "Project": {
+ "Git": {
+ "_active": true,
+ "sourceserver_gitdir":
"/data/axivion/databases/$(env:TESTED_MODULE_COIN).git"
+ },
+ "BuildSystemIntegration": {
+ "child_order": [
+ "GCCSetup",
+ "CMake",
+ "LinkLibraries"
+ ]
+ },
+ "CMake": {
+ "_active": true,
+ "_copy_from": "CMakeIntegration",
+ "build_environment": {},
+ "build_options": "-j4",
+ "generate_options": "--fresh",
+ "generator": "Ninja"
+ },
+ "GCCSetup": {
+ "_active": true,
+ "_copy_from": "Command",
+ "build_command": "gccsetup --cc gcc --cxx g++ --config
../../../axivion/"
+ },
+ "LinkLibraries": {
+ "_active": true,
+ "_copy_from": "AxivionLinker",
+ "input_files": [
+ "build/plugins/*/lib*.so*.ir"
+ ],
+ "ir": "build/$(env:TESTED_MODULE_COIN).ir"
+ },
+ "Project-GlobalOptions": {
+ "directory": "../work/qt/$(env:TESTED_MODULE_COIN)",
+ "ir": "build/$(env:TESTED_MODULE_COIN).ir",
+ "name": "qt_$(env:TESTED_MODULE_COIN)_dev_$(env:TARGET_OS_COIN)"
+ }
+ },
+ "Results": {
+ "Dashboard": {
+ "dashboard_url": "https://axivion-srv.ci.qt.io/axivion/";
+ },
+ "Database": {
+ "ci_mode": {
+ "directory": "/data/axivion/databases"
+ }
+ }
+ },
+ "_Format": "1.0",
+ "_Version": "trunk-9e0ef9c5818",
+ "_VersionNum": [
+ 7,
+ 6,
+ 9999,
+ 11489
+ ]
+}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtimageformats-everywhere-src-6.5.3/dependencies.yaml
new/qtimageformats-everywhere-src-6.6.0/dependencies.yaml
--- old/qtimageformats-everywhere-src-6.5.3/dependencies.yaml 2023-09-24
09:06:24.000000000 +0200
+++ new/qtimageformats-everywhere-src-6.6.0/dependencies.yaml 2023-10-02
05:05:47.000000000 +0200
@@ -1,4 +1,4 @@
dependencies:
../qtbase:
- ref: 372eaedc5b8c771c46acc4c96e91bbade4ca3624
+ ref: 33f5e985e480283bb0ca9dea5f82643e825ba87c
required: true
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtimageformats-everywhere-src-6.5.3/src/plugins/imageformats/tiff/qtiffhandler.cpp
new/qtimageformats-everywhere-src-6.6.0/src/plugins/imageformats/tiff/qtiffhandler.cpp
---
old/qtimageformats-everywhere-src-6.5.3/src/plugins/imageformats/tiff/qtiffhandler.cpp
2023-09-24 09:06:24.000000000 +0200
+++
new/qtimageformats-everywhere-src-6.6.0/src/plugins/imageformats/tiff/qtiffhandler.cpp
2023-10-02 05:05:47.000000000 +0200
@@ -277,9 +277,9 @@
else if ((grayscale || photometric == PHOTOMETRIC_PALETTE) && bitPerSample
== 8 && samplesPerPixel == 1)
format = QImage::Format_Indexed8;
else if (samplesPerPixel < 4)
- if (bitPerSample == 16 && photometric == PHOTOMETRIC_RGB)
+ if (bitPerSample == 16 && (photometric == PHOTOMETRIC_RGB ||
photometric == PHOTOMETRIC_MINISBLACK))
format = floatingPoint ? QImage::Format_RGBX16FPx4 :
QImage::Format_RGBX64;
- else if (bitPerSample == 32 && floatingPoint && photometric ==
PHOTOMETRIC_RGB)
+ else if (bitPerSample == 32 && floatingPoint && (photometric ==
PHOTOMETRIC_RGB || photometric == PHOTOMETRIC_MINISBLACK))
format = QImage::Format_RGBX32FPx4;
else
format = QImage::Format_RGB32;
@@ -419,9 +419,9 @@
if (format8bit || format16bit || format64bit || format64fp || format128fp)
{
int bytesPerPixel = image->depth() / 8;
if (format == QImage::Format_RGBX64 || format ==
QImage::Format_RGBX16FPx4)
- bytesPerPixel = 6;
+ bytesPerPixel = d->photometric == PHOTOMETRIC_RGB ? 6 : 2;
else if (format == QImage::Format_RGBX32FPx4)
- bytesPerPixel = 12;
+ bytesPerPixel = d->photometric == PHOTOMETRIC_RGB ? 12 : 4;
if (TIFFIsTiled(tiff)) {
quint32 tileWidth, tileLength;
TIFFGetField(tiff, TIFFTAG_TILEWIDTH, &tileWidth);
@@ -470,10 +470,17 @@
}
}
}
- if (format == QImage::Format_RGBX64 || format ==
QImage::Format_RGBX16FPx4)
- rgb48fixup(image, d->floatingPoint);
- else if (format == QImage::Format_RGBX32FPx4)
- rgb96fixup(image);
+ if (format == QImage::Format_RGBX64 || format ==
QImage::Format_RGBX16FPx4) {
+ if (d->photometric == PHOTOMETRIC_RGB)
+ rgb48fixup(image, d->floatingPoint);
+ else
+ rgbFixup(image);
+ } else if (format == QImage::Format_RGBX32FPx4) {
+ if (d->photometric == PHOTOMETRIC_RGB)
+ rgb96fixup(image);
+ else
+ rgbFixup(image);
+ }
} else {
const int stopOnError = 1;
if (TIFFReadRGBAImageOriented(tiff, width, height,
reinterpret_cast<uint32_t *>(image->bits()), qt2Exif(d->transformation),
stopOnError)) {
@@ -1016,6 +1023,42 @@
}
}
+void QTiffHandler::rgbFixup(QImage *image)
+{
+ Q_ASSERT(d->floatingPoint);
+ if (image->depth() == 64) {
+ const int h = image->height();
+ const int w = image->width();
+ uchar *scanline = image->bits();
+ const qsizetype bpl = image->bytesPerLine();
+ for (int y = 0; y < h; ++y) {
+ qfloat16 *dst = reinterpret_cast<qfloat16 *>(scanline);
+ for (int x = w - 1; x >= 0; --x) {
+ dst[x * 4 + 3] = qfloat16(1.0f);
+ dst[x * 4 + 2] = dst[x];
+ dst[x * 4 + 1] = dst[x];
+ dst[x * 4 + 0] = dst[x];
+ }
+ scanline += bpl;
+ }
+ } else {
+ const int h = image->height();
+ const int w = image->width();
+ uchar *scanline = image->bits();
+ const qsizetype bpl = image->bytesPerLine();
+ for (int y = 0; y < h; ++y) {
+ float *dst = reinterpret_cast<float *>(scanline);
+ for (int x = w - 1; x >= 0; --x) {
+ dst[x * 4 + 3] = 1.0f;
+ dst[x * 4 + 2] = dst[x];
+ dst[x * 4 + 1] = dst[x];
+ dst[x * 4 + 0] = dst[x];
+ }
+ scanline += bpl;
+ }
+ }
+}
+
bool QTiffHandler::ensureHaveDirectoryCount() const
{
if (d->directoryCount > 0)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtimageformats-everywhere-src-6.5.3/src/plugins/imageformats/tiff/qtiffhandler_p.h
new/qtimageformats-everywhere-src-6.6.0/src/plugins/imageformats/tiff/qtiffhandler_p.h
---
old/qtimageformats-everywhere-src-6.5.3/src/plugins/imageformats/tiff/qtiffhandler_p.h
2023-09-24 09:06:24.000000000 +0200
+++
new/qtimageformats-everywhere-src-6.6.0/src/plugins/imageformats/tiff/qtiffhandler_p.h
2023-10-02 05:05:47.000000000 +0200
@@ -38,6 +38,7 @@
void convert32BitOrder(void *buffer, int width);
void rgb48fixup(QImage *image, bool floatingPoint);
void rgb96fixup(QImage *image);
+ void rgbFixup(QImage *image);
const QScopedPointer<QTiffHandlerPrivate> d;
bool ensureHaveDirectoryCount() const;
};
