Kaydet (Commit) eb70bf3e authored tarafından Caolán McNamara's avatar Caolán McNamara Kaydeden (comit) Michael Stahl

file format documentation states these are signed

Change-Id: Iaca58dda19d24a767333ff642759414951a03e6d
(cherry picked from commit 8a60e787)
Reviewed-on: https://gerrit.libreoffice.org/17063Reviewed-by: 's avatarMichael Stahl <mstahl@redhat.com>
Tested-by: 's avatarMichael Stahl <mstahl@redhat.com>
üst e30f56e6
...@@ -44,12 +44,12 @@ private: ...@@ -44,12 +44,12 @@ private:
bool mbStatus; bool mbStatus;
Bitmap maBmp; Bitmap maBmp;
sal_uInt32 mnWidth, mnHeight; // Bildausmass in Pixeln sal_Int32 mnWidth, mnHeight; // Bildausmass in Pixeln
sal_uInt16 mnDstBitsPerPix; sal_uInt16 mnDstBitsPerPix;
sal_uInt16 mnDstColors; sal_uInt16 mnDstColors;
sal_uInt32 mnDepth, mnImageDatSize, mnType; sal_Int32 mnDepth, mnImageDatSize, mnType;
sal_uInt32 mnColorMapType, mnColorMapSize; sal_Int32 mnColorMapType, mnColorMapSize;
sal_uInt8 mnRepCount, mnRepVal; // RLE Decoding sal_uInt8 mnRepCount, mnRepVal; // RLE Decoding
bool mbPalette; bool mbPalette;
bool ImplReadBody(BitmapWriteAccess * pAcc); bool ImplReadBody(BitmapWriteAccess * pAcc);
...@@ -178,9 +178,9 @@ bool RASReader::ReadRAS(Graphic & rGraphic) ...@@ -178,9 +178,9 @@ bool RASReader::ReadRAS(Graphic & rGraphic)
bool RASReader::ImplReadHeader() bool RASReader::ImplReadHeader()
{ {
m_rRAS.ReadUInt32( mnWidth ).ReadUInt32( mnHeight ).ReadUInt32( mnDepth ).ReadUInt32( mnImageDatSize ). ReadUInt32( mnType ).ReadUInt32( mnColorMapType ).ReadUInt32( mnColorMapSize ); m_rRAS.ReadInt32(mnWidth).ReadInt32(mnHeight).ReadInt32(mnDepth).ReadInt32(mnImageDatSize).ReadInt32(mnType).ReadInt32(mnColorMapType).ReadInt32(mnColorMapSize);
if ( mnWidth == 0 || mnHeight == 0 ) if ( mnWidth <= 0 || mnHeight <= 0 || mnImageDatSize <= 0 )
mbStatus = false; mbStatus = false;
switch ( mnDepth ) switch ( mnDepth )
...@@ -216,7 +216,7 @@ bool RASReader::ImplReadHeader() ...@@ -216,7 +216,7 @@ bool RASReader::ImplReadHeader()
bool RASReader::ImplReadBody(BitmapWriteAccess * pAcc) bool RASReader::ImplReadBody(BitmapWriteAccess * pAcc)
{ {
sal_uLong x, y; sal_Int32 x, y;
sal_uInt8 nDat = 0; sal_uInt8 nDat = 0;
sal_uInt8 nRed, nGreen, nBlue; sal_uInt8 nRed, nGreen, nBlue;
switch ( mnDstBitsPerPix ) switch ( mnDstBitsPerPix )
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment