Merge changes from internal branch. Whitespace changes only.

This commit is contained in:
castano 2008-12-29 11:34:39 +00:00
parent dc0b78ad14
commit 1f4d313d0f
2 changed files with 2 additions and 2 deletions

View File

@ -638,7 +638,7 @@ void DDSHeader::setFourCC(uint8 c0, uint8 c1, uint8 c2, uint8 c3)
// set fourcc pixel format. // set fourcc pixel format.
this->pf.flags = DDPF_FOURCC; this->pf.flags = DDPF_FOURCC;
this->pf.fourcc = MAKEFOURCC(c0, c1, c2, c3); this->pf.fourcc = MAKEFOURCC(c0, c1, c2, c3);
this->pf.bitcount = 0; this->pf.bitcount = 0;
this->pf.rmask = 0; this->pf.rmask = 0;
this->pf.gmask = 0; this->pf.gmask = 0;

View File

@ -247,7 +247,7 @@ inline uint FloatImage::indexMirror(int x, int y) const
} }
if (m_height == 1) y = 0; if (m_height == 1) y = 0;
y = abs(y); y = abs(y);
while (y >= m_height) { while (y >= m_height) {
y = abs(m_height + m_height - y - 2); y = abs(m_height + m_height - y - 2);