[Hgengine-cvs] SF.net SVN: hgengine:[67] Mercury2/src

[<axl...@us...>]

Revision: 67
          http://hgengine.svn.sourceforge.net/hgengine/?rev=67&view=rev
Author:   axlecrusher
Date:     2008-12-07 17:41:41 +0000 (Sun, 07 Dec 2008)

Log Message:
-----------
fix warnings

Modified Paths:
--------------
    Mercury2/src/Mercury2.cpp
    Mercury2/src/MercuryUtil.cpp
    Mercury2/src/PNGLoader.cpp
    Mercury2/src/X11Window.cpp

Modified: Mercury2/src/Mercury2.cpp
===================================================================
--- Mercury2/src/Mercury2.cpp	2008-12-07 17:35:58 UTC (rev 66)
+++ Mercury2/src/Mercury2.cpp	2008-12-07 17:41:41 UTC (rev 67)
@@ -9,7 +9,7 @@
 int main()
 {
 	unsigned long m_count = 0;
-	unsigned long m_time;
+	long m_time;
 	
 	MercuryWindow* w = MercuryWindow::MakeWindow();
 	MercuryNode* root = new MercuryNode();
@@ -32,7 +32,7 @@
 		if (time(NULL) > m_time)
 		{
 			m_time = time(NULL);
-			printf("FPS: %d\n", m_count);
+			printf("FPS: %lu\n", m_count);
 			m_count = 0;
 		}
 	}

Modified: Mercury2/src/MercuryUtil.cpp
===================================================================
--- Mercury2/src/MercuryUtil.cpp	2008-12-07 17:35:58 UTC (rev 66)
+++ Mercury2/src/MercuryUtil.cpp	2008-12-07 17:41:41 UTC (rev 67)
@@ -3,7 +3,7 @@
 std::string ToUpper(const std::string& s)
 {
 	std::string t = s;
-	for (int i = 0; i < s.length(); ++i)
+	for (unsigned long i = 0; i < s.length(); ++i)
 	{
 		t[i] = toupper(t[i]);
 	}

Modified: Mercury2/src/PNGLoader.cpp
===================================================================
--- Mercury2/src/PNGLoader.cpp	2008-12-07 17:35:58 UTC (rev 66)
+++ Mercury2/src/PNGLoader.cpp	2008-12-07 17:41:41 UTC (rev 67)
@@ -106,7 +106,7 @@
 		case RGBA:
 			for ( y=0; y < (unsigned)image->m_height; ++y) {
 				png_byte* row = row_pointers[y];
-				for (int x = 0; x < image->m_width; ++x) {
+				for (unsigned long x = 0; x < image->m_width; ++x) {
 					png_byte* ptr = &(row[x*4]);
 					image->m_data[(x + y * image->m_width) * 4] = ptr[0];
 					image->m_data[(x + y * image->m_width) * 4 + 1] = ptr[1];
@@ -118,7 +118,7 @@
 		case RGB:
 			for ( y=0; y < (unsigned)image->m_height; y++) {
 				png_byte* row = row_pointers[y];
-				for (int x=0; x<image->m_width; x++) {
+				for (unsigned long x=0; x<image->m_width; x++) {
 					png_byte* ptr = &(row[x * 3]);
 					image->m_data[(x + y * image->m_width) * 3] = ptr[0];
 					image->m_data[(x + y * image->m_width) * 3 + 1] = ptr[1];
@@ -171,4 +171,4 @@
  * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
  * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
  * USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
\ No newline at end of file
+ */

Modified: Mercury2/src/X11Window.cpp
===================================================================
--- Mercury2/src/X11Window.cpp	2008-12-07 17:35:58 UTC (rev 66)
+++ Mercury2/src/X11Window.cpp	2008-12-07 17:41:41 UTC (rev 67)
@@ -100,7 +100,7 @@
 		{
 			case ClientMessage:
 			{
-				if ( event.xclient.data.l[0] == m_wmDeleteMessage )
+				if ( unsigned(event.xclient.data.l[0]) == m_wmDeleteMessage )
 					XDestroyWindow(m_display,m_window);
 				break;
 			}
@@ -145,7 +145,7 @@
 
 void* X11Window::GetProcAddress(const string& x)
 {
-	
+return NULL;	
 }
 
 /***************************************************************************


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.