Linux compilation of Debian 6

diff --git a/src/CAM/CAM_Application.cxx b/src/CAM/CAM_Application.cxx
index 73d7ef7877482af3ebf359325295632bff7a3575..d70e80840ad4e6b057d85fd8aa83bd9b78518ad9 100755 (executable)
--- a/src/CAM/CAM_Application.cxx
+++ b/src/CAM/CAM_Application.cxx
@@ -31,6 +31,8 @@
 #include <QApplication>
 #include <QRegExp>
 
+#include <stdio.h>
+
 #ifdef WIN32
 #include <windows.h>
 #else

diff --git a/src/CAM/Makefile.am b/src/CAM/Makefile.am
index 3b80df3f8f7c93409d5a9ea74f50af1d1c3add77..44283644abe28f4a3ee78be0fef7aff2efcd0f2f 100755 (executable)
--- a/src/CAM/Makefile.am
+++ b/src/CAM/Makefile.am
@@ -49,7 +49,7 @@ nodist_libCAM_la_SOURCES = $(MOC_FILES)
 
 nodist_salomeres_DATA = \
        CAM_msg_en.qm \
-       CAM_msg_en.qm
+       CAM_msg_fr.qm
 
 libCAM_la_CPPFLAGS = $(QT_INCLUDES) -I$(srcdir)/../SUIT -I$(srcdir)/../STD -I$(srcdir)/../Qtx
 libCAM_la_LDFLAGS  = $(QT_MT_LIBS)

diff --git a/src/Qtx/QtxSplash.cxx b/src/Qtx/QtxSplash.cxx
index 044d8fe88c9592a667618219601f618aef34d374..3fb5bbb0f0097d4ed32436e60a05efa3780a6bce 100644 (file)
--- a/src/Qtx/QtxSplash.cxx
+++ b/src/Qtx/QtxSplash.cxx
@@ -28,6 +28,8 @@
 #include <QMessageBox>
 #include <QDesktopWidget>
 
+#include <stdio.h>
+
 /*!
   \class ProgressEvent
   \internal

diff --git a/src/Qtx/QtxWorkstack.cxx b/src/Qtx/QtxWorkstack.cxx
index 5ad12139ce17a753ace46f9323d3f7c5736654b5..e7849756a3712db386ee470cc4c3eef36568c00c 100644 (file)
--- a/src/Qtx/QtxWorkstack.cxx
+++ b/src/Qtx/QtxWorkstack.cxx
@@ -38,6 +38,8 @@
 #include <QStackedWidget>
 #include <QAbstractButton>
 
+#include <stdio.h>
+
 /*!
   \class QtxWorkstackArea::WidgetEvent
   \internal

diff --git a/src/SUIT/SUIT_DataObject.cxx b/src/SUIT/SUIT_DataObject.cxx
index bb64cafa42846d37ff866b29a27176b984b42e16..ebd6c74b45d471156f7f20abe9a03dfc74aaaa58 100755 (executable)
--- a/src/SUIT/SUIT_DataObject.cxx
+++ b/src/SUIT/SUIT_DataObject.cxx
@@ -23,6 +23,8 @@
 #include "SUIT_DataObject.h"
 #include "SUIT_DataObjectKey.h"
 
+#include <stdio.h>
+
 SUIT_DataObject::Signal* SUIT_DataObject::mySignal = 0;
 
 /*!

diff --git a/src/SVTK/SVTK_Actor.cxx b/src/SVTK/SVTK_Actor.cxx
index 11bfa36c0e391fc722670fded5d1736b8e6fbbfd..400067055d55ffc3a56967f6b66c30285717474a 100644 (file)
--- a/src/SVTK/SVTK_Actor.cxx
+++ b/src/SVTK/SVTK_Actor.cxx
@@ -144,7 +144,7 @@ SVTK_Actor
       int aPartId = theMapIndex( i+1 );
       if(vtkFloatingPointType* aCoord = theMapActor->GetNodeCoord(aPartId)){
        aPoints->SetPoint(i,aCoord);
-       myUnstructuredGrid->InsertNextCell(VTK_VERTEX,1,&i);
+       myUnstructuredGrid->InsertNextCell(VTK_VERTEX,1,(vtkIdType*)&i);
       }
     }
     myUnstructuredGrid->SetPoints(aPoints);

diff --git a/src/VTKViewer/VTKViewer_GeometryFilter.cxx b/src/VTKViewer/VTKViewer_GeometryFilter.cxx
index 630b7870a1e836b28d9fa75356cc155a9e887bc6..cd83d7505c3d784b96b3908a04327ceedda537d4 100755 (executable)
--- a/src/VTKViewer/VTKViewer_GeometryFilter.cxx
+++ b/src/VTKViewer/VTKViewer_GeometryFilter.cxx
@@ -350,7 +350,7 @@ VTKViewer_GeometryFilter
               {
               for ( i=0; i < numFacePts; i++)
                 aNewPts[i] = pts[faceVerts[i]];
-              newCellId = output->InsertNextCell(aCellType,numFacePts,aNewPts);
+              newCellId = output->InsertNextCell(aCellType,numFacePts,(vtkIdType*)aNewPts);
              if(myStoreMapping)
                myVTK2ObjIds.push_back(cellId);
               outputCD->CopyData(cd,cellId,newCellId);
@@ -375,7 +375,7 @@ VTKViewer_GeometryFilter
               {
               for ( i=0; i < numFacePts; i++)
                 aNewPts[i] = pts[faceVerts[PixelConvert[i]]];
-              newCellId = output->InsertNextCell(aCellType,numFacePts,aNewPts);
+              newCellId = output->InsertNextCell(aCellType,numFacePts,(vtkIdType*)aNewPts);
              if(myStoreMapping)
                myVTK2ObjIds.push_back(cellId);
               outputCD->CopyData(cd,cellId,newCellId);
@@ -400,7 +400,7 @@ VTKViewer_GeometryFilter
               {
               for ( i=0; i < numFacePts; i++)
                 aNewPts[i] = pts[faceVerts[i]];
-              newCellId = output->InsertNextCell(aCellType,numFacePts,aNewPts);
+              newCellId = output->InsertNextCell(aCellType,numFacePts,(vtkIdType*)aNewPts);
              if(myStoreMapping)
                myVTK2ObjIds.push_back(cellId);
               outputCD->CopyData(cd,cellId,newCellId);
@@ -430,7 +430,7 @@ VTKViewer_GeometryFilter
               {
               for ( i=0; i < numFacePts; i++)
                 aNewPts[i] = pts[faceVerts[i]];
-              newCellId = output->InsertNextCell(aCellType,numFacePts,aNewPts);
+              newCellId = output->InsertNextCell(aCellType,numFacePts,(vtkIdType*)aNewPts);
              if(myStoreMapping)
                myVTK2ObjIds.push_back(cellId);
               outputCD->CopyData(cd,cellId,newCellId);
@@ -460,7 +460,7 @@ VTKViewer_GeometryFilter
               {
               for ( i=0; i < numFacePts; i++)
                 aNewPts[i] = pts[faceVerts[i]];
-              newCellId = output->InsertNextCell(aCellType,numFacePts,aNewPts);
+              newCellId = output->InsertNextCell(aCellType,numFacePts,(vtkIdType*)aNewPts);
              if(myStoreMapping)
                myVTK2ObjIds.push_back(cellId);
               outputCD->CopyData(cd,cellId,newCellId);
@@ -489,7 +489,7 @@ VTKViewer_GeometryFilter
              for (i=0; i < pts->GetNumberOfIds(); i+=2) {
                aNewPts[0] = pts->GetId(i);
                aNewPts[1] = pts->GetId(i+1);
-               newCellId = output->InsertNextCell(aCellType,numFacePts,aNewPts);
+               newCellId = output->InsertNextCell(aCellType,numFacePts,(vtkIdType*)aNewPts);
                if(myStoreMapping)
                  myVTK2ObjIds.push_back(cellId);
                outputCD->CopyData(cd,cellId,newCellId);
@@ -503,7 +503,7 @@ VTKViewer_GeometryFilter
                aNewPts[0] = pts->GetId(i);
                aNewPts[1] = pts->GetId(i+1);
                aNewPts[2] = pts->GetId(i+2);
-               newCellId = output->InsertNextCell(aCellType,numFacePts,aNewPts);
+               newCellId = output->InsertNextCell(aCellType,numFacePts,(vtkIdType*)aNewPts);
                if(myStoreMapping)
                  myVTK2ObjIds.push_back(cellId);
                outputCD->CopyData(cd,cellId,newCellId);
@@ -522,7 +522,7 @@ VTKViewer_GeometryFilter
                    aNewPts[0] = pts->GetId(i);
                    aNewPts[1] = pts->GetId(i+1);
                    aNewPts[2] = pts->GetId(i+2);
-                   newCellId = output->InsertNextCell(aCellType,numFacePts,aNewPts);
+                   newCellId = output->InsertNextCell(aCellType,numFacePts,(vtkIdType*)aNewPts);
                    if(myStoreMapping)
                      myVTK2ObjIds.push_back(cellId);
                    outputCD->CopyData(cd,cellId,newCellId);
@@ -544,7 +544,7 @@ VTKViewer_GeometryFilter
              aNewPts[2] = pts[1];
              aNewPts[1] = pts[2];
              
-             newCellId = output->InsertNextCell(aCellType,numFacePts,aNewPts);
+             newCellId = output->InsertNextCell(aCellType,numFacePts,(vtkIdType*)aNewPts);
              if(myStoreMapping)
                myVTK2ObjIds.push_back(cellId);
              
@@ -562,7 +562,7 @@ VTKViewer_GeometryFilter
              aNewPts[4] = pts[2];
              aNewPts[5] = pts[5];
              
-             newCellId = output->InsertNextCell(aCellType,numFacePts,aNewPts);
+             newCellId = output->InsertNextCell(aCellType,numFacePts,(vtkIdType*)aNewPts);
              if(myStoreMapping)
                myVTK2ObjIds.push_back(cellId);
              
@@ -582,7 +582,7 @@ VTKViewer_GeometryFilter
              aNewPts[6] = pts[3];
              aNewPts[7] = pts[7];
              
-             newCellId = output->InsertNextCell(aCellType,numFacePts,aNewPts);
+             newCellId = output->InsertNextCell(aCellType,numFacePts,(vtkIdType*)aNewPts);
              if(myStoreMapping)
                myVTK2ObjIds.push_back(cellId);
              
@@ -601,7 +601,7 @@ VTKViewer_GeometryFilter
              aNewPts[4] = pts[2];
              aNewPts[5] = pts[6];
              
-             newCellId = output->InsertNextCell(aCellType,numFacePts,aNewPts);
+             newCellId = output->InsertNextCell(aCellType,numFacePts,(vtkIdType*)aNewPts);
              if(myStoreMapping)
                myVTK2ObjIds.push_back(cellId);
              
@@ -615,7 +615,7 @@ VTKViewer_GeometryFilter
              aNewPts[4] = pts[1];
              aNewPts[5] = pts[4];
              
-             newCellId = output->InsertNextCell(aCellType,numFacePts,aNewPts);
+             newCellId = output->InsertNextCell(aCellType,numFacePts,(vtkIdType*)aNewPts);
              if(myStoreMapping)
                myVTK2ObjIds.push_back(cellId);
              
@@ -629,7 +629,7 @@ VTKViewer_GeometryFilter
              aNewPts[4] = pts[2];
              aNewPts[5] = pts[5];
              
-             newCellId = output->InsertNextCell(aCellType,numFacePts,aNewPts);
+             newCellId = output->InsertNextCell(aCellType,numFacePts,(vtkIdType*)aNewPts);
              if(myStoreMapping)
                myVTK2ObjIds.push_back(cellId);
              
@@ -643,7 +643,7 @@ VTKViewer_GeometryFilter
              aNewPts[4] = pts[0];
              aNewPts[5] = pts[6];
              
-             newCellId = output->InsertNextCell(aCellType,numFacePts,aNewPts);
+             newCellId = output->InsertNextCell(aCellType,numFacePts,(vtkIdType*)aNewPts);
              if(myStoreMapping)
                myVTK2ObjIds.push_back(cellId);
              
@@ -662,7 +662,7 @@ VTKViewer_GeometryFilter
              aNewPts[3] = pts[7];
              aNewPts[4] = pts[2];
              aNewPts[5] = pts[8];
-              newCellId = output->InsertNextCell(aCellType,numFacePts,aNewPts);
+              newCellId = output->InsertNextCell(aCellType,numFacePts,(vtkIdType*)aNewPts);
              if(myStoreMapping)
                myVTK2ObjIds.push_back(cellId);
               outputCD->CopyData(cd,cellId,newCellId);
@@ -675,7 +675,7 @@ VTKViewer_GeometryFilter
              aNewPts[3] = pts[10];
              aNewPts[4] = pts[5];
              aNewPts[5] = pts[11];
-              newCellId = output->InsertNextCell(aCellType,numFacePts,aNewPts);
+              newCellId = output->InsertNextCell(aCellType,numFacePts,(vtkIdType*)aNewPts);
              if(myStoreMapping)
                myVTK2ObjIds.push_back(cellId);
               outputCD->CopyData(cd,cellId,newCellId);
@@ -691,7 +691,7 @@ VTKViewer_GeometryFilter
              aNewPts[5] = pts[11];
              aNewPts[6] = pts[3];
              aNewPts[7] = pts[12];
-              newCellId = output->InsertNextCell(aCellType,numFacePts,aNewPts);
+              newCellId = output->InsertNextCell(aCellType,numFacePts,(vtkIdType*)aNewPts);
              if(myStoreMapping)
                myVTK2ObjIds.push_back(cellId);
               outputCD->CopyData(cd,cellId,newCellId);
@@ -706,7 +706,7 @@ VTKViewer_GeometryFilter
              aNewPts[5] = pts[14];
              aNewPts[6] = pts[2];
              aNewPts[7] = pts[7];
-              newCellId = output->InsertNextCell(aCellType,numFacePts,aNewPts);
+              newCellId = output->InsertNextCell(aCellType,numFacePts,(vtkIdType*)aNewPts);
              if(myStoreMapping)
                myVTK2ObjIds.push_back(cellId);
               outputCD->CopyData(cd,cellId,newCellId);
@@ -721,7 +721,7 @@ VTKViewer_GeometryFilter
              aNewPts[5] = pts[13];
               aNewPts[6] = pts[1];
               aNewPts[7] = pts[6];
-              newCellId = output->InsertNextCell(aCellType,numFacePts,aNewPts);
+              newCellId = output->InsertNextCell(aCellType,numFacePts,(vtkIdType*)aNewPts);
              if(myStoreMapping)
                myVTK2ObjIds.push_back(cellId);
               outputCD->CopyData(cd,cellId,newCellId);
@@ -741,7 +741,7 @@ VTKViewer_GeometryFilter
              aNewPts[6] = pts[4];
              aNewPts[7] = pts[16];
              
-             newCellId = output->InsertNextCell(aCellType,numFacePts,aNewPts);
+             newCellId = output->InsertNextCell(aCellType,numFacePts,(vtkIdType*)aNewPts);
              if(myStoreMapping)
                myVTK2ObjIds.push_back(cellId);
              
@@ -757,7 +757,7 @@ VTKViewer_GeometryFilter
              aNewPts[6] = pts[5];
              aNewPts[7] = pts[17];
              
-             newCellId = output->InsertNextCell(aCellType,numFacePts,aNewPts);
+             newCellId = output->InsertNextCell(aCellType,numFacePts,(vtkIdType*)aNewPts);
              if(myStoreMapping)
                myVTK2ObjIds.push_back(cellId);
              
@@ -773,7 +773,7 @@ VTKViewer_GeometryFilter
              aNewPts[6] = pts[6];
              aNewPts[7] = pts[18];
              
-             newCellId = output->InsertNextCell(aCellType,numFacePts,aNewPts);
+             newCellId = output->InsertNextCell(aCellType,numFacePts,(vtkIdType*)aNewPts);
              if(myStoreMapping)
                myVTK2ObjIds.push_back(cellId);
              
@@ -789,7 +789,7 @@ VTKViewer_GeometryFilter
              aNewPts[6] = pts[7];
              aNewPts[7] = pts[19];
              
-             newCellId = output->InsertNextCell(aCellType,numFacePts,aNewPts);
+             newCellId = output->InsertNextCell(aCellType,numFacePts,(vtkIdType*)aNewPts);
              if(myStoreMapping)
                myVTK2ObjIds.push_back(cellId);
              
@@ -805,7 +805,7 @@ VTKViewer_GeometryFilter
              aNewPts[6] = pts[3];
              aNewPts[7] = pts[11];
              
-             newCellId = output->InsertNextCell(aCellType,numFacePts,aNewPts);
+             newCellId = output->InsertNextCell(aCellType,numFacePts,(vtkIdType*)aNewPts);
              if(myStoreMapping)
                myVTK2ObjIds.push_back(cellId);
              
@@ -821,7 +821,7 @@ VTKViewer_GeometryFilter
              aNewPts[6] = pts[7];
              aNewPts[7] = pts[15];
              
-             newCellId = output->InsertNextCell(aCellType,numFacePts,aNewPts);
+             newCellId = output->InsertNextCell(aCellType,numFacePts,(vtkIdType*)aNewPts);
              if(myStoreMapping)
                myVTK2ObjIds.push_back(cellId);