From f3c9694bf249a34eae05f0304e6bfc120014ce8c Mon Sep 17 00:00:00 2001 From: Jan-Peter Nilsson Date: Sun, 3 Apr 2011 13:06:42 +0200 Subject: [PATCH] Whitespace changes only --- rend2d/servers/sdl_gl_driver.cpp | 14 +++++++------- sound/sources/ffmpeg_source.cpp | 2 +- sound/sources/sample_reader.cpp | 2 +- stream/tests/buffer_filter_test.cpp | 2 +- stream/tests/iostream_test.cpp | 2 +- stream/tests/memory_server_test.cpp | 2 +- vfs/clients/ogre_archive.cpp | 2 +- vfs/clients/ogre_archive.hpp | 2 +- vfs/vfs.hpp | 4 ++-- 9 files changed, 16 insertions(+), 16 deletions(-) diff --git a/rend2d/servers/sdl_gl_driver.cpp b/rend2d/servers/sdl_gl_driver.cpp index e2e829a7a..2bcb1d677 100644 --- a/rend2d/servers/sdl_gl_driver.cpp +++ b/rend2d/servers/sdl_gl_driver.cpp @@ -169,10 +169,10 @@ void SDLGLDriver::setVideoMode(int width, int height, int bpp, bool fullscreen) // Have OpenGL generate a texture object handle for us glGenTextures( 1, &texture ); - + // Bind the texture object glBindTexture( GL_TEXTURE_2D, texture ); - + // Set the texture's stretching properties glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR ); glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR ); @@ -213,24 +213,24 @@ void SDLGLDriver::updateNoSwap() // Bottom-left vertex (corner) glTexCoord2i( 0, 1 ); glVertex3f(0,diff,0); - + // Bottom-right vertex (corner) glTexCoord2i( 1, 1 ); glVertex3f( realDisp->w, diff, 0.f ); - + // Top-right vertex (corner) glTexCoord2i( 1, 0 ); glVertex3f( realDisp->w, screen->h, 0.f ); - + // Top-left vertex (corner) glTexCoord2i( 0, 0 ); glVertex3f( 0, screen->h, 0.f ); glEnd(); glMatrixMode(GL_PROJECTION); - glPopMatrix(); + glPopMatrix(); glMatrixMode(GL_MODELVIEW); - glPopMatrix(); + glPopMatrix(); } void SDLGLDriver::swap() diff --git a/sound/sources/ffmpeg_source.cpp b/sound/sources/ffmpeg_source.cpp index fdc2ff954..6349be691 100644 --- a/sound/sources/ffmpeg_source.cpp +++ b/sound/sources/ffmpeg_source.cpp @@ -34,7 +34,7 @@ FFMpegSource::FFMpegSource(const std::string &file) if(av_open_input_file(&FmtCtx, file.c_str(), NULL, 0, NULL) != 0) fail("Error loading audio file " + file); - + if(av_find_stream_info(FmtCtx) < 0) { msg = "Error in file stream " + file; diff --git a/sound/sources/sample_reader.cpp b/sound/sources/sample_reader.cpp index fb4be9d5a..c30de654a 100644 --- a/sound/sources/sample_reader.cpp +++ b/sound/sources/sample_reader.cpp @@ -72,7 +72,7 @@ size_t SampleReader::read(void *_data, size_t length) // Determine how much we read return data-(char*)_data; } - + // Determine the overshoot pullSize = length - num; assert(pullSize < frameSize && pullSize >= 0); diff --git a/stream/tests/buffer_filter_test.cpp b/stream/tests/buffer_filter_test.cpp index 971530d84..e53bda651 100644 --- a/stream/tests/buffer_filter_test.cpp +++ b/stream/tests/buffer_filter_test.cpp @@ -36,6 +36,6 @@ int main() cout << "Result: " << data << endl; cout << "Eof: " << inp->eof() << endl; cout << "Pos: " << inp->tell() << endl; - + return 0; } diff --git a/stream/tests/iostream_test.cpp b/stream/tests/iostream_test.cpp index 6acebbbd6..60648c6c5 100644 --- a/stream/tests/iostream_test.cpp +++ b/stream/tests/iostream_test.cpp @@ -76,7 +76,7 @@ void test2() struct Dummy2 : Stream { - Dummy2() + Dummy2() { isWritable = true; isReadable = false; diff --git a/stream/tests/memory_server_test.cpp b/stream/tests/memory_server_test.cpp index 24dea79a2..24d3bb17e 100644 --- a/stream/tests/memory_server_test.cpp +++ b/stream/tests/memory_server_test.cpp @@ -37,6 +37,6 @@ int main() cout << "Pos: " << inp->tell() << endl; cout << "Entire stream from pointer: " << (char*)inp->getPtr() << endl; - + return 0; } diff --git a/vfs/clients/ogre_archive.cpp b/vfs/clients/ogre_archive.cpp index ed6337053..2d3f7c520 100644 --- a/vfs/clients/ogre_archive.cpp +++ b/vfs/clients/ogre_archive.cpp @@ -71,7 +71,7 @@ Ogre::StringVectorPtr MangleArchive::find(const Ogre::String& pattern, return Ogre::StringVectorPtr(res); } -Ogre::FileInfoListPtr MangleArchive::findFileInfo(const Ogre::String& pattern, +Ogre::FileInfoListPtr MangleArchive::findFileInfo(const Ogre::String& pattern, bool recursive, bool dirs) { diff --git a/vfs/clients/ogre_archive.hpp b/vfs/clients/ogre_archive.hpp index 7cba6cfc8..7b371c6ef 100644 --- a/vfs/clients/ogre_archive.hpp +++ b/vfs/clients/ogre_archive.hpp @@ -50,7 +50,7 @@ class MangleArchive : public Ogre::Archive // Find functions will only work if vfs->hasFind is set. Ogre::StringVectorPtr find(const Ogre::String& pattern, bool recursive = true, bool dirs = false); - Ogre::FileInfoListPtr findFileInfo(const Ogre::String& pattern, + Ogre::FileInfoListPtr findFileInfo(const Ogre::String& pattern, bool recursive = true, bool dirs = false); }; diff --git a/vfs/vfs.hpp b/vfs/vfs.hpp index ce51be94b..258a6b0a0 100644 --- a/vfs/vfs.hpp +++ b/vfs/vfs.hpp @@ -13,7 +13,7 @@ struct FileInfo { /// Full name, including path std::string name; - + /// Base name, not including path std::string basename; @@ -22,7 +22,7 @@ struct FileInfo /// File size size_t size; - + /// Last modification date time_t time; };