Hello community,
here is the log from the commit of package libqt5-qtimageformats for
openSUSE:Factory checked in at 2014-09-08 21:28:22
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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
2014-06-30 21:50:27.000000000 +0200
+++
/work/SRC/openSUSE:Factory/.libqt5-qtimageformats.new/libqt5-qtimageformats.changes
2014-09-08 21:28:36.000000000 +0200
@@ -1,0 +2,8 @@
+Thu Sep 4 20:37:34 UTC 2014 - hrvoje.sen...@gmail.com
+
+- Update to 5.3.2~git20140904 (rcccf0de):
+ * Tip of the bugfix 5.3.2 branch
+ * Fix DDS image writing
+ * Remove some material with questionable copyright
+
+-------------------------------------------------------------------
Old:
----
qtimageformats-opensource-src-5.3.1.tar.xz
New:
----
qtimageformats-opensource-src-5.3.2.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libqt5-qtimageformats.spec ++++++
--- /var/tmp/diff_new_pack.Lp7FTl/_old 2014-09-08 21:28:37.000000000 +0200
+++ /var/tmp/diff_new_pack.Lp7FTl/_new 2014-09-08 21:28:37.000000000 +0200
@@ -16,23 +16,19 @@
#
-%define qt5_snapshot 0
+%define qt5_snapshot 1
Name: libqt5-qtimageformats
-Version: 5.3.1
+Version: 5.3.2~git20140904
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.3.1
-%define so_version 5.3.1
-%if %qt5_snapshot
-%define tar_version qtimageformats-%{real_version}
-%else
+%define real_version 5.3.2
+%define so_version 5.3.2
%define tar_version qtimageformats-opensource-src-%{real_version}
-%endif
Source: %{tar_version}.tar.xz
Source1: baselibs.conf
BuildRequires: libjasper-devel
@@ -45,7 +41,7 @@
BuildRequires: perl
%endif
BuildRequires: xz
-Requires: libQt5Gui5
+%requires_ge libQt5Gui5
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -74,11 +70,7 @@
%prep
-%if %qt5_snapshot
-%setup -q -n qtimageformats-%{real_version}
-%else
%setup -q -n qtimageformats-opensource-src-%{real_version}
-%endif
%build
%if %qt5_snapshot
++++++ qtimageformats-opensource-src-5.3.1.tar.xz ->
qtimageformats-opensource-src-5.3.2.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/qtimageformats-opensource-src-5.3.1/.qmake.conf
new/qtimageformats-opensource-src-5.3.2/.qmake.conf
--- old/qtimageformats-opensource-src-5.3.1/.qmake.conf 2014-06-19
12:08:33.000000000 +0200
+++ new/qtimageformats-opensource-src-5.3.2/.qmake.conf 2014-09-03
08:55:37.000000000 +0200
@@ -1,3 +1,3 @@
load(qt_build_config)
-MODULE_VERSION = 5.3.1
+MODULE_VERSION = 5.3.2
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/qtimageformats-opensource-src-5.3.1/.tag
new/qtimageformats-opensource-src-5.3.2/.tag
--- old/qtimageformats-opensource-src-5.3.1/.tag 2014-06-19
12:08:34.000000000 +0200
+++ new/qtimageformats-opensource-src-5.3.2/.tag 2014-09-03
08:55:37.000000000 +0200
@@ -1 +1 @@
-1c66c5786c35a7d841e0004757cff06da3f9a2cc
+cccf0deca06a7ffa4534ce75e8d4cdb5f20a8b92
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtimageformats-opensource-src-5.3.1/src/plugins/imageformats/dds/qddshandler.cpp
new/qtimageformats-opensource-src-5.3.2/src/plugins/imageformats/dds/qddshandler.cpp
---
old/qtimageformats-opensource-src-5.3.1/src/plugins/imageformats/dds/qddshandler.cpp
2014-06-19 12:08:34.000000000 +0200
+++
new/qtimageformats-opensource-src-5.3.2/src/plugins/imageformats/dds/qddshandler.cpp
2014-09-03 08:55:37.000000000 +0200
@@ -1338,9 +1338,9 @@
dds.pixelFormat.bBitMask = 0x000000ff;
s << dds;
- for (int width = 0; width < image.width(); width++) {
- for (int height = 0; height < image.height(); height++) {
- QRgb pixel = image.pixel(height, width);;
+ for (int height = 0; height < image.height(); height++) {
+ for (int width = 0; width < image.width(); width++) {
+ QRgb pixel = image.pixel(width, height);
quint32 color;
quint8 alpha = qAlpha(pixel);
quint8 red = qRed(pixel);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtimageformats-opensource-src-5.3.1/tests/auto/dds/tst_qdds.cpp
new/qtimageformats-opensource-src-5.3.2/tests/auto/dds/tst_qdds.cpp
--- old/qtimageformats-opensource-src-5.3.1/tests/auto/dds/tst_qdds.cpp
2014-06-19 12:08:33.000000000 +0200
+++ new/qtimageformats-opensource-src-5.3.2/tests/auto/dds/tst_qdds.cpp
2014-09-03 08:55:37.000000000 +0200
@@ -109,6 +109,7 @@
QTest::newRow("46") << QString("RXGB") << QSize(64, 64);
QTest::newRow("47") << QString("ATI2") << QSize(64, 64);
QTest::newRow("48") << QString("P4") << QSize(64, 64);
+ QTest::newRow("49") << QString("A8R8G8B8_2") << QSize(64, 32);
}
void tst_qdds::readImage()
@@ -158,6 +159,7 @@
QTest::addColumn<QSize>("size");
QTest::newRow("1") << QString("A8R8G8B8") << QSize(64, 64);
+ QTest::newRow("2") << QString("A8R8G8B8_2") << QSize(64, 32);
}
void tst_qdds::testWriteImage()
Files old/qtimageformats-opensource-src-5.3.1/tests/auto/webp/images/lena.jpg
and new/qtimageformats-opensource-src-5.3.2/tests/auto/webp/images/lena.jpg
differ
Files old/qtimageformats-opensource-src-5.3.1/tests/auto/webp/images/lena.webp
and new/qtimageformats-opensource-src-5.3.2/tests/auto/webp/images/lena.webp
differ
Files
old/qtimageformats-opensource-src-5.3.1/tests/auto/webp/images/lena_lossless.webp
and
new/qtimageformats-opensource-src-5.3.2/tests/auto/webp/images/lena_lossless.webp
differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtimageformats-opensource-src-5.3.1/tests/auto/webp/tst_qwebp.cpp
new/qtimageformats-opensource-src-5.3.2/tests/auto/webp/tst_qwebp.cpp
--- old/qtimageformats-opensource-src-5.3.1/tests/auto/webp/tst_qwebp.cpp
2014-06-19 12:08:33.000000000 +0200
+++ new/qtimageformats-opensource-src-5.3.2/tests/auto/webp/tst_qwebp.cpp
2014-09-03 08:55:37.000000000 +0200
@@ -58,8 +58,6 @@
QTest::addColumn<QString>("fileName");
QTest::addColumn<QSize>("size");
- QTest::newRow("lena") << QString("lena") << QSize(103, 103);
- QTest::newRow("lena_lossless") << QString("lena_lossless") << QSize(103,
103);
QTest::newRow("kollada") << QString("kollada") << QSize(436, 160);
QTest::newRow("kollada_lossless") << QString("kollada_lossless") <<
QSize(436, 160);
}
@@ -85,8 +83,6 @@
QTest::addColumn<QSize>("size");
QTest::addColumn<bool>("needcheck");
- QTest::newRow("lena-90") << QString("lena") << QString(".jpg") << 90 <<
QSize(103, 103) << false;
- QTest::newRow("lena-100") << QString("lena") << QString(".jpg") << 100 <<
QSize(103, 103) << false;
QTest::newRow("kollada-75") << QString("kollada") << QString(".png") << 75
<< QSize(436, 160) << false;
QTest::newRow("kollada-100") << QString("kollada") << QString(".png") <<
100 << QSize(436, 160) << true;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtimageformats-opensource-src-5.3.1/tests/auto/webp/webp.qrc
new/qtimageformats-opensource-src-5.3.2/tests/auto/webp/webp.qrc
--- old/qtimageformats-opensource-src-5.3.1/tests/auto/webp/webp.qrc
2014-06-19 12:08:33.000000000 +0200
+++ new/qtimageformats-opensource-src-5.3.2/tests/auto/webp/webp.qrc
2014-09-03 08:55:37.000000000 +0200
@@ -1,8 +1,5 @@
<RCC>
<qresource prefix="/">
- <file>images/lena.jpg</file>
- <file>images/lena.webp</file>
- <file>images/lena_lossless.webp</file>
<file>images/kollada.png</file>
<file>images/kollada.webp</file>
<file>images/kollada_lossless.webp</file>
Files
old/qtimageformats-opensource-src-5.3.1/tests/shared/images/dds/A8R8G8B8_2.dds
and
new/qtimageformats-opensource-src-5.3.2/tests/shared/images/dds/A8R8G8B8_2.dds
differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtimageformats-opensource-src-5.3.1/tests/shared/images/dds.qrc
new/qtimageformats-opensource-src-5.3.2/tests/shared/images/dds.qrc
--- old/qtimageformats-opensource-src-5.3.1/tests/shared/images/dds.qrc
2014-06-19 12:08:33.000000000 +0200
+++ new/qtimageformats-opensource-src-5.3.2/tests/shared/images/dds.qrc
2014-09-03 08:55:37.000000000 +0200
@@ -49,5 +49,6 @@
<file>dds/YUY2.dds</file>
<file>dds/RXGB.dds</file>
<file>dds/ATI2.dds</file>
+ <file>dds/A8R8G8B8_2.dds</file>
</qresource>
</RCC>
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
