updated on Thu Jan 26 00:18:00 UTC 2012
[aur-mirror.git] / eman2 / namespace.patch
blobb6eede9d21ca376ff4ff45bc8168346f094e02a1
1 Index: src/EMAN2/src/eman2/libEM/marchingcubes.cpp
2 ===================================================================
3 --- src.orig/EMAN2/src/eman2/libEM/marchingcubes.cpp
4 +++ src/EMAN2/src/eman2/libEM/marchingcubes.cpp
5 @@ -50,6 +50,7 @@ using namespace EMAN;
6 #define min(a,b)(((a) < (b)) ? (a) : (b))
7 #define max(a,b)(((a) > (b)) ? (a) : (b))
9 +namespace EMAN {
10 //a2fVertexOffset lists the positions, relative to vertex0, of each of the 8 vertices of a cube
11 static const int a2fVertexOffset[8][3] =
13 @@ -1159,3 +1160,4 @@ BOOST_PYTHON_MODULE(gorgon)
18 Index: src/EMAN2/src/eman2/libEM/sparx/util_sparx.cpp
19 ===================================================================
20 --- src.orig/EMAN2/src/eman2/libEM/sparx/util_sparx.cpp
21 +++ src/EMAN2/src/eman2/libEM/sparx/util_sparx.cpp
22 @@ -59,6 +59,8 @@ using namespace EMAN;
23 using namespace std;
24 using std::complex;
26 +namespace EMAN {
28 vector<float> Util::infomask(EMData* Vol, EMData* mask, bool flip = false)
29 // flip true: find statistics under the mask (mask >0.5)
30 // flip false: find statistics ourside the mask (mask <0.5)
31 @@ -21578,3 +21580,5 @@ int Util::branch_factor_4(int* costlist,