Skip to content
Snippets Groups Projects
Commit 40b2a88d authored by Rye Mutt's avatar Rye Mutt :bread:
Browse files

Update for KDU >= 8

parent 05cdd43d
No related branches found
No related tags found
No related merge requests found
......@@ -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.539108-windows64-539108.tar.bz2</string>
<string>file:///c:/bld/kdu-v8.0.6.202611808-windows64-202611808.tar.bz2</string>
</map>
<key>name</key>
<string>windows64</string>
</map>
</map>
<key>version</key>
<string>7.10.4.539108</string>
<string>v8.0.6.202611808</string>
</map>
<key>libepoxy</key>
<map>
......
......@@ -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
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment