Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Open sidebar
CAMP
campvis-public
Commits
382b2a24
Commit
382b2a24
authored
Apr 09, 2015
by
Christian Schulte zu Berge
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
pre-merge fixes: Cppcheck issues, visual regression tests.
parent
66a59192
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
1 addition
and
4 deletions
+1
-4
core/pipeline/abstractpipeline.cpp
core/pipeline/abstractpipeline.cpp
+1
-2
modules/advancedusvis/processors/advancedusfusion.cpp
modules/advancedusvis/processors/advancedusfusion.cpp
+0
-1
modules/cudaconfidencemaps/processors/cudaconfidencemapssolver.cpp
...udaconfidencemaps/processors/cudaconfidencemapssolver.cpp
+0
-1
test/visregtests/reference/1/advancedusvis.png
test/visregtests/reference/1/advancedusvis.png
+0
-0
No files found.
core/pipeline/abstractpipeline.cpp
View file @
382b2a24
...
...
@@ -278,8 +278,7 @@ namespace campvis {
void
AbstractPipeline
::
forceExecuteProcessor
(
AbstractProcessor
*
processor
)
{
bool
enabledState
=
processor
->
getEnabled
();
int
invalidationLevel
=
processor
->
getInvalidationLevel
();
processor
->
setEnabled
(
true
);
processor
->
invalidate
(
AbstractProcessor
::
INVALID_RESULT
);
executeProcessor
(
processor
);
...
...
modules/advancedusvis/processors/advancedusfusion.cpp
View file @
382b2a24
...
...
@@ -156,7 +156,6 @@ namespace campvis {
_shader
->
deactivate
();
ImageData
*
id
=
new
ImageData
(
img
->
getParent
()
->
getDimensionality
(),
size
,
3
);
ImageRepresentationGL
::
create
(
id
,
resultTexture
);
const
ImageMappingInformation
&
imi
=
img
->
getParent
()
->
getMappingInformation
();
id
->
setMappingInformation
(
img
->
getParent
()
->
getMappingInformation
());
cgt
::
TextureUnit
::
setZeroUnit
();
...
...
modules/cudaconfidencemaps/processors/cudaconfidencemapssolver.cpp
View file @
382b2a24
...
...
@@ -100,7 +100,6 @@ namespace campvis {
_solver
.
setAlphaBetaFilterParameters
(
p_filterAlpha
.
getValue
(),
p_filterBeta
.
getValue
());
cgt
::
ivec3
size
=
img
->
getSize
();
size_t
elementCount
=
cgt
::
hmul
(
size
);
auto
image
=
(
unsigned
char
*
)
img
->
getWeaklyTypedPointer
().
_pointer
;
// Copy the image on the GPU and generate the equation system
...
...
test/visregtests/reference/1/advancedusvis.png
View replaced file @
66a59192
View file @
382b2a24
951 KB
|
W:
|
H:
933 KB
|
W:
|
H:
2-up
Swipe
Onion skin
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a 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