Author: jghali
Date: Wed May 9 10:45:40 2018
New Revision: 22530
URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=22530
Log:
#15282: Suspicious assignment in PSD image loader
Modified:
branches/Version14x/Scribus/scribus/scimgdataloader_psd.cpp
Modified: branches/Version14x/Scribus/scribus/scimgdataloader_psd.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=22530&path=/branches/Version14x/Scribus/scribus/scimgdataloader_psd.cpp
==============================================================================
--- branches/Version14x/Scribus/scribus/scimgdataloader_psd.cpp (original)
+++ branches/Version14x/Scribus/scribus/scimgdataloader_psd.cpp Wed May 9
10:45:40 2018
@@ -957,9 +957,7 @@
}
else
layerInfo[layer].thumb_mask = QImage();
- if ((m_imageInfoRecord.isRequest) &&
(m_imageInfoRecord.RequestProps.contains(layer)))
- m_imageInfoRecord.RequestProps[layer].useMask =
m_imageInfoRecord.RequestProps[layer].useMask;
- else
+ if (!m_imageInfoRecord.isRequest ||
!m_imageInfoRecord.RequestProps.contains(layer))
m_imageInfoRecord.RequestProps[layer].useMask = true;
bool visible = !(layerInfo[layer].flags & 2);
if ((m_imageInfoRecord.isRequest) &&
(m_imageInfoRecord.RequestProps.contains(layer)))
_______________________________________________
scribus-commit mailing list
[email protected]
http://lists.scribus.net/mailman/listinfo/scribus-commit
