Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
C
CGoGN
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
Operations
Operations
Incidents
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
David Cazier
CGoGN
Commits
7a730c5b
Commit
7a730c5b
authored
Jan 30, 2011
by
Sylvain Thery
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
pb log2 n'existe pas sous windows
uint ... pas sous windows
parent
01a2ded0
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
12 additions
and
12 deletions
+12
-12
src/Algo/ImplicitHierarchicalMesh/ihm.cpp
src/Algo/ImplicitHierarchicalMesh/ihm.cpp
+2
-2
src/Container/attrib_container.cpp
src/Container/attrib_container.cpp
+3
-3
src/Container/holeblockref.cpp
src/Container/holeblockref.cpp
+7
-7
No files found.
src/Algo/ImplicitHierarchicalMesh/ihm.cpp
View file @
7a730c5b
...
...
@@ -107,8 +107,8 @@ unsigned int ImplicitHierarchicalMap::faceLevel(Dart d)
++
nbSubd
;
// is treated here
it
=
phi1
(
it
)
;
}
while
(
m_edgeId
[
it
]
==
eId
)
;
fLevel
-=
(
unsigned
int
)(
log2
(
nbSubd
))
;
//fLevel -= (unsigned int)(log2(nbSubd)) ; PB WINDOWS log2 n'existe pas sous Visual 2010 !!
fLevel
-=
(
unsigned
int
)(
log
((
double
)
nbSubd
)
/
log
(
2.0
))
;
m_curLevel
=
cur
;
return
fLevel
;
...
...
src/Container/attrib_container.cpp
View file @
7a730c5b
...
...
@@ -106,7 +106,7 @@ void AttribContainer::merge(AttribContainer& cont)
newId.resize(m_tableAttribs.size() + cont.m_tableAttribs.size());
uint nbb = m_holesBlocks.size();
u
nsigned
int nbb = m_holesBlocks.size();
// parcours des attributs de cont pour les ajouter dans this et stocker la correspondance
for (MapNameId::iterator it = cont.m_attribNameMap.begin(); it != cont.m_attribNameMap.end(); ++it)
...
...
@@ -426,7 +426,7 @@ void AttribContainer::saveBin(CGoGNostream& fs, unsigned int id)
(
*
it
)
->
saveBin
(
fs
);
// les indices des blocks libres
fs
.
write
(
reinterpret_cast
<
const
char
*>
(
&
m_tableBlocksWithFree
[
0
]),
m_tableBlocksWithFree
.
size
()
*
sizeof
(
uint
));
fs
.
write
(
reinterpret_cast
<
const
char
*>
(
&
m_tableBlocksWithFree
[
0
]),
m_tableBlocksWithFree
.
size
()
*
sizeof
(
u
nsigned
int
));
}
unsigned
int
AttribContainer
::
loadBinId
(
CGoGNistream
&
fs
)
...
...
@@ -497,7 +497,7 @@ bool AttribContainer::loadBin(CGoGNistream& fs)
// les indices des blocks libres
m_tableBlocksWithFree
.
resize
(
szBWF
);
fs
.
read
(
reinterpret_cast
<
char
*>
(
&
(
m_tableBlocksWithFree
[
0
])),
szBWF
*
sizeof
(
uint
));
fs
.
read
(
reinterpret_cast
<
char
*>
(
&
(
m_tableBlocksWithFree
[
0
])),
szBWF
*
sizeof
(
u
nsigned
int
));
return
true
;
}
...
...
src/Container/holeblockref.cpp
View file @
7a730c5b
...
...
@@ -146,30 +146,30 @@ void HoleBlockRef::saveBin(CGoGNostream& fs)
// std::cout << "save bf "<< m_nb<< " / "<< m_nbref<< " / "<< m_nbfree << std::endl;
// on sauve les trois nombres;
uint
numbers
[
3
];
u
nsigned
int
numbers
[
3
];
numbers
[
0
]
=
m_nb
;
numbers
[
1
]
=
m_nbref
;
numbers
[
2
]
=
m_nbfree
;
fs
.
write
(
reinterpret_cast
<
const
char
*>
(
numbers
),
3
*
sizeof
(
uint
)
);
fs
.
write
(
reinterpret_cast
<
const
char
*>
(
numbers
),
3
*
sizeof
(
u
nsigned
int
)
);
// sauve les ref count
fs
.
write
(
reinterpret_cast
<
const
char
*>
(
m_refCount
),
_BLOCKSIZE_
*
sizeof
(
uint
));
fs
.
write
(
reinterpret_cast
<
const
char
*>
(
m_refCount
),
_BLOCKSIZE_
*
sizeof
(
u
nsigned
int
));
// sauve les free lines
fs
.
write
(
reinterpret_cast
<
const
char
*>
(
m_tableFree
),
m_nbfree
*
sizeof
(
uint
));
fs
.
write
(
reinterpret_cast
<
const
char
*>
(
m_tableFree
),
m_nbfree
*
sizeof
(
u
nsigned
int
));
}
bool
HoleBlockRef
::
loadBin
(
CGoGNistream
&
fs
)
{
unsigned
int
numbers
[
3
];
fs
.
read
(
reinterpret_cast
<
char
*>
(
numbers
),
3
*
sizeof
(
uint
));
fs
.
read
(
reinterpret_cast
<
char
*>
(
numbers
),
3
*
sizeof
(
u
nsigned
int
));
m_nb
=
numbers
[
0
];
m_nbref
=
numbers
[
1
];
m_nbfree
=
numbers
[
2
];
fs
.
read
(
reinterpret_cast
<
char
*>
(
m_refCount
),
_BLOCKSIZE_
*
sizeof
(
uint
));
fs
.
read
(
reinterpret_cast
<
char
*>
(
m_tableFree
),
m_nbfree
*
sizeof
(
uint
));
fs
.
read
(
reinterpret_cast
<
char
*>
(
m_refCount
),
_BLOCKSIZE_
*
sizeof
(
u
nsigned
int
));
fs
.
read
(
reinterpret_cast
<
char
*>
(
m_tableFree
),
m_nbfree
*
sizeof
(
u
nsigned
int
));
return
true
;
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment