Starting from 2021-07-01, all LRZ GitLab users will be required to explicitly accept the GitLab Terms of Service. Please see the detailed information at https://doku.lrz.de/display/PUBLIC/GitLab and make sure that your projects conform to the requirements.

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

Various further GCC fixes.

parent 5f1ee836
......@@ -313,7 +313,7 @@ namespace campvis {
PropertyCollectionLuaScriptGenerator* _pcLua = new PropertyCollectionLuaScriptGenerator();
std::string pipeScript = "pipeline = pipelines[\"" + _selectedPipeline->getName()+"\"]\n\n";
for (int i = 1; i < _selectedPipeline->getProcessors().size(); i++) {
for (size_t i = 0; i < _selectedPipeline->getProcessors().size(); i++) {
pipeScript += "proc = pipeline:getProcessor(" + StringUtils::toString(i) + ")\n";
AbstractProcessor* proc = _selectedPipeline->getProcessor(i);
......
%module base
%include std_string.i
%import "ext/cgt/bindings/cgt.i"
%import "core/bindings/campvis.i"
%include "core/bindings/campvis.i"
%{
#include "core/pipeline/autoevaluationpipeline.h"
#include "core/pipeline/visualizationprocessor.h"
......
%module devil
%include std_string.i
%import "core/bindings/campvis.i"
%include "core/bindings/campvis.i"
%{
#include "core/pipeline/visualizationprocessor.h"
......
%module cvio
%include std_string.i
%import "core/bindings/campvis.i"
%include "core/bindings/campvis.i"
%{
#include "core/pipeline/visualizationprocessor.h"
#include "core/pipeline/autoevaluationpipeline.h"
......
%module microscopysegmentation
%include std_string.i
%import "core/bindings/campvis.i"
%include "core/bindings/campvis.i"
%{
#include "core/pipeline/autoevaluationpipeline.h"
......
%module preprocessing
%include std_string.i
%import "core/bindings/campvis.i"
%include "core/bindings/campvis.i"
%{
#include "core/pipeline/autoevaluationpipeline.h"
#include "modules/preprocessing/processors/glimageresampler.h"
......
%module vis
%include std_string.i
%import "core/bindings/campvis.i"
%include "core/bindings/campvis.i"
%{
#include "core/pipeline/autoevaluationpipeline.h"
#include "modules/vis/processors/volumeexplorer.h"
......
......@@ -133,7 +133,7 @@ namespace campvis {
{
}
std::string Vec2PropertyLua::getLuaScript(const std::string& propNamePrefix, const std::string& luaProc) {
std::string getLuaScript(const std::string& propNamePrefix, const std::string& luaProc) {
cgt::vec2 value = static_cast<Vec2Property*>(_property)->getValue();
std::string ret = "";
ret += luaProc;
......@@ -151,7 +151,7 @@ namespace campvis {
: VecPropertyLua<3>(property, dataContainer)
{
}
std::string Vec3PropertyLua::getLuaScript(const std::string& propNamePrefix, const std::string& luaProc) {
std::string getLuaScript(const std::string& propNamePrefix, const std::string& luaProc) {
cgt::vec3 value = static_cast<Vec3Property*>(_property)->getValue();
std::string ret = "";
ret += luaProc;
......@@ -171,7 +171,7 @@ namespace campvis {
{
}
std::string Vec4PropertyLua::getLuaScript(const std::string& propNamePrefix, const std::string& luaProc) {
std::string getLuaScript(const std::string& propNamePrefix, const std::string& luaProc) {
cgt::vec4 value = static_cast<Vec4Property*>(_property)->getValue();
std::string ret = "";
ret += luaProc;
......
......@@ -131,7 +131,7 @@ namespace campvis {
{
}
std::string IVec2PropertyLua::getLuaScript(const std::string& propNamePrefix, const std::string& luaProc) {
std::string getLuaScript(const std::string& propNamePrefix, const std::string& luaProc) {
cgt::ivec2 value = static_cast<IVec2Property*>(_property)->getValue();
std::string ret = "";
ret += luaProc;
......@@ -150,7 +150,7 @@ namespace campvis {
{
}
std::string IVec3PropertyLua::getLuaScript(const std::string& propNamePrefix, const std::string& luaProc) {
std::string getLuaScript(const std::string& propNamePrefix, const std::string& luaProc) {
cgt::ivec3 value = static_cast<IVec3Property*>(_property)->getValue();
std::string ret = "";
ret += luaProc;
......@@ -170,7 +170,7 @@ namespace campvis {
{
}
std::string IVec4PropertyLua::getLuaScript(const std::string& propNamePrefix, const std::string& luaProc) {
std::string getLuaScript(const std::string& propNamePrefix, const std::string& luaProc) {
cgt::ivec4 value = static_cast<IVec4Property*>(_property)->getValue();
std::string ret = "";
ret += luaProc;
......
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