Formatting fixes

This commit is contained in:
Pavel Krajcevski 2013-08-20 15:12:18 -04:00
parent b072d10b6c
commit 31d2b5bcea

View file

@ -117,15 +117,14 @@ unsigned int ImageLoader::GetChannelForPixel(uint32 x, uint32 y, uint32 ch) {
for(uint32 precLeft = 8; precLeft > 0; precLeft -= min(prec, sad(prec, precLeft))) { for(uint32 precLeft = 8; precLeft > 0; precLeft -= min(prec, sad(prec, precLeft))) {
if(prec > precLeft) { if(prec > precLeft) {
const int toShift = prec - precLeft; const int toShift = prec - precLeft;
ret = ret << precLeft; ret = ret << precLeft;
ret |= val >> toShift; ret |= val >> toShift;
} }
else { else {
ret = ret << prec; ret = ret << prec;
ret |= val; ret |= val;
} }
} }
return ret; return ret;
@ -163,7 +162,8 @@ bool ImageLoader::LoadImage() {
#ifndef NDEBUG #ifndef NDEBUG
if(aw != m_Width || ah != m_Height) if(aw != m_Width || ah != m_Height)
fprintf(stderr, "Warning: Image dimension not multiple of four. Space will be filled with black.\n"); fprintf(stderr, "Warning: Image dimension not multiple of four. "
"Space will be filled with black.\n");
#endif #endif
int byteIdx = 0; int byteIdx = 0;