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

Various small fixes.

parent 8b329a8a
......@@ -145,8 +145,9 @@ namespace campvis {
_handles.clear();
_localDataContainer.clear();
_textures.clear();
GLJobProc.deregisterContext(this);
ShdrMgr.dispose(_paintShader);
delete _quad;
GLJobProc.deregisterContext(this);
}
QSize DataContainerInspectorCanvas::sizeHint() const {
......
......@@ -30,7 +30,7 @@ namespace campvis {
: AbstractPropertyWidget(property, true, dc, parent)
, _pcw(0)
{
tgtAssert(_dataContainer != 0, "Pointer to DataContainer must not be 0.");
//tgtAssert(_dataContainer != 0, "Pointer to DataContainer must not be 0.");
_pcw = new PropertyCollectionWidget(this);
_pcw->updatePropCollection(property, _dataContainer);
......
......@@ -80,8 +80,8 @@ TEST_F(DataContainerTest, miscellaneousTest) {
this->_dc0->removeData("data1");
EXPECT_EQ(nullptr, this->_dc0->getData("data1").getData());
EXPECT_EQ(false, this->_dc0->hasData("data1"));
EXPECT_EQ(true, this->_dc0->hasData("data2"));
EXPECT_FALSE(this->_dc0->hasData("data1"));
EXPECT_TRUE(this->_dc0->hasData("data2"));
}
/**
......
......@@ -128,7 +128,7 @@ public:
TEST_F(ConcurrentHistogram1DTest, concurrentAddSampleTest) {
tbb::parallel_for(tbb::blocked_range<size_t>(0, samples.size()), [&] (const tbb::blocked_range<size_t>& range) {
for (size_t i = range.begin(); i != range.end(); ++i) {
std::vector<int> vec = samples[i];
const std::vector<int>& vec = samples[i];
_cgh->addSample(&(samples[i].front()));
}
});
......@@ -155,7 +155,7 @@ public:
TEST_F(ConcurrentHistogram2DTest, concurrentAddSampleTest) {
tbb::parallel_for(tbb::blocked_range<size_t>(0, samples.size()), [&] (const tbb::blocked_range<size_t>& range) {
for (size_t i = range.begin(); i != range.end(); ++i) {
std::vector<int> vec = samples[i];
const std::vector<int>& vec = samples[i];
_cgh->addSample(&(samples[i].front()));
}
});
......
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