Skip to content

Commit

Permalink
Remove unused (and also deprecated) retrieval of pixmap (#1204)
Browse files Browse the repository at this point in the history
Critical fix to compile cleanly with Qt 5.15

Signed-off-by: Larry Gritz <[email protected]>
  • Loading branch information
lgritz committed Jun 12, 2020
1 parent 114321d commit 5d66c22
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 6 deletions.
8 changes: 5 additions & 3 deletions INSTALL.md
Original file line number Diff line number Diff line change
Expand Up @@ -53,9 +53,11 @@ NEW or CHANGED dependencies since the last major release are **bold**.
* [Flex](https://github.com/westes/flex) and
[GNU Bison](https://www.gnu.org/software/bison/)
* [PugiXML](http://pugixml.org/)
* [Partio](https://www.disneyanimation.com/technology/partio.html) --
optional, but if it is not found at build time, the OSL `pointcloud`
functions will not be operative.
* (optional) [Partio](https://www.disneyanimation.com/technology/partio.html)
If it is not found at build time, the OSL `pointcloud` functions will not
be operative.
* (optional) Qt >= 5.6 (tested through 5.15). If not found at build time,
the `osltoy` application will be disabled.



Expand Down
3 changes: 0 additions & 3 deletions src/osltoy/osltoyapp.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -221,9 +221,6 @@ class OSLToyRenderView : public QLabel {
bool getPixel(QPoint pos, PixelInfo& info) {
if (! m_framebuffer.initialized())
return false;
const auto* pmap = pixmap();
if (! pmap )
return false;
const auto& spec = m_framebuffer.spec();
info.x = pos.x();
info.y = pos.y();
Expand Down

0 comments on commit 5d66c22

Please sign in to comment.