OSDN Git Service
(root)
/
kde
/
Katie.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
d7663f4
)
do not check if image size and format are the same in setup_qt() function
author
Ivailo Monev
<xakepa10@gmail.com>
Fri, 17 Dec 2021 22:50:15 +0000
(
00:50
+0200)
committer
Ivailo Monev
<xakepa10@gmail.com>
Fri, 17 Dec 2021 22:50:15 +0000
(
00:50
+0200)
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
src/gui/image/qpnghandler.cpp
patch
|
blob
|
history
diff --git
a/src/gui/image/qpnghandler.cpp
b/src/gui/image/qpnghandler.cpp
index
b807f0d
..
17e882a
100644
(file)
--- a/
src/gui/image/qpnghandler.cpp
+++ b/
src/gui/image/qpnghandler.cpp
@@
-112,10
+112,9
@@
static void setup_qt(QImage& image, png_structp png_ptr, png_infop info_ptr)
// We want 4 bytes, but it isn't an alpha channel
format = QImage::Format_RGB32;
}
- if (image.size() != QSize(width, height) || image.format() != format) {
- image = QImage(width, height, format);
- if (image.isNull())
- return;
+ image = QImage(width, height, format);
+ if (image.isNull()) {
+ return;
}
#if Q_BYTE_ORDER == Q_BIG_ENDIAN