Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
CAMP
campvis-public
Commits
3739711e
Commit
3739711e
authored
Feb 10, 2016
by
Christian Schulte zu Berge
Browse files
Merge branch 'fix-warnings-issues' into 'master'
Fixed a couple of GCC warnings and CppCheck issues. See merge request
!4
parents
b4b9cfbf
47b7256b
Changes
5
Hide whitespace changes
Inline
Side-by-side
application/gui/adjusterwidgets/abstractadjusterwidget.h
View file @
3739711e
...
...
@@ -144,10 +144,11 @@ namespace campvis {
// ================================================================================================
template
<
typename
T
>
// cppcheck-suppress uninitMemberVar
AbstractAdjusterWidget
<
T
>::
AbstractAdjusterWidget
(
QWidget
*
parent
/*= 0*/
)
:
QWidget
(
parent
)
,
_slider
(
0
)
,
_spinBox
(
0
)
,
_slider
(
nullptr
)
,
_spinBox
(
nullptr
)
{
_spinBox
=
new
typename
AdjusterWidgetTraits
<
T
>::
SpinBoxType
;
_spinBox
->
setSizePolicy
(
QSizePolicy
::
Fixed
,
QSizePolicy
::
Preferred
);
...
...
core/bindings/campvis.i
View file @
3739711e
...
...
@@ -398,7 +398,7 @@ namespace campvis {
%
template
(
getRepresentationLocal
)
ImageData
::
getRepresentation
<
campvis
::
ImageRepresentationLocal
>
;
struct
WeaklyTypedPointer
{
/*
struct WeaklyTypedPointer {
enum BaseType {
UINT8, ///< unsigned 8 bit integer
INT8, ///< signed 8 bit integer
...
...
@@ -426,7 +426,7 @@ namespace campvis {
BaseType _baseType; ///< Base data type of the pointer
size_t _numChannels; ///< Number of channels, must be in [1, 4]!
void* _pointer; ///< Pointer to the data
}
;
};
*/
/* AbstractImageRepresentation */
%
nodefaultctor
AbstractImageRepresentation
;
...
...
@@ -452,9 +452,9 @@ namespace campvis {
public
:
virtual
~
ImageRepresentationLocal
()
;
static
ImageRepresentationLocal
*
create
(
const
ImageData
*
parent
,
WeaklyTypedPointer
wtp
)
;
//
static ImageRepresentationLocal* create(const ImageData* parent, WeaklyTypedPointer wtp);
virtual
const
WeaklyTypedPointer
getWeaklyTypedPointer
()
const
=
0
;
//
virtual const WeaklyTypedPointer getWeaklyTypedPointer() const = 0;
virtual
float
getElementNormalized
(
size_t
index
,
size_t
channel
)
const
=
0
;
virtual
float
getElementNormalized
(
const
cgt
::
svec3&
position
,
size_t
channel
)
const
=
0
;
...
...
@@ -464,7 +464,7 @@ namespace campvis {
virtual
void
setElementNormalized
(
const
cgt
::
svec3&
position
,
size_t
channel
,
float
value
)
=
0
;
protected
:
ImageRepresentationLocal
(
ImageData
*
parent
,
WeaklyTypedPointer
::
BaseType
baseType
)
;
//
ImageRepresentationLocal(ImageData* parent, WeaklyTypedPointer::BaseType baseType);
private
:
explicit
ImageRepresentationLocal
(
const
ImageRepresentationLocal&
rhs
)
;
...
...
core/tools/quadrenderer.cpp
View file @
3739711e
...
...
@@ -30,12 +30,9 @@ namespace campvis {
QuadRenderer
::
QuadRenderer
()
:
cgt
::
Singleton
<
QuadRenderer
>
()
,
_quad11
(
nullptr
)
,
_quad01
(
nullptr
)
{
_quad11
=
GeometryDataFactory
::
createQuad
(
cgt
::
vec3
(
-
1.
f
,
-
1.
f
,
0.
f
),
cgt
::
vec3
(
1.
f
),
cgt
::
vec3
(
0.
f
),
cgt
::
vec3
(
1.
f
));
_quad01
=
GeometryDataFactory
::
createQuad
(
cgt
::
vec3
(
0.
f
),
cgt
::
vec3
(
1.
f
),
cgt
::
vec3
(
0.
f
),
cgt
::
vec3
(
1.
f
));
}
,
_quad11
(
GeometryDataFactory
::
createQuad
(
cgt
::
vec3
(
-
1.
f
,
-
1.
f
,
0.
f
),
cgt
::
vec3
(
1.
f
),
cgt
::
vec3
(
0.
f
),
cgt
::
vec3
(
1.
f
)))
,
_quad01
(
GeometryDataFactory
::
createQuad
(
cgt
::
vec3
(
0.
f
),
cgt
::
vec3
(
1.
f
),
cgt
::
vec3
(
0.
f
),
cgt
::
vec3
(
1.
f
)))
{}
QuadRenderer
::~
QuadRenderer
()
{
}
...
...
modules/io/processors/mhdimagereader.cpp
View file @
3739711e
...
...
@@ -189,7 +189,7 @@ namespace campvis {
while
(
!
file
->
eof
())
{
std
::
string
line
=
StringUtils
::
trim
(
file
->
getLine
());
if
(
line
.
find
(
"ElementDataFile"
)
==
0
)
{
if
(
line
.
compare
(
"ElementDataFile"
)
==
0
)
{
offset
=
file
->
tell
();
}
file
->
close
();
...
...
scripting/CMakeLists.txt
View file @
3739711e
...
...
@@ -57,6 +57,8 @@ MACRO(DECLARE_LUA_MODULE InterfaceFile)
IF
(
WIN32
)
ADD_DEFINITIONS
(
"/wd4244 /wd4267"
)
ELSEIF
(
UNIX
)
ADD_DEFINITIONS
(
"-Wno-error=maybe-uninitialized"
)
ENDIF
()
SET_SOURCE_FILES_PROPERTIES
(
${
InterfaceFile
}
PROPERTIES CPLUSPLUS ON
)
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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