OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-04-04 18:06:22 +03:00
Code Packages Releases 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
Show Stats 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; anOffset.x() = 0;
for (; anOffset.x() < aTargetSize.x(); anOffset.x() += aFBOVPSize.x()) for (; anOffset.x() < aTargetSize.x(); anOffset.x() += aFBOVPSize.x())
{ {
Graphic3d_CameraTile aTile; Graphic3d_CameraTile aTileUncropped;
aTile.Offset = anOffset; aTileUncropped.Offset = anOffset;
aTile.TotalSize = aTargetSize; aTileUncropped.TotalSize = aTargetSize;
aTile.TileSize = aFBOVPSize; aTileUncropped.TileSize = aFBOVPSize;
if (!aFBOPtr.IsNull()) const Graphic3d_CameraTile aTile = aTileUncropped.Cropped();
{
// crop corners in case of FBO
// (no API to resize viewport of on-screen buffer - keep uncropped in this case)
aTile = aTile.Cropped();
}
if (aTile.TileSize.x() < 1 if (aTile.TileSize.x() < 1
|| aTile.TileSize.y() < 1) || aTile.TileSize.y() < 1)
{ {
@ -2973,11 +2968,16 @@ Standard_Boolean V3d_View::ToPixMap (Image_PixMap& theImage,
aTile.TileSize.x(), aTile.TileSize.y(), aTile.TileSize.x(), aTile.TileSize.y(),
theImage.SizeRowBytes()); theImage.SizeRowBytes());
aCamera->SetTile (aTile);
if (!aFBOPtr.IsNull()) if (!aFBOPtr.IsNull())
{ {
aCamera->SetTile (aTile);
myView->FBOChangeViewport (aFBOPtr, aTile.TileSize.x(), aTile.TileSize.y()); 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(); Redraw();
isSuccess = isSuccess && myView->BufferDump (aTilePixMap, theParams.BufferType); isSuccess = isSuccess && myView->BufferDump (aTilePixMap, theParams.BufferType);
if (!isSuccess) if (!isSuccess)

18
tests/bugs/vis/bug29127 Normal file
View File

@ -0,0 +1,18 @@
puts "============"
puts "0029127: Visualization - V3d_View::ToPixMap() crashes on tiled rendering without FBO"
puts "============"
puts ""
pload MODELING VISUALIZATION
box b 1 2 3
# request software OpenGL implementation - which is OpenGL 1.1 in case of Windows
# (test case is useless for other systems)
vcaps -softMode 1
vclear
vinit View1
vsetdispmode 1
vdisplay b
vfit
vdump $::imagedir/${::casename}_409.png -buffer rgb -width 409 -height 409
vdump $::imagedir/${::casename}_412.png -buffer rgb -width 412 -height 412 -tileSize 409
vdump $::imagedir/${::casename}_500.png -buffer rgb -width 500 -height 500 -tileSize 300