Commit 4919ac19 authored by cutealien's avatar cutealien

Fix copy-paste bug in DDS image loader (could have caused problems in images where height > width).

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@5108 dfc29bdd-3216-0410-991c-e03cc46cb475
parent 6a3127c8
...@@ -825,7 +825,7 @@ IImage* CImageLoaderDDS::loadImage(io::IReadFile* file) const ...@@ -825,7 +825,7 @@ IImage* CImageLoaderDDS::loadImage(io::IReadFile* file) const
dataSize += ((curWidth + 3) / 4) * ((curHeight + 3) / 4) * 8; dataSize += ((curWidth + 3) / 4) * ((curHeight + 3) / 4) * 8;
} }
while (curWidth != 1 || curWidth != 1); while (curWidth != 1 || curHeight != 1);
format = ECF_DXT1; format = ECF_DXT1;
break; break;
...@@ -848,7 +848,7 @@ IImage* CImageLoaderDDS::loadImage(io::IReadFile* file) const ...@@ -848,7 +848,7 @@ IImage* CImageLoaderDDS::loadImage(io::IReadFile* file) const
dataSize += ((curWidth + 3) / 4) * ((curHeight + 3) / 4) * 16; dataSize += ((curWidth + 3) / 4) * ((curHeight + 3) / 4) * 16;
} }
while (curWidth != 1 || curWidth != 1); while (curWidth != 1 || curHeight != 1);
format = ECF_DXT3; format = ECF_DXT3;
break; break;
...@@ -871,7 +871,7 @@ IImage* CImageLoaderDDS::loadImage(io::IReadFile* file) const ...@@ -871,7 +871,7 @@ IImage* CImageLoaderDDS::loadImage(io::IReadFile* file) const
dataSize += ((curWidth + 3) / 4) * ((curHeight + 3) / 4) * 16; dataSize += ((curWidth + 3) / 4) * ((curHeight + 3) / 4) * 16;
} }
while (curWidth != 1 || curWidth != 1); while (curWidth != 1 || curHeight != 1);
format = ECF_DXT5; format = ECF_DXT5;
break; break;
......
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