summaryrefslogtreecommitdiff
path: root/indra/llimage
diff options
context:
space:
mode:
authorNat Goodspeed <nat@lindenlab.com>2017-06-20 16:11:33 -0400
committerNat Goodspeed <nat@lindenlab.com>2017-06-20 16:11:33 -0400
commita3066b7375a13b61861b554519673dfc24322c22 (patch)
tree9b3d61c932ff8a88e5a2384f138e7ed9b83248ac /indra/llimage
parentf1e52656e9e328d66aa5050bc9e59948a0217283 (diff)
parent124d8c8dce3a5da8aa73f12f8733c65f57479a24 (diff)
Automated merge with ssh://bitbucket.org/lindenlab/viewer-release
Diffstat (limited to 'indra/llimage')
-rw-r--r--indra/llimage/llimage.cpp3
-rw-r--r--indra/llimage/llimagetga.cpp2
2 files changed, 3 insertions, 2 deletions
diff --git a/indra/llimage/llimage.cpp b/indra/llimage/llimage.cpp
index a07ea14621..fe49e8e011 100644
--- a/indra/llimage/llimage.cpp
+++ b/indra/llimage/llimage.cpp
@@ -1227,9 +1227,10 @@ void LLImageRaw::fill( const LLColor4U& color )
if( 4 == getComponents() )
{
U32* data = (U32*) getData();
+ U32 rgbaColor = color.asRGBA();
for( S32 i = 0; i < pixels; i++ )
{
- data[i] = color.mAll;
+ data[ i ] = rgbaColor;
}
}
else
diff --git a/indra/llimage/llimagetga.cpp b/indra/llimage/llimagetga.cpp
index 5ad7658ec1..7c75aa1e2a 100644
--- a/indra/llimage/llimagetga.cpp
+++ b/indra/llimage/llimagetga.cpp
@@ -811,7 +811,7 @@ bool LLImageTGA::decodeTruecolorRle32( LLImageRaw* raw_image, bool &alpha_opaque
}
src += 4;
- register U32 value = rgba;
+ U32 value = rgba;
do
{
*dst_pixels = value;