OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-08-14 13:30:48 +03:00
Code Activity

0029127: Visualization - V3d_View::ToPixMap() crashes on tiled rendering without FBO

Browse Source 
Fixed out-of-memory writing within fallback View dump mode.
This commit is contained in:
kgv
2017-09-20 14:28:26 +03:00
committed by bugmaster
parent e4f0cc46a0
commit c8fe0e2db4
2 changed files with 29 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/V3d/V3d_View.cxx
View File

@@ -2945,16 +2945,11 @@ Standard_Boolean V3d_View::ToPixMap (Image_PixMap& theImage,
anOffset.x() = 0;
for (; anOffset.x() < aTargetSize.x(); anOffset.x() += aFBOVPSize.x())
{
Graphic3d_CameraTile aTile;
aTile.Offset = anOffset;
aTile.TotalSize = aTargetSize;
aTile.TileSize = aFBOVPSize;
if (!aFBOPtr.IsNull())
{
// crop corners in case of FBO
// (no API to resize viewport of on-screen buffer - keep uncropped in this case)
aTile = aTile.Cropped();
}
Graphic3d_CameraTile aTileUncropped;
aTileUncropped.Offset = anOffset;
aTileUncropped.TotalSize = aTargetSize;
aTileUncropped.TileSize = aFBOVPSize;
const Graphic3d_CameraTile aTile = aTileUncropped.Cropped();
if (aTile.TileSize.x() < 1
|| aTile.TileSize.y() < 1)
{
@@ -2973,11 +2968,16 @@ Standard_Boolean V3d_View::ToPixMap (Image_PixMap& theImage,
aTile.TileSize.x(), aTile.TileSize.y(),
theImage.SizeRowBytes());
aCamera->SetTile (aTile);
if (!aFBOPtr.IsNull())
{
aCamera->SetTile (aTile);
myView->FBOChangeViewport (aFBOPtr, aTile.TileSize.x(), aTile.TileSize.y());
}
else
{
// no API to resize viewport of on-screen buffer - render uncropped
aCamera->SetTile (aTileUncropped);
}
Redraw();
isSuccess = isSuccess && myView->BufferDump (aTilePixMap, theParams.BufferType);
if (!isSuccess)