Hello community,
here is the log from the commit of package libqt5-qtimageformats for
openSUSE:Factory checked in at 2015-06-06 09:51:02
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libqt5-qtimageformats (Old)
and /work/SRC/openSUSE:Factory/.libqt5-qtimageformats.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libqt5-qtimageformats"
Changes:
--------
---
/work/SRC/openSUSE:Factory/libqt5-qtimageformats/libqt5-qtimageformats.changes
2015-03-01 15:13:13.000000000 +0100
+++
/work/SRC/openSUSE:Factory/.libqt5-qtimageformats.new/libqt5-qtimageformats.changes
2015-06-06 09:51:03.000000000 +0200
@@ -1,0 +2,7 @@
+Wed Jun 3 22:56:22 UTC 2015 - [email protected]
+
+- Update to 5.4.2
+ * Bugfix release, for more details please see:
+ http://blog.qt.io/blog/2015/06/02/qt-5-4-2-released/
+
+-------------------------------------------------------------------
Old:
----
qtimageformats-opensource-src-5.4.1.tar.xz
New:
----
qtimageformats-opensource-src-5.4.2.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libqt5-qtimageformats.spec ++++++
--- /var/tmp/diff_new_pack.6W701v/_old 2015-06-06 09:51:04.000000000 +0200
+++ /var/tmp/diff_new_pack.6W701v/_new 2015-06-06 09:51:04.000000000 +0200
@@ -1,7 +1,7 @@
#
# spec file for package libqt5-qtimageformats
#
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -19,15 +19,15 @@
%define qt5_snapshot 0
Name: libqt5-qtimageformats
-Version: 5.4.1
+Version: 5.4.2
Release: 0
Summary: Qt 5 Image Format Plugins
License: SUSE-LGPL-2.1-with-digia-exception-1.1 or GPL-3.0
Group: Development/Libraries/X11
Url: http://qt.digia.com
%define base_name libqt5
-%define real_version 5.4.1
-%define so_version 5.4.1
+%define real_version 5.4.2
+%define so_version 5.4.2
%define tar_version qtimageformats-opensource-src-%{real_version}
Source: %{tar_version}.tar.xz
Source1: baselibs.conf
++++++ qtimageformats-opensource-src-5.4.1.tar.xz ->
qtimageformats-opensource-src-5.4.2.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/qtimageformats-opensource-src-5.4.1/.qmake.conf
new/qtimageformats-opensource-src-5.4.2/.qmake.conf
--- old/qtimageformats-opensource-src-5.4.1/.qmake.conf 2015-02-17
05:57:32.000000000 +0100
+++ new/qtimageformats-opensource-src-5.4.2/.qmake.conf 2015-05-29
22:32:15.000000000 +0200
@@ -1,3 +1,3 @@
load(qt_build_config)
-MODULE_VERSION = 5.4.1
+MODULE_VERSION = 5.4.2
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/qtimageformats-opensource-src-5.4.1/.tag
new/qtimageformats-opensource-src-5.4.2/.tag
--- old/qtimageformats-opensource-src-5.4.1/.tag 2015-02-17
05:57:33.000000000 +0100
+++ new/qtimageformats-opensource-src-5.4.2/.tag 2015-05-29
22:32:23.000000000 +0200
@@ -1 +1 @@
-2cf398f541d68f60e0205820524b79b37045bf0f
+98f83553e9fe2aa5fc54b32513af6ba3aa60a07b
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtimageformats-opensource-src-5.4.1/src/plugins/imageformats/dds/qddshandler.cpp
new/qtimageformats-opensource-src-5.4.2/src/plugins/imageformats/dds/qddshandler.cpp
---
old/qtimageformats-opensource-src-5.4.1/src/plugins/imageformats/dds/qddshandler.cpp
2015-02-17 05:57:33.000000000 +0100
+++
new/qtimageformats-opensource-src-5.4.2/src/plugins/imageformats/dds/qddshandler.cpp
2015-05-29 22:32:23.000000000 +0200
@@ -101,7 +101,7 @@
static const FormatInfo formatInfos[] = {
{ FormatA8R8G8B8, DDSPixelFormat::FlagRGBA, 32, 0x00ff0000, 0x0000ff00,
0x000000ff, 0xff000000 },
{ FormatX8R8G8B8, DDSPixelFormat::FlagRGB, 32, 0x00ff0000, 0x0000ff00,
0x000000ff, 0x00000000 },
- { FormatA2B10G10R10, DDSPixelFormat::FlagRGBA, 32, 0x000003ff, 0x0000fc00,
0x3ff00000, 0xc0000000 },
+ { FormatA2B10G10R10, DDSPixelFormat::FlagRGBA, 32, 0x000003ff, 0x000ffc00,
0x3ff00000, 0xc0000000 },
{ FormatA8B8G8R8, DDSPixelFormat::FlagRGBA, 32, 0x000000ff, 0x0000ff00,
0x00ff0000, 0xff000000 },
{ FormatX8B8G8R8, DDSPixelFormat::FlagRGB, 32, 0x000000ff, 0x0000ff00,
0x00ff0000, 0x00000000 },
{ FormatG16R16, DDSPixelFormat::FlagRGBA, 32, 0x0000ffff, 0xffff0000,
0x00000000, 0x00000000 },
@@ -323,7 +323,7 @@
if ((format.flags & info.flags) == info.flags &&
format.rgbBitCount == info.bitCount &&
format.rBitMask == info.rBitMask &&
- format.bBitMask == info.bBitMask &&
+ format.gBitMask == info.gBitMask &&
format.bBitMask == info.bBitMask &&
format.aBitMask == info.aBitMask) {
return info.format;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtimageformats-opensource-src-5.4.1/src/plugins/imageformats/tiff/qtiffhandler.cpp
new/qtimageformats-opensource-src-5.4.2/src/plugins/imageformats/tiff/qtiffhandler.cpp
---
old/qtimageformats-opensource-src-5.4.1/src/plugins/imageformats/tiff/qtiffhandler.cpp
2015-02-17 05:57:33.000000000 +0100
+++
new/qtimageformats-opensource-src-5.4.2/src/plugins/imageformats/tiff/qtiffhandler.cpp
2015-05-29 22:32:23.000000000 +0200
@@ -494,20 +494,13 @@
}
//// write the color table
// allocate the color tables
- uint16 *redTable = static_cast<uint16 *>(malloc(256 *
sizeof(uint16)));
- uint16 *greenTable = static_cast<uint16 *>(malloc(256 *
sizeof(uint16)));
- uint16 *blueTable = static_cast<uint16 *>(malloc(256 *
sizeof(uint16)));
- if (!redTable || !greenTable || !blueTable) {
- free(redTable);
- free(greenTable);
- free(blueTable);
- TIFFClose(tiff);
- return false;
- }
-
- // set the color table
const int tableSize = colorTable.size();
Q_ASSERT(tableSize <= 256);
+ QVarLengthArray<uint16> redTable(tableSize);
+ QVarLengthArray<uint16> greenTable(tableSize);
+ QVarLengthArray<uint16> blueTable(tableSize);
+
+ // set the color table
for (int i = 0; i<tableSize; ++i) {
const QRgb color = colorTable.at(i);
redTable[i] = qRed(color) * 257;
@@ -515,11 +508,7 @@
blueTable[i] = qBlue(color) * 257;
}
- const bool setColorTableSuccess = TIFFSetField(tiff,
TIFFTAG_COLORMAP, redTable, greenTable, blueTable);
-
- free(redTable);
- free(greenTable);
- free(blueTable);
+ const bool setColorTableSuccess = TIFFSetField(tiff,
TIFFTAG_COLORMAP, redTable.data(), greenTable.data(), blueTable.data());
if (!setColorTableSuccess) {
TIFFClose(tiff);
