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
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
KennethVanhoey
CGoGN
Commits
34bee0a6
Commit
34bee0a6
authored
Nov 06, 2014
by
Thery Sylvain
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
remove some warnings on mac
parent
e55a08ee
Changes
10
Hide whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
17 additions
and
14 deletions
+17
-14
Apps/Tuto/CMakeLists.txt
Apps/Tuto/CMakeLists.txt
+3
-1
CMakeLists.txt
CMakeLists.txt
+3
-5
SCHNApps/CMakeLists.txt
SCHNApps/CMakeLists.txt
+1
-1
SCHNApps/src/controlDock_mapTab.cpp
SCHNApps/src/controlDock_mapTab.cpp
+3
-1
SCHNApps/src/controlDock_pluginTab.cpp
SCHNApps/src/controlDock_pluginTab.cpp
+2
-1
SCHNApps/src/view.cpp
SCHNApps/src/view.cpp
+1
-1
include/Algo/Geometry/area.hpp
include/Algo/Geometry/area.hpp
+1
-1
include/Algo/MC/image.hpp
include/Algo/MC/image.hpp
+1
-1
include/Geometry/inclusion.h
include/Geometry/inclusion.h
+1
-1
include/Geometry/inclusion.hpp
include/Geometry/inclusion.hpp
+1
-1
No files found.
Apps/Tuto/CMakeLists.txt
View file @
34bee0a6
...
...
@@ -6,7 +6,9 @@ project(Tutos)
#SET (CMAKE_BUILD_TYPE Debug)
#SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DNOTOPOWARNING")
if
(
APPLE
)
set
(
CMAKE_CXX_FLAGS
"
${
CMAKE_CXX_FLAGS
}
-Wno-deprecated -Wno-overloaded-virtual"
)
endif
()
include_directories
(
${
CMAKE_CURRENT_BINARY_DIR
}
)
# ${CGoGN_ROOT_DIR}/include
...
...
CMakeLists.txt
View file @
34bee0a6
...
...
@@ -151,10 +151,6 @@ IF (WITH_GLEWMX)
ADD_DEFINITIONS
(
-DGLEW_MX
)
ENDIF
(
WITH_GLEWMX
)
if
(
APPLE
)
set
(
CMAKE_CXX_FLAGS
"
${
CMAKE_CXX_FLAGS
}
-Wno-deprecated"
)
endif
()
# qq definition specifiques pour mac
#IF(APPLE)
# SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DMAC_OSX")
...
...
@@ -178,7 +174,9 @@ ELSE()
endif
()
ENDIF
()
if
(
APPLE
)
set
(
CMAKE_CXX_FLAGS
"
${
CMAKE_CXX_FLAGS
}
-Wno-deprecated -Wno-overloaded-virtual"
)
endif
()
IF
(
WIN32
)
...
...
SCHNApps/CMakeLists.txt
View file @
34bee0a6
...
...
@@ -106,7 +106,7 @@ SET (EXT_LIBS
#ENDIF(APPLE)
if
(
APPLE
)
set
(
CMAKE_CXX_FLAGS
"
${
CMAKE_CXX_FLAGS
}
-Wno-deprecated"
)
set
(
CMAKE_CXX_FLAGS
"
${
CMAKE_CXX_FLAGS
}
-Wno-deprecated
-Wno-overloaded-virtual
"
)
set
(
CMAKE_SHARED_LINKER_FLAGS
"
${
CMAKE_SHARED_LINKER_FLAGS
}
-Wl,-undefined -Wl,dynamic_lookup"
)
endif
()
...
...
SCHNApps/src/controlDock_mapTab.cpp
View file @
34bee0a6
...
...
@@ -219,8 +219,10 @@ void ControlDock_MapTab::removeSelector()
void
ControlDock_MapTab
::
mapAdded
(
MapHandlerGen
*
m
)
{
b_updatingUI
=
true
;
QListWidgetItem
*
item
=
new
QListWidgetItem
(
m
->
getName
(),
list_maps
);
//
QListWidgetItem* item = new QListWidgetItem(m->getName(), list_maps);
// item->setCheckState(Qt::Unchecked);
new
QListWidgetItem
(
m
->
getName
(),
list_maps
);
b_updatingUI
=
false
;
}
...
...
SCHNApps/src/controlDock_pluginTab.cpp
View file @
34bee0a6
...
...
@@ -109,7 +109,8 @@ void ControlDock_PluginTab::pluginEnabled(Plugin *plugin)
if
(
!
av
.
empty
())
delete
av
[
0
];
QListWidgetItem
*
item
=
new
QListWidgetItem
(
pluginName
,
list_pluginsEnabled
);
// QListWidgetItem* item = new QListWidgetItem(pluginName, list_pluginsEnabled);
new
QListWidgetItem
(
pluginName
,
list_pluginsEnabled
);
// only interaction plugins are checkable (i.e. can be associated to a view)
// PluginInteraction* p = dynamic_cast<PluginInteraction*>(plugin);
...
...
SCHNApps/src/view.cpp
View file @
34bee0a6
...
...
@@ -28,7 +28,7 @@ View::View(const QString& name, SCHNApps* s, const QGLWidget* shareWidget) :
m_name
(
name
),
m_schnapps
(
s
),
m_currentCamera
(
NULL
),
m_lastSelectedMap
(
NULL
),
//
m_lastSelectedMap(NULL),
m_buttonArea
(
NULL
),
m_closeButton
(
NULL
),
m_VsplitButton
(
NULL
),
...
...
include/Algo/Geometry/area.hpp
View file @
34bee0a6
...
...
@@ -252,7 +252,7 @@ void computeOneRingAreaVertices(typename PFP::MAP& map, const VertexAttribute<ty
template
<
typename
PFP
>
void
computeBarycentricAreaVertices
(
typename
PFP
::
MAP
&
map
,
const
VertexAttribute
<
typename
PFP
::
VEC3
,
typename
PFP
::
MAP
>&
position
,
VertexAttribute
<
typename
PFP
::
REAL
,
typename
PFP
::
MAP
>&
vertex_area
)
{
CGoGN
::
Parallel
::
foreach_cell
<
VERTEX
>
(
map
,
[
&
]
(
Vertex
v
,
unsigned
int
thr
)
CGoGN
::
Parallel
::
foreach_cell
<
VERTEX
>
(
map
,
[
&
]
(
Vertex
v
,
unsigned
int
/*thr*/
)
{
vertex_area
[
v
]
=
vertexBarycentricArea
<
PFP
>
(
map
,
v
,
position
)
;
},
FORCE_CELL_MARKING
);
...
...
include/Algo/MC/image.hpp
View file @
34bee0a6
...
...
@@ -455,7 +455,7 @@ bool Image<DataType>::loadVTKBinaryMask(const char* filename)
template< typename DataType >
bool Image<DataType>::loadIPB(const char*
filename
)
bool Image<DataType>::loadIPB(const char*
/*filename*/
)
{
// chargement fichier
...
...
include/Geometry/inclusion.h
View file @
34bee0a6
...
...
@@ -76,7 +76,7 @@ Inclusion isSegmentInTriangle(const VEC3& P1, const VEC3& P2, const VEC3& Ta, co
* @return true if the faces of the tetra are in CCW order (default=true)
*/
template
<
typename
VEC3
>
bool
isPointInTetrahedron
(
VEC3
points
[
4
],
VEC3
&
point
,
bool
CCW
)
;
bool
isPointInTetrahedron
(
VEC3
points
[
4
],
VEC3
&
point
,
bool
/*CCW*/
)
;
/**
* test if an edge is inside or intersect a tetrahedron
...
...
include/Geometry/inclusion.hpp
View file @
34bee0a6
...
...
@@ -124,7 +124,7 @@ Inclusion isSegmentInTriangle2D(const VEC3& P1, const VEC3& P2, const VEC3& Ta,
}
template
<
typename
VEC3
>
bool
isPointInTetrahedron
(
VEC3
points
[
4
],
VEC3
&
point
,
bool
CCW
)
bool
isPointInTetrahedron
(
VEC3
points
[
4
],
VEC3
&
point
,
bool
/*CCW*/
)
{
typedef
typename
VEC3
::
DATA_TYPE
T
;
...
...
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