OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-04-05 18:16:23 +03:00
Code Packages Releases Activity

0022782: Uninitialized global variable used in conditionals in OpenGl package

Browse Source
This commit is contained in:
KGV 2012-02-22 12:55:05 +00:00 committed by bugmaster
parent 695bdd1bbc
commit 529afc1a20
8 changed files with 15 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Aspect/Aspect_GraphicCallbackProc.hxx
View File

@ -11,10 +11,6 @@
#include <Aspect_Drawable.hxx>
#include <Aspect_RenderingContext.hxx>
#define OCC_REDRAW_WINDOW 1
#define OCC_REDRAW_WINDOWAREA 2
#define OCC_REDRAW_BITMAP 3
// The flags below provide additional information to define the moment when
// callback was invoked in redraw procedure. These flags are bitwise OR'ed
// with the "reason" value of callback:

10
src/InterfaceGraphic/InterfaceGraphic_Aspect.hxx
View File

@ -90,14 +90,4 @@ typedef struct {
} CALL_DEF_LAYER;
typedef struct {
int width;
int height;
#ifdef IMP100701
int depth;
#endif
Aspect_Drawable bitmap;
Aspect_RenderingContext bitmapContext;
} CALL_DEF_BITMAP;
#endif /* InterfaceGraphic_AspectHeader */

2
src/InterfaceGraphic/InterfaceGraphic_Visual3d.hxx
View File

@ -209,8 +209,6 @@ typedef struct {
CALL_DEF_WINDOW DefWindow;
CALL_DEF_BITMAP DefBitmap;
void *ptrUnderLayer;
void *ptrOverLayer;

24
src/OpenGl/OpenGl_GraphicDriver_7.cxx
View File

@ -98,7 +98,7 @@ void OpenGl_GraphicDriver::ClipLimit (const Graphic3d_CView& ACView, const Stand
if (aCView)
{
aCView->View->SetClipLimit(ACView);
if (!AWait && !ACView.DefBitmap.bitmap)
if (!AWait)
{
aCView->WS->Resize(ACView.DefWindow);
aCView->WS->Invalidate();
@ -131,15 +131,6 @@ Standard_Boolean OpenGl_GraphicDriver::ProjectRaster (const Graphic3d_CView& ACV
Standard_Integer aWidth = aCView->WS->Width();
Standard_Integer aHeight = aCView->WS->Height();
//if we want project something before to dump it into pixmap
//For right copution of projection before dumping to pixmap
if ( ACView.DefBitmap.bitmap )
{
aWidth = ACView.DefBitmap.width;
aHeight = ACView.DefBitmap.height;
}
Standard_ShortReal xr, yr;
if (aCView->View->ProjectObjectToRaster(aWidth, aHeight, AX, AY, AZ, xr, yr))
{
@ -180,12 +171,11 @@ Standard_Boolean OpenGl_GraphicDriver::UnProjectRasterWithRay (const Graphic3d_C
return aCView->View->ProjectRasterToObjectWithRay( aWidth, aHeight, AU, AYM-Aym-AV, Ax, Ay, Az, Dx, Dy, Dz );
}
void OpenGl_GraphicDriver::RatioWindow (const Graphic3d_CView& ACView)
void OpenGl_GraphicDriver::RatioWindow (const Graphic3d_CView& theCView)
{
const OpenGl_CView *aCView = (const OpenGl_CView *)ACView.ptrView;
if (!aCView)
if( !ACView.DefBitmap.bitmap )
aCView->WS->Resize(ACView.DefWindow);
const OpenGl_CView* aCView = (const OpenGl_CView* )theCView.ptrView;
if (aCView != NULL)
aCView->WS->Resize (theCView.DefWindow);
}
void OpenGl_GraphicDriver::Redraw (const Graphic3d_CView& ACView, const Aspect_CLayer2d& ACUnderLayer, const Aspect_CLayer2d& ACOverLayer, const Standard_Integer x, const Standard_Integer y, const Standard_Integer width, const Standard_Integer height)
@ -478,7 +468,7 @@ void OpenGl_GraphicDriver::ViewMapping (const Graphic3d_CView& ACView, const Sta
if (aCView)
{
aCView->View->SetMapping(ACView);
if (!AWait && !ACView.DefBitmap.bitmap)
if (!AWait)
{
aCView->WS->Resize(ACView.DefWindow);
aCView->WS->Invalidate();
@ -492,7 +482,7 @@ void OpenGl_GraphicDriver::ViewOrientation (const Graphic3d_CView& ACView, const
if (aCView)
{
aCView->View->SetOrientation(ACView);
if (!AWait && !ACView.DefBitmap.bitmap)
if (!AWait)
{
aCView->WS->Resize(ACView.DefWindow);
aCView->WS->Invalidate();

1
src/OpenGl/OpenGl_NamedStatus.hxx
View File

@ -24,6 +24,5 @@
#define OPENGL_NS_FORBIDSETTEX (1<<14)
#define OPENGL_NS_FLIST (1<<15)
#define OPENGL_NS_WHITEBACK (1<<16)
#define OPENGL_NS_ISBITMAP (1<<17)
#endif //_OpenGl_NamedStatus_Header

23
src/OpenGl/OpenGl_View_2.cxx
View File

@ -1194,20 +1194,18 @@ D = -[Px,Py,Pz] dot |Nx|
glEnable ( GL_CULL_FACE );
glCullFace ( GL_BACK );
}
else
else
glDisable ( GL_CULL_FACE );
}
/////////////////////////////////////////////////////////////////////////////
// Step 6: Draw overlayer
// Redrawing to bitmap or window?
const int amode = (AWorkspace->NamedStatus & OPENGL_NS_ISBITMAP)? OCC_REDRAW_BITMAP : OCC_REDRAW_WINDOW;
AWorkspace->DisplayCallback(ACView,(amode | OCC_PRE_OVERLAY));
const int aMode = 0;
AWorkspace->DisplayCallback (ACView, (aMode | OCC_PRE_OVERLAY));
RedrawLayer2d(AWorkspace, ACView, ACOverLayer);
AWorkspace->DisplayCallback(ACView,amode);
AWorkspace->DisplayCallback (ACView, aMode);
// Restore clipping planes
for ( ptrPlane = oldPlanes, planeid = GL_CLIP_PLANE0; planeid < lastid; planeid++, ptrPlane++ )
@ -1215,7 +1213,7 @@ D = -[Px,Py,Pz] dot |Nx|
glClipPlane( planeid, ptrPlane->Equation );
if ( ptrPlane->isEnabled )
glEnable( planeid );
else
else
glDisable( planeid );
}
delete[] oldPlanes;
@ -1278,15 +1276,8 @@ void OpenGl_View::RedrawLayer2d (const Handle(OpenGl_Workspace) &AWorkspace, con
|| ACLayer.ptrLayer == NULL
|| ACLayer.ptrLayer->listIndex == 0) return;
GLsizei dispWidth, dispHeight;
if ( ACView.DefBitmap.bitmap ) {
dispWidth = ACView.DefBitmap.width;
dispHeight = ACView.DefBitmap.height;
}
else {
dispWidth = (GLsizei) ACLayer.viewport[0];
dispHeight = (GLsizei) ACLayer.viewport[1];
}
GLsizei dispWidth = (GLsizei )ACLayer.viewport[0];
GLsizei dispHeight = (GLsizei )ACLayer.viewport[1];
const GLboolean isl = glIsEnabled(GL_LIGHTING); /*OCC6247*/
if (isl)

3
src/OpenGl/OpenGl_Workspace_2.cxx
View File

@ -566,7 +566,6 @@ Standard_Boolean OpenGl_Workspace::Print
bool isDone = true;
// Set up status for printing
NamedStatus |= OPENGL_NS_ISBITMAP;
if (!showBackground)
NamedStatus |= OPENGL_NS_WHITEBACK;
@ -750,7 +749,7 @@ Standard_Boolean OpenGl_Workspace::Print
#endif
// Reset status after printing
NamedStatus &= ~(OPENGL_NS_WHITEBACK | OPENGL_NS_ISBITMAP);
NamedStatus &= ~OPENGL_NS_WHITEBACK;
return (Standard_Boolean) isDone;

2
src/Visual3d/Visual3d_View.cxx
View File

@ -278,7 +278,6 @@ Standard_Real um, vm, uM, vM;
MyCView.Backfacing = 0;
#endif // G003
MyCView.DefBitmap.bitmap = 0;
MyCView.ptrUnderLayer = 0;
MyCView.ptrOverLayer = 0;
MyCView.GContext = 0;
@ -421,7 +420,6 @@ Standard_Real um, vm, uM, vM;
ComputedModeIsActive = Standard_False;
#endif // G003
MyCView.DefBitmap.bitmap = 0;
MyCView.ptrUnderLayer = 0;
MyCView.ptrOverLayer = 0;
MyCView.GContext = 0;