aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--graphics/primitives.cpp2
-rw-r--r--gui/themebrowser.cpp8
-rw-r--r--sound/flac.cpp2
3 files changed, 6 insertions, 6 deletions
diff --git a/graphics/primitives.cpp b/graphics/primitives.cpp
index 919ff05c15..b98b2cefa5 100644
--- a/graphics/primitives.cpp
+++ b/graphics/primitives.cpp
@@ -85,7 +85,7 @@ void drawThickLine(int x0, int y0, int x1, int y1, int thickness, int color, voi
float d = (float)sqrt(dx * dx + dy * dy);
if (!d)
- return;
+ return;
int thickX = (int)((float)thickness * dy / d / 2);
int thickY = (int)((float)thickness * dx / d / 2);
diff --git a/gui/themebrowser.cpp b/gui/themebrowser.cpp
index cc2a96d733..98e6df8565 100644
--- a/gui/themebrowser.cpp
+++ b/gui/themebrowser.cpp
@@ -108,15 +108,15 @@ void ThemeBrowser::updateListing() {
#endif
#ifdef MACOSX
- CFURLRef resourceUrl = CFBundleCopyResourcesDirectoryURL(CFBundleGetMainBundle());
- if (resourceUrl) {
+ CFURLRef resourceUrl = CFBundleCopyResourcesDirectoryURL(CFBundleGetMainBundle());
+ if (resourceUrl) {
char buf[256];
if (CFURLGetFileSystemRepresentation(resourceUrl, true, (UInt8 *)buf, 256)) {
Common::String resourcePath = buf;
addDir(_themes, resourcePath, 0);
}
- CFRelease(resourceUrl);
- }
+ CFRelease(resourceUrl);
+ }
#endif
if (ConfMan.hasKey("extrapath"))
diff --git a/sound/flac.cpp b/sound/flac.cpp
index 6080509a0f..d706436941 100644
--- a/sound/flac.cpp
+++ b/sound/flac.cpp
@@ -573,7 +573,7 @@ void FlacInputStream::convertBuffersGeneric(SampleType* bufDestination, const FL
}
inline ::FLAC__StreamDecoderWriteStatus FlacInputStream::callbackWrite(const ::FLAC__Frame *frame, const FLAC__int32 * const buffer[]) {
- assert(frame->header.channels == _streaminfo.channels);
+ assert(frame->header.channels == _streaminfo.channels);
assert(frame->header.sample_rate == _streaminfo.sample_rate);
assert(frame->header.bits_per_sample == _streaminfo.bits_per_sample);
assert(frame->header.number_type == FLAC__FRAME_NUMBER_TYPE_SAMPLE_NUMBER || _streaminfo.min_blocksize == _streaminfo.max_blocksize);