Commit 77c2ec88 authored by hybrid's avatar hybrid

Avoid memory allocation and return value testing in one line

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@4197 dfc29bdd-3216-0410-991c-e03cc46cb475
parent 4bf7ef38
......@@ -355,9 +355,11 @@ bool CImageLoaderRGB::readOffsetTables(io::IReadFile* file, rgbStruct& rgb) cons
rgb.TableLen = rgb.Header.Ysize * rgb.Header.Zsize ; // calc size of tables
// return error if unable to allocate tables
if ( !(rgb.StartTable = new u32[rgb.TableLen]) )
rgb.StartTable = new u32[rgb.TableLen];
if (!rgb.StartTable)
return false;
if ( !(rgb.LengthTable = new u32[rgb.TableLen]) )
rgb.LengthTable = new u32[rgb.TableLen];
if (!rgb.LengthTable)
return false;
file->seek(512);
......
......@@ -102,22 +102,26 @@ namespace video
if (Header.Zsize >= 1)
{
if ( !(tmpR = new u8 [Header.Xsize * Header.BPC]) )
tmpR = new u8[Header.Xsize * Header.BPC];
if (!tmpR)
return false;
}
if (Header.Zsize >= 2)
{
if ( !(tmpG = new u8 [Header.Xsize * Header.BPC]) )
tmpG = new u8[Header.Xsize * Header.BPC];
if (!tmpG)
return false;
}
if (Header.Zsize >= 3)
{
if ( !(tmpB = new u8 [Header.Xsize * Header.BPC]) )
tmpB = new u8[Header.Xsize * Header.BPC];
if (!tmpB)
return false;
}
if (Header.Zsize >= 4)
{
if ( !(tmpA = new u8 [Header.Xsize * Header.BPC]) )
tmpA = new u8[Header.Xsize * Header.BPC];
if (!tmpA)
return false;
}
return true;
......
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