songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'fread-unused-philaris' 

Fixes that remove warnings in Surface_mesher and
mesh_simplification_plugin demos.

Approved by the release manager
This commit is contained in:
Panagiotis Cheilaris 2014-04-07 12:44:21 +02:00
parent 889621b4fd 0edd0e2943
commit 492998b4fa
2 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Surface_mesh_simplification/include/CGAL/Surface_mesh_simplification/Policies/Edge_collapse/Edge_profile_impl.h
View File

@ -196,7 +196,9 @@ void Edge_profile<ECM>::Extract_triangles_and_link( VertexIdxMap const& verte
if ( v2 != mV1 )
{
mLink.push_back(v2) ;
CGAL_assertion_code( bool lInserted = ) lCollected.insert(vertex_idx[v2]).second ;
CGAL_assertion_code( bool lInserted = )
lCollected.insert(vertex_idx[v2])
CGAL_assertion_code( .second ) ;
CGAL_assertion(lInserted);
}

20
Surface_mesher/demo/Surface_mesher/File_XT.h
View File

@ -102,7 +102,9 @@ int lire_longueur_trace(const char * nomfich, long * long_trace)
if ( (fin=fopen(nomfich,"rw"))!=NULL )
{
fseek(fin,4,0);
fread(long_trace,4,1,fin);
if (fread(long_trace,4,1,fin) != 1) {
flag = -1;
}
permuteLong((char *)long_trace);
fclose(fin);
}
@ -119,7 +121,9 @@ int lire_nb_trace(const char * nomfich, long * nb_trace)
if ( (fin=fopen(nomfich,"rw"))!=NULL )
{
fseek(fin,8,0);
fread(nb_trace,4,1,fin);
if (fread(nb_trace,4,1,fin) != 1) {
flag = -1;
}
permuteLong((char *)nb_trace);
fclose(fin);
}
@ -136,7 +140,9 @@ int lire_nb_plan(const char * nomfich, long * nb_plan)
if ( (fin=fopen(nomfich,"rw"))!=NULL )
{
fseek(fin,12,0);
fread(nb_plan,4,1,fin);
if (fread(nb_plan,4,1,fin) != 1) {
flag = -1;
}
permuteLong((char *)nb_plan);
fclose(fin);
}
@ -154,7 +160,9 @@ int lire_nb_octet(const char * nomfich, long * nb_octet)
if ( (fin=fopen(nomfich,"rw"))!=NULL )
{
fseek(fin,36,0);
fread(nb_octet,4,1,fin);
if (fread(nb_octet,4,1,fin) != 1) {
flag = -1;
}
permuteLong((char *)nb_octet);
fclose(fin);
}
@ -172,7 +180,9 @@ int lire_longueur_entete(const char * nomfich, long * long_entete)
if ( (fin=fopen(nomfich,"rw"))!=NULL )
{
fseek(fin,72,0);
fread(long_entete,4,1,fin);
if (fread(long_entete,4,1,fin) != 1) {
flag = -1;
}
permuteLong((char *)long_entete);
fclose(fin);
}