0022782: Uninitialized global variable used in conditionals in OpenGl package

diff --git a/src/Aspect/Aspect_GraphicCallbackProc.hxx b/src/Aspect/Aspect_GraphicCallbackProc.hxx
index 0b2fd79192d818031b616fa39b75e226ace5e121..65bbc5eef5314fa29a7af11fee0a96a676082be3 100755 (executable)
--- a/src/Aspect/Aspect_GraphicCallbackProc.hxx
+++ b/src/Aspect/Aspect_GraphicCallbackProc.hxx
@@ -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:

diff --git a/src/InterfaceGraphic/InterfaceGraphic_Aspect.hxx b/src/InterfaceGraphic/InterfaceGraphic_Aspect.hxx
index e10252e0fb7bff90f7ba1601a741c14c83bd9b37..1b8445bbc7f02cc01fdae33aef1a7b54f4316c91 100755 (executable)
--- a/src/InterfaceGraphic/InterfaceGraphic_Aspect.hxx
+++ b/src/InterfaceGraphic/InterfaceGraphic_Aspect.hxx
@@ -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 */

diff --git a/src/InterfaceGraphic/InterfaceGraphic_Visual3d.hxx b/src/InterfaceGraphic/InterfaceGraphic_Visual3d.hxx
index bff76a305028d87b43553b5966b44aa1ed413427..3647f1c85447f6f41f5be43143afd5997a8cf9fa 100755 (executable)
--- a/src/InterfaceGraphic/InterfaceGraphic_Visual3d.hxx
+++ b/src/InterfaceGraphic/InterfaceGraphic_Visual3d.hxx
@@ -209,8 +209,6 @@ typedef struct {
 
        CALL_DEF_WINDOW DefWindow;
 
-       CALL_DEF_BITMAP DefBitmap;
-
        void *ptrUnderLayer;
        void *ptrOverLayer;
 

diff --git a/src/OpenGl/OpenGl_GraphicDriver_7.cxx b/src/OpenGl/OpenGl_GraphicDriver_7.cxx
index ef278e8ca2c043cba6a505c326861a9508ad7482..1ad1798f6929a87e48dc3a26c22007505f12c7c1 100755 (executable)
--- a/src/OpenGl/OpenGl_GraphicDriver_7.cxx
+++ b/src/OpenGl/OpenGl_GraphicDriver_7.cxx
@@ -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();

diff --git a/src/OpenGl/OpenGl_NamedStatus.hxx b/src/OpenGl/OpenGl_NamedStatus.hxx
index cd1f0f7dc9372b7aaa073307945510f06b54c585..60b600e6d7c72f35ed16bc9f7bdd2347d85bffa1 100644 (file)
--- a/src/OpenGl/OpenGl_NamedStatus.hxx
+++ b/src/OpenGl/OpenGl_NamedStatus.hxx
@@ -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

diff --git a/src/OpenGl/OpenGl_View_2.cxx b/src/OpenGl/OpenGl_View_2.cxx
index d9cc87768c383156738ca0aeab7463970e678345..885c467f3db793f5491c8fb1997a1cd5dec8fe65 100644 (file)
--- a/src/OpenGl/OpenGl_View_2.cxx
+++ b/src/OpenGl/OpenGl_View_2.cxx
@@ -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)

diff --git a/src/OpenGl/OpenGl_Workspace_2.cxx b/src/OpenGl/OpenGl_Workspace_2.cxx
index 74745d4ee2aab87a392f599b4640b8fbb47cdcce..c3a49e84798466d840f53d4ab3810deead93a296 100644 (file)
--- a/src/OpenGl/OpenGl_Workspace_2.cxx
+++ b/src/OpenGl/OpenGl_Workspace_2.cxx
@@ -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;
 

diff --git a/src/Visual3d/Visual3d_View.cxx b/src/Visual3d/Visual3d_View.cxx
index b05ef890b8704e02f36efcc48739afd9f19ab0d1..2be25e2d88400a9acc294f8be1f324c7cc5c9ecf 100755 (executable)
--- a/src/Visual3d/Visual3d_View.cxx
+++ b/src/Visual3d/Visual3d_View.cxx
@@ -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;