The expiration time for new job artifacts in CI/CD pipelines is now 30 days (GitLab default). Previously generated artifacts in already completed jobs will not be affected by the change. The latest artifacts for all jobs in the latest successful pipelines will be kept. More information: https://gitlab.lrz.de/help/user/admin_area/settings/continuous_integration.html#default-artifacts-expiration

Commit 3739711e authored by Christian Schulte zu Berge's avatar 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
......@@ -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);
......
......@@ -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);
......
......@@ -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() {
}
......
......@@ -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();
......
......@@ -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)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment