2.12.2021, 9:00 - 11:00: Due to updates GitLab may be unavailable for some minutes between 09:00 and 11:00.

Commit 47b7256b authored by Christian Schulte zu Berge's avatar Christian Schulte zu Berge
Browse files

more intrusive fix - why is there no -Wnomaybe-uninitialized?!? *narf*

parent 36e230fc
...@@ -144,6 +144,7 @@ namespace campvis { ...@@ -144,6 +144,7 @@ namespace campvis {
// ================================================================================================ // ================================================================================================
template<typename T> template<typename T>
// cppcheck-suppress uninitMemberVar
AbstractAdjusterWidget<T>::AbstractAdjusterWidget(QWidget* parent /*= 0*/) AbstractAdjusterWidget<T>::AbstractAdjusterWidget(QWidget* parent /*= 0*/)
: QWidget(parent) : QWidget(parent)
, _slider(nullptr) , _slider(nullptr)
......
...@@ -398,7 +398,7 @@ namespace campvis { ...@@ -398,7 +398,7 @@ namespace campvis {
%template(getRepresentationLocal) ImageData::getRepresentation<campvis::ImageRepresentationLocal>; %template(getRepresentationLocal) ImageData::getRepresentation<campvis::ImageRepresentationLocal>;
struct WeaklyTypedPointer { /*struct WeaklyTypedPointer {
enum BaseType { enum BaseType {
UINT8, ///< unsigned 8 bit integer UINT8, ///< unsigned 8 bit integer
INT8, ///< signed 8 bit integer INT8, ///< signed 8 bit integer
...@@ -426,7 +426,7 @@ namespace campvis { ...@@ -426,7 +426,7 @@ namespace campvis {
BaseType _baseType; ///< Base data type of the pointer BaseType _baseType; ///< Base data type of the pointer
size_t _numChannels; ///< Number of channels, must be in [1, 4]! size_t _numChannels; ///< Number of channels, must be in [1, 4]!
void* _pointer; ///< Pointer to the data void* _pointer; ///< Pointer to the data
}; };*/
/* AbstractImageRepresentation */ /* AbstractImageRepresentation */
%nodefaultctor AbstractImageRepresentation; %nodefaultctor AbstractImageRepresentation;
...@@ -452,9 +452,9 @@ namespace campvis { ...@@ -452,9 +452,9 @@ namespace campvis {
public: public:
virtual ~ImageRepresentationLocal(); 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(size_t index, size_t channel) const = 0;
virtual float getElementNormalized(const cgt::svec3& position, size_t channel) const = 0; virtual float getElementNormalized(const cgt::svec3& position, size_t channel) const = 0;
...@@ -464,7 +464,7 @@ namespace campvis { ...@@ -464,7 +464,7 @@ namespace campvis {
virtual void setElementNormalized(const cgt::svec3& position, size_t channel, float value) = 0; virtual void setElementNormalized(const cgt::svec3& position, size_t channel, float value) = 0;
protected: protected:
ImageRepresentationLocal(ImageData* parent, WeaklyTypedPointer::BaseType baseType); //ImageRepresentationLocal(ImageData* parent, WeaklyTypedPointer::BaseType baseType);
private: private:
explicit ImageRepresentationLocal(const ImageRepresentationLocal& rhs); explicit ImageRepresentationLocal(const ImageRepresentationLocal& rhs);
......
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