ALL: Remove trailing whitespaces
This tries to make our code a bit more compliant with our code formatting conventions. For future use, this is the command I used: git ls-files "*.cpp" "*.h" | xargs sed -i -e 's/[ \t]*$//'
This commit is contained in:
parent
3853e76202
commit
88913c0139
314 changed files with 1761 additions and 1761 deletions
|
@ -81,7 +81,7 @@ bool WinFont::loadFromFON(const Common::String &fileName, const WinFontDirEntry
|
|||
return true;
|
||||
|
||||
// Then try loading via the PE code
|
||||
return loadFromPE(fileName, dirEntry);
|
||||
return loadFromPE(fileName, dirEntry);
|
||||
}
|
||||
|
||||
bool WinFont::loadFromNE(const Common::String &fileName, const WinFontDirEntry &dirEntry) {
|
||||
|
@ -98,7 +98,7 @@ bool WinFont::loadFromNE(const Common::String &fileName, const WinFontDirEntry &
|
|||
}
|
||||
|
||||
uint32 fontId = getFontIndex(*fontDirectory, dirEntry);
|
||||
|
||||
|
||||
delete fontDirectory;
|
||||
|
||||
// Couldn't match the face name
|
||||
|
@ -133,7 +133,7 @@ bool WinFont::loadFromPE(const Common::String &fileName, const WinFontDirEntry &
|
|||
}
|
||||
|
||||
uint32 fontId = getFontIndex(*fontDirectory, dirEntry);
|
||||
|
||||
|
||||
delete fontDirectory;
|
||||
|
||||
// Couldn't match the face name
|
||||
|
|
|
@ -88,7 +88,7 @@ private:
|
|||
uint16 charWidth;
|
||||
uint32 offset;
|
||||
byte *bitmap;
|
||||
} *_glyphs;
|
||||
} *_glyphs;
|
||||
};
|
||||
|
||||
} // End of namespace Graphics
|
||||
|
|
|
@ -72,7 +72,7 @@ private:
|
|||
// Result image for this component
|
||||
Surface surface;
|
||||
};
|
||||
|
||||
|
||||
Component *_components;
|
||||
|
||||
// Scan components
|
||||
|
|
|
@ -100,7 +100,7 @@ enum PNGFilters {
|
|||
kFilterPaeth = 4
|
||||
};
|
||||
|
||||
PNG::PNG() : _compressedBuffer(0), _compressedBufferSize(0),
|
||||
PNG::PNG() : _compressedBuffer(0), _compressedBufferSize(0),
|
||||
_unfilteredSurface(0), _transparentColorSpecified(false) {
|
||||
}
|
||||
|
||||
|
@ -282,7 +282,7 @@ bool PNG::read(Common::SeekableReadStream *str) {
|
|||
// Unpack the compressed buffer
|
||||
Common::MemoryReadStream *compData = new Common::MemoryReadStream(_compressedBuffer, _compressedBufferSize, DisposeAfterUse::YES);
|
||||
_imageData = Common::wrapCompressedReadStream(compData);
|
||||
|
||||
|
||||
// Construct the final image
|
||||
constructImage();
|
||||
|
||||
|
@ -306,7 +306,7 @@ byte PNG::paethPredictor(int16 a, int16 b, int16 c) {
|
|||
int16 pa = ABS<int16>(b - c);
|
||||
int16 pb = ABS<int16>(a - c);
|
||||
int16 pc = ABS<int16>(a + b - c - c);
|
||||
|
||||
|
||||
if (pa <= MIN<int16>(pb, pc))
|
||||
return (byte)a;
|
||||
else if (pb <= pc)
|
||||
|
|
|
@ -161,7 +161,7 @@ void FontSJISBase::drawChar(void *dst, uint16 ch, int pitch, int bpp, uint32 c1,
|
|||
outlineExtraWidth = 0;
|
||||
outlineXOffset = 1;
|
||||
}
|
||||
|
||||
|
||||
if (maxH != -1 && maxH < height) {
|
||||
height = maxH;
|
||||
outlineExtraHeight = 0;
|
||||
|
@ -191,7 +191,7 @@ void FontSJISBase::drawChar(void *dst, uint16 ch, int pitch, int bpp, uint32 c1,
|
|||
if (_drawMode == kOutlineMode) {
|
||||
blitCharacter<uint8>(outline, width + outlineExtraWidth, height + outlineExtraHeight, (uint8 *)dst, pitch, c2);
|
||||
blitCharacter<uint8>(glyphSource, width - outlineXOffset, height - outlineYOffset, (uint8 *)dst + pitch + 1, pitch, c1);
|
||||
} else {
|
||||
} else {
|
||||
if (_drawMode != kDefaultMode) {
|
||||
blitCharacter<uint8>(glyphSource, width - outlineXOffset, height, ((uint8*)dst) + 1, pitch, c2);
|
||||
blitCharacter<uint8>(glyphSource, width, height - outlineYOffset, ((uint8*)dst) + pitch, pitch, c2);
|
||||
|
|
|
@ -141,7 +141,7 @@ public:
|
|||
void toggleFlippedMode(bool enable) { _flippedMode = enable; }
|
||||
|
||||
uint getFontHeight() const { return (_drawMode == kOutlineMode) ? 18 : (_drawMode == kDefaultMode ? 16 : 17); }
|
||||
|
||||
|
||||
uint getMaxFontWidth() const { return (_drawMode == kOutlineMode) ? 18 : (_drawMode == kDefaultMode ? 16 : 17); }
|
||||
|
||||
uint getCharWidth(uint16 ch) const;
|
||||
|
|
|
@ -127,7 +127,7 @@ void Surface::vLine(int x, int y, int y2, uint32 color) {
|
|||
*ptr = (uint16)color;
|
||||
ptr += pitch / 2;
|
||||
}
|
||||
|
||||
|
||||
} else if (format.bytesPerPixel == 4) {
|
||||
uint32 *ptr = (uint32 *)getBasePtr(x, y);
|
||||
while (y++ <= y2) {
|
||||
|
|
|
@ -189,7 +189,7 @@ struct Surface {
|
|||
|
||||
/**
|
||||
* A deleter for Surface objects which can be used with SharedPtr.
|
||||
*
|
||||
*
|
||||
* This deleter assures Surface::free is called on deletion.
|
||||
*/
|
||||
struct SharedPtrSurfaceDeleter {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue