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
8fa33961
Commit
8fa33961
authored
11 years ago
by
maksymsproductengine
Browse files
Options
Downloads
Patches
Plain Diff
MAINT-3827 FIXED crash in KDU texture decoding, likely out of memory: improving stability
parent
5c20e06d
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
indra/llimage/llimageworker.cpp
+2
-2
2 additions, 2 deletions
indra/llimage/llimageworker.cpp
indra/llimage/tests/llimageworker_test.cpp
+1
-0
1 addition, 0 deletions
indra/llimage/tests/llimageworker_test.cpp
with
3 additions
and
2 deletions
indra/llimage/llimageworker.cpp
+
2
−
2
View file @
8fa33961
...
@@ -143,7 +143,7 @@ bool LLImageDecodeThread::ImageRequest::processRequest()
...
@@ -143,7 +143,7 @@ bool LLImageDecodeThread::ImageRequest::processRequest()
mFormattedImage
->
getComponents
());
mFormattedImage
->
getComponents
());
}
}
//
if (mDecodedImageRaw->getData())
)
if
(
mDecodedImageRaw
->
getData
())
{
{
done
=
mFormattedImage
->
decode
(
mDecodedImageRaw
,
decode_time_slice
);
// 1ms
done
=
mFormattedImage
->
decode
(
mDecodedImageRaw
,
decode_time_slice
);
// 1ms
mDecodedRaw
=
done
;
mDecodedRaw
=
done
;
...
@@ -159,7 +159,7 @@ bool LLImageDecodeThread::ImageRequest::processRequest()
...
@@ -159,7 +159,7 @@ bool LLImageDecodeThread::ImageRequest::processRequest()
1
);
1
);
}
}
//
if (mDecodedImageAux->getData())
if
(
mDecodedImageAux
->
getData
())
{
{
done
=
mFormattedImage
->
decodeChannels
(
mDecodedImageAux
,
decode_time_slice
,
4
,
4
);
// 1ms
done
=
mFormattedImage
->
decodeChannels
(
mDecodedImageAux
,
decode_time_slice
,
4
,
4
);
// 1ms
mDecodedAux
=
done
;
mDecodedAux
=
done
;
...
...
This diff is collapsed.
Click to expand it.
indra/llimage/tests/llimageworker_test.cpp
+
1
−
0
View file @
8fa33961
...
@@ -58,6 +58,7 @@ void LLImageBase::sanityCheck() { }
...
@@ -58,6 +58,7 @@ void LLImageBase::sanityCheck() { }
void
LLImageBase
::
deleteData
()
{
}
void
LLImageBase
::
deleteData
()
{
}
U8
*
LLImageBase
::
allocateData
(
S32
size
)
{
return
NULL
;
}
U8
*
LLImageBase
::
allocateData
(
S32
size
)
{
return
NULL
;
}
U8
*
LLImageBase
::
reallocateData
(
S32
size
)
{
return
NULL
;
}
U8
*
LLImageBase
::
reallocateData
(
S32
size
)
{
return
NULL
;
}
U8
*
LLImageBase
::
getData
()
{
return
NULL
;
}
LLImageRaw
::
LLImageRaw
(
U16
width
,
U16
height
,
S8
components
)
{
}
LLImageRaw
::
LLImageRaw
(
U16
width
,
U16
height
,
S8
components
)
{
}
LLImageRaw
::~
LLImageRaw
()
{
}
LLImageRaw
::~
LLImageRaw
()
{
}
...
...
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