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
40b2a88d
Commit
40b2a88d
authored
4 years ago
by
Rye Mutt
Browse files
Options
Downloads
Patches
Plain Diff
Update for KDU >= 8
parent
05cdd43d
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
autobuild.xml
+5
-3
5 additions, 3 deletions
autobuild.xml
indra/llkdu/llimagej2ckdu.cpp
+7
-2
7 additions, 2 deletions
indra/llkdu/llimagej2ckdu.cpp
with
12 additions
and
5 deletions
autobuild.xml
+
5
−
3
View file @
40b2a88d
...
...
@@ -1390,16 +1390,18 @@
<key>
archive
</key>
<map>
<key>
hash
</key>
<string>
3dfeb869c781a766874f0aedc7d4fcef
</string>
<string>
d4a298dc57828a162f8d01aec0a31e1c
</string>
<key>
hash_algorithm
</key>
<string>
md5
</string>
<key>
url
</key>
<string>
http://s3-proxy.lindenlab.com/private-builds-secondlife-com/ct2/55188/512576/kdu-7.10.4.5391
08-windows64-
5391
08.tar.bz2
</string>
<string>
file:///c:/bld/kdu-v8.0.6.2026118
08-windows64-
2026118
08.tar.bz2
</string>
</map>
<key>
name
</key>
<string>
windows64
</string>
</map>
</map>
<key>
version
</key>
<string>
7.10.4.5391
08
</string>
<string>
v8.0.6.2026118
08
</string>
</map>
<key>
libepoxy
</key>
<map>
...
...
This diff is collapsed.
Click to expand it.
indra/llkdu/llimagej2ckdu.cpp
+
7
−
2
View file @
40b2a88d
...
...
@@ -164,6 +164,7 @@ class LLKDUDecodeState
bool
mUseYCC
;
kdu_dims
mDims
;
kdu_sample_allocator
mAllocator
;
kdu_push_pull_params
mPushPullParams
;
kdu_tile_comp
mComps
[
4
];
kdu_line_buf
mLines
[
4
];
kdu_pull_ifc
mEngines
[
4
];
...
...
@@ -1098,6 +1099,10 @@ void set_default_colour_weights(kdu_params *siz)
{
return
;
}
cod
=
siz
->
access_cluster
(
ENC_params
);
assert
(
cod
!=
NULL
);
float
weight
;
if
(
cod
->
get
(
Clev_weights
,
0
,
0
,
weight
)
||
cod
->
get
(
Cband_weights
,
0
,
0
,
weight
))
{
...
...
@@ -1300,11 +1305,11 @@ LLKDUDecodeState::LLKDUDecodeState(kdu_tile tile, kdu_byte *buf, S32 row_gap,
mLines
[
c
].
pre_create
(
&
mAllocator
,
mDims
.
size
.
x
,
mReversible
[
c
],
use_shorts
,
0
,
0
);
if
(
res
.
which
()
==
0
)
// No DWT levels used
{
mEngines
[
c
]
=
kdu_decoder
(
res
.
access_subband
(
LL_BAND
),
&
mAllocator
,
use_shorts
);
mEngines
[
c
]
=
kdu_decoder
(
res
.
access_subband
(
LL_BAND
),
&
mAllocator
,
mPushPullParams
,
use_shorts
);
}
else
{
mEngines
[
c
]
=
kdu_synthesis
(
res
,
&
mAllocator
,
use_shorts
);
mEngines
[
c
]
=
kdu_synthesis
(
res
,
&
mAllocator
,
mPushPullParams
,
use_shorts
);
}
}
mAllocator
.
finalize
(
*
codestreamp
);
// Actually creates buffering resources
...
...
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