Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
Alchemy Viewer
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Package registry
Operate
Terraform modules
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Silent mode is enabled
All outbound communications are blocked.
Learn more
.
Show more breadcrumbs
Alchemy Viewer
Alchemy Viewer
Commits
ff3edd06
Commit
ff3edd06
authored
11 years ago
by
Merov Linden
Browse files
Options
Downloads
Patches
Plain Diff
ACME-1275 : WIP : Clean up unwanted code and comments in image filter
parent
88b65f32
No related branches found
Branches containing commit
No related tags found
Tags containing commit
Loading
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
indra/llimage/llimagefilter.cpp
+4
-13
4 additions, 13 deletions
indra/llimage/llimagefilter.cpp
with
4 additions
and
13 deletions
indra/llimage/llimagefilter.cpp
+
4
−
13
View file @
ff3edd06
...
...
@@ -77,7 +77,6 @@ LLImageFilter::~LLImageFilter()
*TODO
* Rename stencil to mask
* Test blend modes and name them correctly
* Suppress old "blend", "fade" and "lines" stencil definition. Change all xml accordingly.
* Improve perf: use LUT for alpha blending in uniform case
* Improve perf: make sure filter is not called more than necessary in viewer (seems to be called 3 times per change)
* Add gradient coloring as a filter
...
...
@@ -154,18 +153,6 @@ void LLImageFilter::executeFilter(LLPointer<LLImageRaw> raw_image)
// Set the stencil
setStencil
(
shape
,
mode
,
min
,
max
,
params
);
}
else
if
(
filter_name
==
"blend"
)
{
setStencil
(
STENCIL_BLEND_MODE_BLEND
,
STENCIL_SHAPE_VIGNETTE
,(
float
)(
mFilterData
[
i
][
1
].
asReal
()),(
float
)(
mFilterData
[
i
][
2
].
asReal
()),
1.0
);
}
else
if
(
filter_name
==
"fade"
)
{
setStencil
(
STENCIL_BLEND_MODE_FADE
,
STENCIL_SHAPE_VIGNETTE
,(
float
)(
mFilterData
[
i
][
1
].
asReal
()),(
float
)(
mFilterData
[
i
][
2
].
asReal
()),
1.0
);
}
else
if
(
filter_name
==
"lines"
)
{
setStencil
(
STENCIL_BLEND_MODE_BLEND
,
STENCIL_SHAPE_SCAN_LINES
,(
float
)(
mFilterData
[
i
][
1
].
asReal
()),(
float
)(
mFilterData
[
i
][
2
].
asReal
()),
1.0
);
}
else
if
(
filter_name
==
"sepia"
)
{
filterSepia
();
...
...
@@ -258,6 +245,10 @@ void LLImageFilter::executeFilter(LLPointer<LLImageRaw> raw_image)
kernel
.
mMatrix
[
1
][
1
]
=
8.0
;
convolve
(
kernel
,
false
,
true
);
}
else
{
llwarns
<<
"Filter unknown, cannot execute filter command : "
<<
filter_name
<<
llendl
;
}
}
}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment