aboutsummaryrefslogtreecommitdiff
path: root/engines/sword25/gfx/opengl
diff options
context:
space:
mode:
authorEugene Sandulenko2010-08-05 12:48:19 +0000
committerEugene Sandulenko2010-10-12 22:27:03 +0000
commitde0fe1db4939bbb787de60231dd30a7b5391f269 (patch)
tree96c1872068e9847500e4cf3b63242998bcb0c517 /engines/sword25/gfx/opengl
parenteb30ebde2a4e3181bc2ef2daccedfe852aa891e1 (diff)
downloadscummvm-rg350-de0fe1db4939bbb787de60231dd30a7b5391f269.tar.gz
scummvm-rg350-de0fe1db4939bbb787de60231dd30a7b5391f269.tar.bz2
scummvm-rg350-de0fe1db4939bbb787de60231dd30a7b5391f269.zip
SWORD25: Mass-putting of all files in gfx/ into Sword25 namespace
svn-id: r53214
Diffstat (limited to 'engines/sword25/gfx/opengl')
-rw-r--r--engines/sword25/gfx/opengl/glimage.cpp4
-rw-r--r--engines/sword25/gfx/opengl/glimage.h4
-rw-r--r--engines/sword25/gfx/opengl/glvectorimageblit.cpp5
-rw-r--r--engines/sword25/gfx/opengl/openglgfx.cpp4
-rw-r--r--engines/sword25/gfx/opengl/openglgfx.h4
-rw-r--r--engines/sword25/gfx/opengl/swimage.cpp4
-rw-r--r--engines/sword25/gfx/opengl/swimage.h4
7 files changed, 29 insertions, 0 deletions
diff --git a/engines/sword25/gfx/opengl/glimage.cpp b/engines/sword25/gfx/opengl/glimage.cpp
index e04ea7010c..80a822adcc 100644
--- a/engines/sword25/gfx/opengl/glimage.cpp
+++ b/engines/sword25/gfx/opengl/glimage.cpp
@@ -42,6 +42,8 @@
#include "sword25/gfx/opengl/openglgfx.h"
#include "sword25/gfx/opengl/glimage.h"
+namespace Sword25 {
+
#define BS_LOG_PREFIX "GLIMAGE"
// -----------------------------------------------------------------------------
@@ -221,3 +223,5 @@ bool BS_GLImage::Blit(int PosX, int PosY,
return Result == GLS_OK;
}
+
+} // End of namespace Sword25
diff --git a/engines/sword25/gfx/opengl/glimage.h b/engines/sword25/gfx/opengl/glimage.h
index e8af2cd18b..62f84ef3cf 100644
--- a/engines/sword25/gfx/opengl/glimage.h
+++ b/engines/sword25/gfx/opengl/glimage.h
@@ -45,6 +45,8 @@
#include <vector>
+namespace Sword25 {
+
// -----------------------------------------------------------------------------
// FORWARD DECLARATION
// -----------------------------------------------------------------------------
@@ -97,4 +99,6 @@ private:
int m_Height;
};
+} // End of namespace Sword25
+
#endif
diff --git a/engines/sword25/gfx/opengl/glvectorimageblit.cpp b/engines/sword25/gfx/opengl/glvectorimageblit.cpp
index c0966fa39f..262153f59e 100644
--- a/engines/sword25/gfx/opengl/glvectorimageblit.cpp
+++ b/engines/sword25/gfx/opengl/glvectorimageblit.cpp
@@ -41,6 +41,9 @@
#include "sword25/util/glsprites/glsprites.h"
#include <vector>
+
+namespace Sword25 {
+
using namespace std;
#define BS_LOG_PREFIX "GLVECTORIMAGEBLIT"
@@ -146,3 +149,5 @@ bool BS_VectorImage::Blit(int PosX, int PosY,
return Result == GLS_OK;
}
+
+} // End of namespace Sword25
diff --git a/engines/sword25/gfx/opengl/openglgfx.cpp b/engines/sword25/gfx/opengl/openglgfx.cpp
index 13f457508a..fc8ecad261 100644
--- a/engines/sword25/gfx/opengl/openglgfx.cpp
+++ b/engines/sword25/gfx/opengl/openglgfx.cpp
@@ -57,6 +57,8 @@
#include <algorithm>
+namespace Sword25 {
+
using namespace std;
#define BS_LOG_PREFIX "OPENGLGFX"
@@ -518,3 +520,5 @@ bool BS_OpenGLGfx::Unpersist(BS_InputPersistenceBlock & Reader)
return result && Reader.IsGood();
}
+
+} // End of namespace Sword25
diff --git a/engines/sword25/gfx/opengl/openglgfx.h b/engines/sword25/gfx/opengl/openglgfx.h
index 15dad2203b..c1b6143827 100644
--- a/engines/sword25/gfx/opengl/openglgfx.h
+++ b/engines/sword25/gfx/opengl/openglgfx.h
@@ -49,6 +49,8 @@
#include "sword25/gfx/renderobjectptr.h"
#include "sword25/util/glsprites/glsprites.h"
+namespace Sword25 {
+
// -----------------------------------------------------------------------------
// FORWARD DECLARATIONS
// -----------------------------------------------------------------------------
@@ -126,4 +128,6 @@ private:
static void FlipImagedataVertical(unsigned int Width, unsigned int Height, std::vector<unsigned int> & Data);
};
+} // End of namespace Sword25
+
#endif
diff --git a/engines/sword25/gfx/opengl/swimage.cpp b/engines/sword25/gfx/opengl/swimage.cpp
index bce01c5a5a..c8efd357a4 100644
--- a/engines/sword25/gfx/opengl/swimage.cpp
+++ b/engines/sword25/gfx/opengl/swimage.cpp
@@ -41,6 +41,8 @@
#include "sword25/gfx/opengl/swimage.h"
+namespace Sword25 {
+
#define BS_LOG_PREFIX "SWIMAGE"
@@ -138,3 +140,5 @@ unsigned int BS_SWImage::GetPixel(int X, int Y)
return _ImageDataPtr[m_Width * Y + X];
}
+
+} // End of namespace Sword25
diff --git a/engines/sword25/gfx/opengl/swimage.h b/engines/sword25/gfx/opengl/swimage.h
index c1fd793b1f..cb27a089a1 100644
--- a/engines/sword25/gfx/opengl/swimage.h
+++ b/engines/sword25/gfx/opengl/swimage.h
@@ -44,6 +44,8 @@
#include "sword25/gfx/graphicengine.h"
+namespace Sword25 {
+
// -----------------------------------------------------------------------------
// CLASS DEFINITION
// -----------------------------------------------------------------------------
@@ -81,4 +83,6 @@ private:
int m_Height;
};
+} // End of namespace Sword25
+
#endif