Skip to content

Commit 5d66c22

Browse files
committed
Remove unused (and also deprecated) retrieval of pixmap (#1204)
Critical fix to compile cleanly with Qt 5.15 Signed-off-by: Larry Gritz <[email protected]>
1 parent 114321d commit 5d66c22

File tree

2 files changed

+5
-6
lines changed

2 files changed

+5
-6
lines changed

INSTALL.md

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,9 +53,11 @@ NEW or CHANGED dependencies since the last major release are **bold**.
5353
* [Flex](https://github.com/westes/flex) and
5454
[GNU Bison](https://www.gnu.org/software/bison/)
5555
* [PugiXML](http://pugixml.org/)
56-
* [Partio](https://www.disneyanimation.com/technology/partio.html) --
57-
optional, but if it is not found at build time, the OSL `pointcloud`
58-
functions will not be operative.
56+
* (optional) [Partio](https://www.disneyanimation.com/technology/partio.html)
57+
If it is not found at build time, the OSL `pointcloud` functions will not
58+
be operative.
59+
* (optional) Qt >= 5.6 (tested through 5.15). If not found at build time,
60+
the `osltoy` application will be disabled.
5961

6062

6163

src/osltoy/osltoyapp.cpp

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -221,9 +221,6 @@ class OSLToyRenderView : public QLabel {
221221
bool getPixel(QPoint pos, PixelInfo& info) {
222222
if (! m_framebuffer.initialized())
223223
return false;
224-
const auto* pmap = pixmap();
225-
if (! pmap )
226-
return false;
227224
const auto& spec = m_framebuffer.spec();
228225
info.x = pos.x();
229226
info.y = pos.y();

0 commit comments

Comments
 (0)