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

0024607: Fix some GCC compiler warnings

Browse Source 
- enumeration value not handled in switch in Aspect_ColorScale.cxx, TNaming_DeltaOnModification.cxx
- comparison between signed and unsigned integer expressions in NIS_Triangulated.cxx, OSD_MAllocHook.cxx, RWStl.cxx
- static function defined or declared but not used in OpenGl_Workspace_2.cxx, ProjLib_ComputeApprox.cxx
This commit is contained in:
abv 2014-02-08 17:26:06 +04:00 committed by apn
parent feb2743f11
commit 8cb69787f2
7 changed files with 56 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/Aspect/Aspect_ColorScale.cxx
View File

@ -508,6 +508,9 @@ void Aspect_ColorScale::DrawScale( const Quantity_Color& aBgColor,
Standard_Integer last1( i1 ), last2( i2 );
x = X + spacer;
switch ( labPos ) {
case Aspect_TOCSP_NONE:
case Aspect_TOCSP_LEFT:
break;
case Aspect_TOCSP_CENTER:
x += ( colorWidth - textWidth ) / 2;
break;

18
src/NIS/NIS_Triangulated.cxx
View File

@ -772,13 +772,12 @@ Standard_Boolean NIS_Triangulated::Intersect
Standard_Boolean aResult (isFullIn);
if ((myType & Type_Triangulation) && myIsDrawPolygons == Standard_False) {
unsigned int iNode = 0;
for (; iNode < myNNodes * myNodeCoord; iNode += myNodeCoord)
unsigned int nbSteps = (unsigned)myNNodes * myNodeCoord;
for (unsigned int iNode = 0; iNode < nbSteps; iNode += myNodeCoord)
{
gp_XYZ aPnt (static_cast<Standard_Real>(mypNodes[iNode+0]),
static_cast<Standard_Real>(mypNodes[iNode+1]), 0.);
gp_XYZ aPnt (mypNodes[iNode+0], mypNodes[iNode+1], 0.);
if (myNodeCoord > 2)
aPnt.SetZ (static_cast<Standard_Real>(mypNodes[iNode+2]));
aPnt.SetZ (mypNodes[iNode+2]);
theTrf.Transforms (aPnt);
if (theBox.IsOut (aPnt)) {
if (isFullIn) {
@ -1073,13 +1072,12 @@ Standard_Boolean NIS_Triangulated::Intersect
Standard_Boolean aResult (isFullIn);
if ((myType & Type_Triangulation) && myIsDrawPolygons == Standard_False) {
unsigned int iNode = 0;
for (; iNode < myNNodes * myNodeCoord; iNode += myNodeCoord)
unsigned int nbSteps = (unsigned)myNNodes * myNodeCoord;
for (unsigned int iNode = 0; iNode < nbSteps; iNode += myNodeCoord)
{
gp_XYZ aPnt (static_cast<Standard_Real>(mypNodes[iNode+0]),
static_cast<Standard_Real>(mypNodes[iNode+1]), 0.);
gp_XYZ aPnt (mypNodes[iNode+0], mypNodes[iNode+1], 0.);
if (myNodeCoord > 2)
aPnt.SetZ (static_cast<Standard_Real>(mypNodes[iNode+2]));
aPnt.SetZ (mypNodes[iNode+2]);
theTrf.Transforms (aPnt);
gp_XY aP2d(aPnt.X(), aPnt.Y());

2
src/OSD/OSD_MAllocHook.cxx
View File

@ -488,7 +488,7 @@ OSD_MAllocHook::CollectBySize::~CollectBySize()
//purpose :
//=======================================================================
#define MAX_ALLOC_SIZE 2000000u
#define MAX_ALLOC_SIZE 2000000
const size_t OSD_MAllocHook::CollectBySize::myMaxAllocSize = MAX_ALLOC_SIZE;
void OSD_MAllocHook::CollectBySize::Reset()

68
src/OpenGl/OpenGl_Workspace_2.cxx
View File

@ -41,40 +41,14 @@
//10-05-96 : CAL ; Ajout d'un nouveau delta dans les copies de pixels (voir CALL_DEF_DELTA)
#define CALL_DEF_DELTA 10
// ---------------------------------------------------------------
// Function: getNearestPowOfTwo
// Purpose: get the nearest power of two for theNumber
// ---------------------------------------------------------------
static GLsizei getNearestPowOfTwo (const GLsizei theNumber)
{
GLsizei aLast = 1;
for (GLsizei p2 = 1; p2 <= theNumber; aLast = p2, p2 <<= 1);
return aLast;
}
#ifdef _WIN32
// ---------------------------------------------------------------
// Function: fitDimensionsRatio
// Purpose: calculate correct width/height ratio for theWidth and
// theHeight parameters
// ---------------------------------------------------------------
static void fitDimensionsRatio (Standard_Integer& theWidth,
Standard_Integer& theHeight,
const Standard_Real theViewRatio)
{
// set dimensions in accordance with the viewratio
if (theHeight < theWidth/theViewRatio)
theWidth = (Standard_Integer)(theHeight*theViewRatio);
if (theWidth < theHeight*theViewRatio)
theHeight = (Standard_Integer)(theWidth/theViewRatio);
}
#ifndef HAVE_FREEIMAGE
// ---------------------------------------------------------------
// Function: initBitmapBuffer
// Purpose: init device independent bitmap to hold printing data
// ---------------------------------------------------------------
#ifdef _WIN32
#ifndef HAVE_FREEIMAGE
static void initBitmapBuffer (const HDC theMemoryDC,
HBITMAP &theMemoryBmp,
const Standard_Integer theBmpWidth,
@ -100,7 +74,9 @@ static void initBitmapBuffer (const HDC theMemoryDC,
theMemoryBmp = CreateDIBSection (theMemoryDC, &aBitmapData, DIB_RGB_COLORS,
&theBufferPtr, NULL, 0);
}
#else
#else /* HAVE_FREEIMAGE */
// ---------------------------------------------------------------
// Function: imagePasteDC
// Purpose: copy the data from image buffer to the device context
@ -193,7 +169,19 @@ static bool imageStretchDC(HDC theDstDC, FipHandle theImage, int theOffsetX,
return true;
}
#endif
#endif /* HAVE_FREEIMAGE */
// ---------------------------------------------------------------
// Function: getNearestPowOfTwo
// Purpose: get the nearest power of two for theNumber
// ---------------------------------------------------------------
static GLsizei getNearestPowOfTwo (const GLsizei theNumber)
{
GLsizei aLast = 1;
for (GLsizei p2 = 1; p2 <= theNumber; aLast = p2, p2 <<= 1);
return aLast;
}
// ---------------------------------------------------------------
// Function: getMaxFrameSize
@ -216,6 +204,23 @@ static void getMaxFrameSize(Standard_Integer& theWidth,
theHeight = (Standard_Integer)aMaxY;
}
// ---------------------------------------------------------------
// Function: fitDimensionsRatio
// Purpose: calculate correct width/height ratio for theWidth and
// theHeight parameters
// ---------------------------------------------------------------
static void fitDimensionsRatio (Standard_Integer& theWidth,
Standard_Integer& theHeight,
const Standard_Real theViewRatio)
{
// set dimensions in accordance with the viewratio
if (theHeight < theWidth/theViewRatio)
theWidth = (Standard_Integer)(theHeight*theViewRatio);
if (theWidth < theHeight*theViewRatio)
theHeight = (Standard_Integer)(theWidth/theViewRatio);
}
// ---------------------------------------------------------------
// Function: initBufferStretch
// Purpose: calculate initialization sizes for frame buffer
@ -265,7 +270,8 @@ static void initBufferTiling (Standard_Integer& theFrameWidth,
if (theFrameHeight > theViewHeight)
theFrameHeight = theViewHeight;
}
#endif
#endif /* _WIN32 */
// ---------------------------------------------------------------
// ---------------------------------------------------------------

9
src/ProjLib/ProjLib_ComputeApprox.cxx
View File

@ -52,15 +52,6 @@
static Standard_Boolean AffichValue = Standard_False;
#endif
static
void Parameters(const Handle(Adaptor3d_HCurve)& myCurve,
const Handle(Adaptor3d_HSurface)& mySurface,
const gp_Pnt& aP1,
const Standard_Integer iFirst,
const Standard_Real aTolU,
Standard_Real& aU,
Standard_Real& aV);
//=======================================================================
//function : IsEqual
//purpose :

12
src/RWStl/RWStl.cxx
View File

@ -30,13 +30,13 @@
#include <stdio.h>
#include <gp_Vec.hxx>
// constants
static const int HEADER_SIZE = 84;
static const int SIZEOF_STL_FACET = 50;
static const int STL_MIN_FILE_SIZE = 284;
static const int ASCII_LINES_PER_FACET = 7;
static const int IND_THRESHOLD = 1000; // increment the indicator every 1k triangles
static const size_t HEADER_SIZE = 84;
static const size_t SIZEOF_STL_FACET = 50;
static const size_t STL_MIN_FILE_SIZE = 284;
static const size_t ASCII_LINES_PER_FACET = 7;
static const int IND_THRESHOLD = 1000; // increment the indicator every 1k triangles
//=======================================================================
//function : WriteInteger

1
src/TNaming/TNaming_DeltaOnModification.cxx
View File

@ -76,6 +76,7 @@ static void LoadNamedShape (TNaming_Builder& B,
B.Generated(NS);
break;
}
case TNaming_REPLACE: // for compatibility
case TNaming_GENERATED :
{
B.Generated(OS,NS);