summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorQbProg <tholag@gmail.com>2011-06-11 19:55:09 +0200
committerDenis Barbier <bouzim@gmail.com>2011-06-13 09:10:45 +0200
commitf29a2b163de2f11fe1f0edd8ce90fefbb49d5af7 (patch)
tree101fdc4a4b3fee262428c8ab1002798836d5d9e9
parent95fa795b23930e8357173b01ca7c0ff84e50289e (diff)
downloadoce-f29a2b163de2f11fe1f0edd8ce90fefbb49d5af7.tar.gz
oce-f29a2b163de2f11fe1f0edd8ce90fefbb49d5af7.zip
[warning-fix][implicit-conversion-from-wider-type]
Fixed various cast warnings
Diffstat
-rw-r--r--inc/Graphic3d_ArrayOfPrimitives.lxx6
-rw-r--r--src/DDataStd/DDataStd_BasicCommands.cxx14
-rw-r--r--src/Draw/CommandWindow.cxx18
-rw-r--r--src/Draw/Draw_Window.cxx8
-rw-r--r--src/Draw/MainWindow.cxx2
-rw-r--r--src/DrawTrSurf/DrawTrSurf.cxx8
-rw-r--r--src/DrawTrSurf/DrawTrSurf_Point.cxx2
-rw-r--r--src/Interface/Interface_InterfaceModel.cxx2
-rw-r--r--src/ViewerTest/ViewerTest_ViewerCommands.cxx2
-rw-r--r--src/VrmlData/VrmlData_ShapeConvert.cxx8
-rw-r--r--src/XmlMXCAFDoc/XmlMXCAFDoc_MaterialDriver.cxx2
11 files changed, 36 insertions, 36 deletions
diff --git a/inc/Graphic3d_ArrayOfPrimitives.lxx b/inc/Graphic3d_ArrayOfPrimitives.lxx
index 50d99b98..7ac0f04f 100644
--- a/inc/Graphic3d_ArrayOfPrimitives.lxx
+++ b/inc/Graphic3d_ArrayOfPrimitives.lxx
@@ -82,9 +82,9 @@ inline void Graphic3d_ArrayOfPrimitives::SetVertexColor(
}
if( myPrimitiveArray->vcolours ) {
- unsigned char red = (unsigned int)(R * 255.);
- unsigned char green = (unsigned int)(G * 255.);
- unsigned char blue = (unsigned int)(B * 255.);
+ unsigned char red = (unsigned char)(unsigned int)(R * 255.);
+ unsigned char green = (unsigned char)(unsigned int)(G * 255.);
+ unsigned char blue = (unsigned char)(unsigned int)(B * 255.);
unsigned char alpha = 0;
Standard_Integer outColor ;
outColor = red;
diff --git a/src/DDataStd/DDataStd_BasicCommands.cxx b/src/DDataStd/DDataStd_BasicCommands.cxx
index e66b3dbe..f0af9b72 100644
--- a/src/DDataStd/DDataStd_BasicCommands.cxx
+++ b/src/DDataStd/DDataStd_BasicCommands.cxx
@@ -1107,12 +1107,12 @@ static Standard_Integer DDataStd_GetUTFtoFile (Draw_Interpretor& di,
cout << "Error: problem with the file stream, rdstate = " <<anOS.rdstate() <<endl;
#endif
}
- char prefix[4] = {0xEF,0xBB,0xBF, 0x00};
- anOS.write( (char*)&prefix[0], 3);
+ unsigned char prefix[4] = {0xEF,0xBB,0xBF, 0x00};
+ anOS.write( reinterpret_cast<const char*>(&prefix[0]), 3);
Standard_Integer n = aES.LengthOfCString();
Standard_PCharacter aCstr = (Standard_PCharacter) Standard::Allocate(ROUNDMEM(n+1));
n = aES.ToUTF8CString(aCstr);
- anOS.write( (char*)&aCstr[0], n);
+ anOS.write( reinterpret_cast<const char*>(&aCstr[0]), n);
anOS.close();
return 0;
}
@@ -1145,7 +1145,7 @@ static Standard_Integer DDataStd_SetByteArray (Draw_Interpretor& di,
cout << "Bad value = " << ival<< endl;
return 1;
}
- A->SetValue(i, (unsigned)ival);
+ A->SetValue(i, (Standard_Byte)(unsigned)ival);
j++;
}
return 0;
@@ -1217,7 +1217,7 @@ static Standard_Integer DDataStd_ChangeByteArray (Draw_Interpretor& di,
}
Standard_Integer low = A->Lower(), up = A->Upper();
if(low <= indx && indx <= up)
- A->SetValue(indx, (unsigned)ival);
+ A->SetValue(indx, (Standard_Byte)(unsigned)ival);
else {
Handle(TColStd_HArray1OfByte) Arr = A->InternalArray();
Handle(TColStd_HArray1OfByte) arr;
@@ -1229,7 +1229,7 @@ static Standard_Integer DDataStd_ChangeByteArray (Draw_Interpretor& di,
arr->SetValue(i, Arr->Value(i));
for(i=Arr->Upper()+1; i<= up; i++) {
if(i == up)
- arr->SetValue(i, (unsigned)ival);
+ arr->SetValue(i, (Standard_Byte)(unsigned)ival);
else
arr->SetValue(i, 0);
}
@@ -1238,7 +1238,7 @@ static Standard_Integer DDataStd_ChangeByteArray (Draw_Interpretor& di,
arr = new TColStd_HArray1OfByte(low, up);
for(i=low; i< up; i++)
arr->SetValue(i, Arr->Value(i));
- arr->SetValue(up, (unsigned)ival);
+ arr->SetValue(up, (Standard_Byte)(unsigned)ival);
}
A->ChangeArray(arr);
}
diff --git a/src/Draw/CommandWindow.cxx b/src/Draw/CommandWindow.cxx
index f087f791..d9dca87b 100644
--- a/src/Draw/CommandWindow.cxx
+++ b/src/Draw/CommandWindow.cxx
@@ -93,7 +93,7 @@ LONG APIENTRY CommandProc(HWND hWnd, UINT wMsg, WPARAM wParam, LONG lParam )
hWndEdit = (HWND)GetWindowLong(hWnd, CLIENTWND);
MoveWindow(hWndEdit, 0, 0, LOWORD(lParam), HIWORD(lParam), TRUE);
// Place le curseur a la fin du buffer
- index = SendMessage(hWnd, WM_GETTEXTLENGTH, 0l, 0l);
+ index = (int) SendMessage(hWnd, WM_GETTEXTLENGTH, 0l, 0l);
SendMessage(hWnd, EM_SETSEL, index, index);
break;
@@ -103,7 +103,7 @@ LONG APIENTRY CommandProc(HWND hWnd, UINT wMsg, WPARAM wParam, LONG lParam )
break;
default :
- return(DefWindowProc(hWnd, wMsg, wParam, lParam));
+ return LONG(DefWindowProc(hWnd, wMsg, wParam, lParam));
}
return(0l);
}
@@ -164,7 +164,7 @@ int GetCommand(HWND hWnd, char* buffer)
int again = 1;
char temp[COMMANDSIZE]="";
- int nbLine = SendMessage(hWnd, EM_GETLINECOUNT, 0l, 0l);
+ int nbLine = (int)SendMessage(hWnd, EM_GETLINECOUNT, 0l, 0l);
int nbChar = 0;
buffer[0]='\0';
@@ -175,7 +175,7 @@ int GetCommand(HWND hWnd, char* buffer)
WORD* nbMaxChar = (WORD*)temp;
*nbMaxChar = COMMANDSIZE-1;
- int nbCharRead = SendMessage(hWnd, EM_GETLINE, nbLine-1, (LPARAM)temp);
+ int nbCharRead = (int)SendMessage(hWnd, EM_GETLINE, nbLine-1, (LPARAM)temp);
nbChar += nbCharRead ;
int cmp = strncmp(temp, PROMPT, 10);
temp[nbCharRead]='\0';
@@ -226,16 +226,16 @@ LONG APIENTRY EditProc(HWND hWnd, UINT wMsg, WPARAM wParam, LONG lParam )
strcpy(console_command, buffer+strlen(PROMPT));
console_semaphore = HAS_CONSOLE_COMMAND;
// Purge du buffer
- nbline = SendMessage(hWnd, EM_GETLINECOUNT, 0l, 0l);
+ nbline = (int)SendMessage(hWnd, EM_GETLINECOUNT, 0l, 0l);
if(nbline > 200)
{
nbline = 0;
GetCommand(hWnd, buffer);
- index = SendMessage(hWnd, EM_LINEINDEX, 100, 0);
+ index = (int)SendMessage(hWnd, EM_LINEINDEX, 100, 0);
SendMessage(hWnd, EM_SETSEL, 0, index);
SendMessage(hWnd, WM_CUT, 0, 0);
// Place le curseur en fin de text
- index = SendMessage(hWnd, WM_GETTEXTLENGTH, 0l, 0l);
+ index = (int)SendMessage(hWnd, WM_GETTEXTLENGTH, 0l, 0l);
SendMessage(hWnd, EM_SETSEL, index, index);
}
return(0l);
@@ -244,7 +244,7 @@ LONG APIENTRY EditProc(HWND hWnd, UINT wMsg, WPARAM wParam, LONG lParam )
if (IsAlphanumeric((Standard_Character)LOWORD(wParam)))
{
// Place le curseur en fin de texte avant affichage
- index = SendMessage(hWnd, WM_GETTEXTLENGTH, 0l, 0l);
+ index = (int)SendMessage(hWnd, WM_GETTEXTLENGTH, 0l, 0l);
SendMessage(hWnd, EM_SETSEL, index, index);
CallWindowProc(OldEditProc, hWnd, wMsg, wParam, lParam);
return 0l;
@@ -256,7 +256,7 @@ LONG APIENTRY EditProc(HWND hWnd, UINT wMsg, WPARAM wParam, LONG lParam )
if (console_semaphore != WAIT_CONSOLE_COMMAND)
return 0l;
}
- return CallWindowProc(OldEditProc, hWnd, wMsg, wParam, lParam);
+ return (LONG)CallWindowProc(OldEditProc, hWnd, wMsg, wParam, lParam);
}
#endif
diff --git a/src/Draw/Draw_Window.cxx b/src/Draw/Draw_Window.cxx
index 67b40b86..0d5c2eb3 100644
--- a/src/Draw/Draw_Window.cxx
+++ b/src/Draw/Draw_Window.cxx
@@ -1332,9 +1332,9 @@ LONG APIENTRY DrawWindow::DrawProc(HWND hWnd, UINT wMsg, WPARAM wParam, LONG lPa
if (!localObjet)
{
if (Draw_IsConsoleSubsystem)
- return (DefWindowProc(hWnd, wMsg, wParam, lParam));
+ return LONG(DefWindowProc(hWnd, wMsg, wParam, lParam));
else
- return(DefMDIChildProc(hWnd, wMsg, wParam, lParam));
+ return LONG(DefMDIChildProc(hWnd, wMsg, wParam, lParam));
}
PAINTSTRUCT ps;
@@ -1362,9 +1362,9 @@ LONG APIENTRY DrawWindow::DrawProc(HWND hWnd, UINT wMsg, WPARAM wParam, LONG lPa
default:
if (Draw_IsConsoleSubsystem)
- return (DefWindowProc(hWnd, wMsg, wParam, lParam));
+ return LONG(DefWindowProc(hWnd, wMsg, wParam, lParam));
else
- return(DefMDIChildProc(hWnd, wMsg, wParam, lParam));
+ return LONG(DefMDIChildProc(hWnd, wMsg, wParam, lParam));
}
return (0l);
}
diff --git a/src/Draw/MainWindow.cxx b/src/Draw/MainWindow.cxx
index c20549f4..84929ee2 100644
--- a/src/Draw/MainWindow.cxx
+++ b/src/Draw/MainWindow.cxx
@@ -51,7 +51,7 @@ LONG APIENTRY WndProc(HWND hWndFrame, UINT wMsg, WPARAM wParam, LONG lParam )
default :
hWndClient = (HWND)GetWindowLong(hWndFrame, CLIENTWND);
- return(DefFrameProc(hWndFrame, hWndClient, wMsg, wParam, lParam));
+ return LONG(DefFrameProc(hWndFrame, hWndClient, wMsg, wParam, lParam));
}
return(0l);
}
diff --git a/src/DrawTrSurf/DrawTrSurf.cxx b/src/DrawTrSurf/DrawTrSurf.cxx
index 5ee230ed..0c675b21 100644
--- a/src/DrawTrSurf/DrawTrSurf.cxx
+++ b/src/DrawTrSurf/DrawTrSurf.cxx
@@ -1531,7 +1531,7 @@ static void pntsave(const Handle(Draw_Drawable3D)&d, ostream& OS)
OS.precision(15);
#else
long form = OS.setf(ios::scientific);
- int prec = OS.precision(15);
+ std::streamsize prec = OS.precision(15);
#endif
gp_Pnt P = N->Point();
if (N->Is3D()) {
@@ -1593,7 +1593,7 @@ static void triasave(const Handle(Draw_Drawable3D)&d, ostream& OS)
OS.precision(15);
#else
long form = OS.setf(ios::scientific);
- int prec = OS.precision(15);
+ std::streamsize prec = OS.precision(15);
#endif
Poly::Write(T->Triangulation(),OS);
#if defined(HAVE_IOS) && !defined(__sgi) && !defined(IRIX)
@@ -1634,7 +1634,7 @@ static void poly3dsave(const Handle(Draw_Drawable3D)&d, ostream& OS)
OS.precision(15);
#else
long form = OS.setf(ios::scientific);
- int prec = OS.precision(15);
+ std::streamsize prec = OS.precision(15);
#endif
Poly::Write(T->Polygon3D(),OS);
#if defined(HAVE_IOS) && !defined(__sgi) && !defined(IRIX)
@@ -1674,7 +1674,7 @@ static void poly2dsave(const Handle(Draw_Drawable3D)&d, ostream& OS)
OS.precision(15);
#else
long form = OS.setf(ios::scientific);
- int prec = OS.precision(15);
+ std::streamsize prec = OS.precision(15);
#endif
Poly::Write(T->Polygon2D(),OS);
#if defined(HAVE_IOS) && !defined(__sgi) && !defined(IRIX)
diff --git a/src/DrawTrSurf/DrawTrSurf_Point.cxx b/src/DrawTrSurf/DrawTrSurf_Point.cxx
index bf882310..c1e3f06d 100644
--- a/src/DrawTrSurf/DrawTrSurf_Point.cxx
+++ b/src/DrawTrSurf/DrawTrSurf_Point.cxx
@@ -181,7 +181,7 @@ void DrawTrSurf_Point::Dump(Standard_OStream& S) const
S.precision(15);
#else
long form = S.setf(ios::scientific);
- int prec = S.precision(15);
+ std::streamsize prec = S.precision(15);
#endif
if (is3D)
S << "Point : " << myPoint.X() << ", " << myPoint.Y() << ", " << myPoint.Z() <<endl;
diff --git a/src/Interface/Interface_InterfaceModel.cxx b/src/Interface/Interface_InterfaceModel.cxx
index f43ea15b..ef41bed8 100644
--- a/src/Interface/Interface_InterfaceModel.cxx
+++ b/src/Interface/Interface_InterfaceModel.cxx
@@ -776,7 +776,7 @@ Standard_Boolean Interface_InterfaceModel::SetCategoryNumber
c->SetValue(i,thecategory->Value(i));
thecategory = c;
}
- Standard_Character cval = (val + 32);
+ Standard_Character cval = Standard_Character(val + 32);
thecategory->SetValue(num,cval);
return Standard_True;
}
diff --git a/src/ViewerTest/ViewerTest_ViewerCommands.cxx b/src/ViewerTest/ViewerTest_ViewerCommands.cxx
index 6881ca6c..c8fa316a 100644
--- a/src/ViewerTest/ViewerTest_ViewerCommands.cxx
+++ b/src/ViewerTest/ViewerTest_ViewerCommands.cxx
@@ -1638,7 +1638,7 @@ static int VColorScale (Draw_Interpretor& di, Standard_Integer argc, const char
{
aCS->SetPosition( X , Y );
aCS->SetHeight( 0.95) ;
- aCS->SetTextHeight( textHeight );
+ aCS->SetTextHeight( (Standard_Integer) textHeight );
aCS->SetRange( minRange , maxRange );
aCS->SetNumberOfIntervals( numIntervals );
aCS->SetLabelPosition( position );
diff --git a/src/VrmlData/VrmlData_ShapeConvert.cxx b/src/VrmlData/VrmlData_ShapeConvert.cxx
index 59aab8ce..b585b31e 100644
--- a/src/VrmlData/VrmlData_ShapeConvert.cxx
+++ b/src/VrmlData/VrmlData_ShapeConvert.cxx
@@ -67,7 +67,7 @@ void VrmlData_ShapeConvert::AddShape (const TopoDS_Shape& theShape,
char buf[2048], * optr = &buf[0];
char * eptr = &buf[sizeof(buf)-1];
for (const char * ptr = theName;; ptr++) {
- int sym = *ptr;
+ char sym = *ptr;
if (sym == '\0' || sym == '\n' || sym == '\r') {
* optr = '\0';
break;
@@ -456,9 +456,9 @@ Handle_VrmlData_Geometry VrmlData_ShapeConvert::triToIndexedFaceSet
arrVec[i] = aNormal.XYZ();
Standard_Integer j = i * 3;
- Normals->SetValue(j + 1, aNormal.X());
- Normals->SetValue(j + 2, aNormal.Y());
- Normals->SetValue(j + 3, aNormal.Z());
+ Normals->SetValue(j + 1, Standard_ShortReal(aNormal.X()));
+ Normals->SetValue(j + 2, Standard_ShortReal(aNormal.Y()));
+ Normals->SetValue(j + 3, Standard_ShortReal(aNormal.Z()));
}
diff --git a/src/XmlMXCAFDoc/XmlMXCAFDoc_MaterialDriver.cxx b/src/XmlMXCAFDoc/XmlMXCAFDoc_MaterialDriver.cxx
index d9445e3a..3ee5fbbf 100644
--- a/src/XmlMXCAFDoc/XmlMXCAFDoc_MaterialDriver.cxx
+++ b/src/XmlMXCAFDoc/XmlMXCAFDoc_MaterialDriver.cxx
@@ -99,7 +99,7 @@ void XmlMXCAFDoc_MaterialDriver::Paste (const Handle(TDF_Attribute)& theSource,
if ( !anAtt->GetDensValType().IsNull() )
aDensTypeStr = anAtt->GetDensValType()->String().ToCString();
- XmlObjMgt::SetStringValue (theTarget, anAtt->GetDensity());
+ XmlObjMgt::SetStringValue (theTarget,Standard_Integer(anAtt->GetDensity()));
theTarget.Element().setAttribute(::NameIndexString(), aNameString);
theTarget.Element().setAttribute(::DescrIndexString(),aDescrString);
theTarget.Element().setAttribute(::DensNameIndexString(),aDensNameStr);
generated by cgit v1.2.3 (git 2.39.1) at 2025-05-02 10:48:54 +0000