hgengine-cvs Mailing List for Mercury Engine (Page 22)

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

Revision: 245
          http://hgengine.svn.sourceforge.net/hgengine/?rev=245&view=rev
Author:   axlecrusher
Date:     2009-05-14 22:15:01 +0000 (Thu, 14 May 2009)

Log Message:
-----------
Fix windows compile

Modified Paths:
--------------
    Mercury2/src/MSemaphore.cpp
    Mercury2/src/MSemaphore.h
    Mercury2/src/MercuryThreads.cpp
    Mercury2/src/PNGLoader.cpp

Modified: Mercury2/src/MSemaphore.cpp
===================================================================

--- Mercury2/src/MSemaphore.cpp	2009-05-14 21:59:18 UTC (rev 244)
+++ Mercury2/src/MSemaphore.cpp	2009-05-14 22:15:01 UTC (rev 245)
@@ -65,8 +65,27 @@
     return Old;
 }
 
+FORCEINLINE
+LONG
+__sync_and_and_fetch (
+    __inout LONG volatile *Destination,
+    __in    LONG Value
+    )
+{
+    LONG Old;
+
+    do {
+        Old = *Destination;
+    } while (InterlockedCompareExchange(Destination,
+                                          Old & Value,
+                                          Old) != Old);
+
+    return Old & Value;
+}
+
 #define SYNC_OR_AND_FETCH(d,v) OrAndFetch(d,v)
 #define COMPARE_AND_SWAP(d,o,n) InterlockedCompareExchange(d, n, o)
+#define SYNC_AND_AND_FETCH(d,v) __sync_and_and_fetch(d,v)
 
 unsigned long MSemaphore::ReadAndClear()
 {
@@ -90,15 +109,15 @@
 	return SYNC_OR_AND_FETCH(&m_semaphore, 0);
 }
 
-void MSemaphore::WaitAndSet(unsigned long value, unsigned long newVal)
+void MSemaphore::WaitAndSet(uint32_t value, uint32_t newVal)
 {
-	while( COMPARE_AND_SWAP(&m_semaphore, value, newVal) != value );
+	while( COMPARE_AND_SWAP(&m_semaphore, value, newVal) != ((int32_t)value) );
 }
 
 void MSemaphore::Wait()
 {
 	uint32_t thread = MercuryThread::Current();
-	if ( SYNC_OR_AND_FETCH(&m_semaphore, 0) == thread) //recursive lock
+	if ( SYNC_OR_AND_FETCH(&m_semaphore, 0) == ((int32_t)thread) ) //recursive lock
 	{
 		++m_lockCount;
 		return;
@@ -111,7 +130,7 @@
 void MSemaphore::UnLock()
 {
 	uint32_t thread = MercuryThread::Current();
-	if ( SYNC_OR_AND_FETCH(&m_semaphore, 0) == thread) //unlock given from correct thread
+	if ( SYNC_OR_AND_FETCH(&m_semaphore, 0) == ((int32_t)thread) ) //unlock given from correct thread
 	{
 		--m_lockCount;
 		if (m_lockCount == 0) SYNC_AND_AND_FETCH(&m_semaphore, 0 );

Modified: Mercury2/src/MSemaphore.h
===================================================================
--- Mercury2/src/MSemaphore.h	2009-05-14 21:59:18 UTC (rev 244)
+++ Mercury2/src/MSemaphore.h	2009-05-14 22:15:01 UTC (rev 245)
@@ -16,7 +16,7 @@
 		unsigned long ReadAndClear();
 		unsigned long Decrement();
 		unsigned long Increment();
-		void WaitAndSet(unsigned long value, unsigned long newVal);
+		void WaitAndSet(uint32_t value, uint32_t newVal);
 		
 		void Wait();
 		void UnLock();
@@ -27,7 +27,7 @@
 #ifndef WIN32
 		uint32_t m_semaphore;
 #else
-		volatile LONG m_counter; //align to 32bit boundary
+		volatile LONG m_semaphore; //align to 32bit boundary
 #endif
 };
 

Modified: Mercury2/src/MercuryThreads.cpp
===================================================================
--- Mercury2/src/MercuryThreads.cpp	2009-05-14 21:59:18 UTC (rev 244)
+++ Mercury2/src/MercuryThreads.cpp	2009-05-14 22:15:01 UTC (rev 245)
@@ -121,7 +121,11 @@
 
 unsigned long MercuryThread::Current()
 {
+#ifdef WIN32
+	return GetCurrentThreadId();
+#else
 	return pthread_self();
+#endif
 }
 
 

Modified: Mercury2/src/PNGLoader.cpp
===================================================================
--- Mercury2/src/PNGLoader.cpp	2009-05-14 21:59:18 UTC (rev 244)
+++ Mercury2/src/PNGLoader.cpp	2009-05-14 22:15:01 UTC (rev 245)
@@ -1,8 +1,8 @@
-#include <ImageLoader.h>
-#include <MercuryUtil.h>
-
-#include <assert.h>
-
+#include <ImageLoader.h>
+#include <MercuryUtil.h>
+
+#include <assert.h>
+
 #if defined(WIN32)
 #  include <png.h>
 #  if defined(_MSC_VER)
@@ -12,173 +12,173 @@
 #else
 #  include <png.h>
 #endif
-
-
-void PNGRead( png_struct *png, png_byte *p, png_size_t size )
-{
-	MercuryFile * f = (MercuryFile*)png->io_ptr;
-
-	int got = f->Read( p, (unsigned long)size );
-//	int got = fread(p, size, 1, f );
-
-	if( got == -1 )
-		png_error( png, "Error reading from file");
-//	else if( got != size )
-//		png_error( png, "Unexpected EOF" );
-}
-
-RawImageData* LoadPNG( MercuryFile * fp )
-{
-	png_structp png_ptr;
-	png_infop info_ptr;
-	int number_of_passes;
-	png_bytep* row_pointers;
-	png_byte color_type;
-	png_byte bit_depth;
-	RawImageData* image = 0;
-	unsigned char header[8];	// 8 is the maximum size that can be checked
-
-	//open file and test for it being a png 
-	if (!fp)
-		assert("[read_png_file] File %s could not be opened for reading");
-	fp->Read(header, 8 );
-//	fread(header, 8, 1, fp);
-	if (png_sig_cmp(header, 0, 8))
-		assert("[read_png_file] File %s is not recognized as a PNG file");
-
-
-	//initialize stuff 
-	png_ptr = png_create_read_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL);
-
-	if (!png_ptr)
-		assert("[read_png_file] png_create_read_struct failed");
-
-	info_ptr = png_create_info_struct(png_ptr);
-	if (!info_ptr)
-		assert("[read_png_file] png_create_info_struct failed");
-
-	if (setjmp(png_jmpbuf(png_ptr)))
-		assert("[read_png_file] Error during init_io");
-
-	png_set_sig_bytes(png_ptr, 8);
-	png_set_read_fn( png_ptr, fp, PNGRead );
-
-	png_read_info(png_ptr, info_ptr);
-
-	image = new RawImageData;
-
-	image->m_width = info_ptr->width;
-	image->m_height = info_ptr->height;
-	color_type = info_ptr->color_type;
-	bit_depth = info_ptr->bit_depth;
-
-//	if ( color_type & PNG_COLOR_MASK_PALETTE )
-//	{
-//		SAFE_DELETE(image);
-//		assert("Cannot open paletted PNG files.");
-//	}
-	if (color_type == PNG_COLOR_TYPE_PALETTE)
-		png_set_palette_to_rgb(png_ptr);
-
-	number_of_passes = png_set_interlace_handling(png_ptr);
-	png_read_update_info(png_ptr, info_ptr);
-
-	// read file 
-	if (setjmp(png_jmpbuf(png_ptr)))
-	{
-		SAFE_DELETE_ARRAY(image);
-		assert("[read_png_file] Error during read_image");
-	}
-
-	row_pointers = (png_bytep*) malloc(sizeof(png_bytep) * image->m_height);
-	unsigned int y;
-	for ( y=0; y < (unsigned)image->m_height; y++)
-		row_pointers[y] = (png_byte*) malloc(info_ptr->rowbytes);
-
-	png_read_image(png_ptr, row_pointers);
-
-	png_read_end( png_ptr, info_ptr );
-	png_destroy_read_struct( &png_ptr, &info_ptr, NULL );
-
-	png_free_data(png_ptr, info_ptr, PNG_FREE_ALL, -1);
-
-	if (color_type & PNG_COLOR_MASK_ALPHA)
-		image->m_ColorByteType = RGBA;	
-	else
-		image->m_ColorByteType = RGB;	
-
-//	SAFE_DELETE(texture->m_data);
-	
-	image->m_data = new unsigned char[sizeof(unsigned char) * image->m_height * image->m_width *  4];
-
-	switch (image->m_ColorByteType)
-	{
-		case RGBA:
-			for ( y=0; y < (unsigned)image->m_height; ++y) {
-				png_byte* row = row_pointers[y];
-				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];
-					image->m_data[(x + y * image->m_width) * 4 + 2] = ptr[2];
-					image->m_data[(x + y * image->m_width) * 4 + 3] = ptr[3];
-				}	
-			}
-			break;
-		case RGB:
-			for ( y=0; y < (unsigned)image->m_height; y++) {
-				png_byte* row = row_pointers[y];
-				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];
-					image->m_data[(x + y * image->m_width) * 3 + 2] = ptr[2];
-				}	
-			}
-			break;
-		default:
-			printf("Invalid color byte type for PNG.\n");
-			SAFE_DELETE_ARRAY( image );
-			return false;
-	}
-
-	for ( y=0; y < (unsigned)image->m_height; y++)
-		SAFE_FREE(row_pointers[y]);
-	SAFE_FREE(row_pointers);
-
-//	texture->CorrectSize();
-//	texture->CreateCache(); 
-
-	return image;
-}
-
-REGISTER_IMAGE_TYPE(\x89PN, LoadPNG);
-
-/* 
- * Copyright (c) 2004 Glenn Maynard
- * (c) 2008 Joshua Allen
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or
- * without modification, are permitted provided that the following
- * conditions are met:
- *	-	Redistributions of source code must retain the above
- *		copyright notice, this list of conditions and the following disclaimer.
- *	-	Redistributions in binary form must reproduce the above copyright
- *		notice, this list of conditions and the following disclaimer in
- *		the documentation and/or other materials provided with the distribution.
- *	-	Neither the name of the Mercury Engine nor the names of its
- *		contributors may be used to endorse or promote products derived from
- *		this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * 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.
+
+
+void PNGRead( png_struct *png, png_byte *p, png_size_t size )
+{
+	MercuryFile * f = (MercuryFile*)png->io_ptr;
+
+	int got = f->Read( p, (unsigned long)size );
+//	int got = fread(p, size, 1, f );
+
+	if( got == -1 )
+		png_error( png, "Error reading from file");
+//	else if( got != size )
+//		png_error( png, "Unexpected EOF" );
+}
+
+RawImageData* LoadPNG( MercuryFile * fp )
+{
+	png_structp png_ptr;
+	png_infop info_ptr;
+	int number_of_passes;
+	png_bytep* row_pointers;
+	png_byte color_type;
+	png_byte bit_depth;
+	RawImageData* image = 0;
+	unsigned char header[8];	// 8 is the maximum size that can be checked
+
+	//open file and test for it being a png 
+	if (!fp)
+		assert("[read_png_file] File %s could not be opened for reading");
+	fp->Read(header, 8 );
+//	fread(header, 8, 1, fp);
+	if (png_sig_cmp(header, 0, 8))
+		assert("[read_png_file] File %s is not recognized as a PNG file");
+
+
+	//initialize stuff 
+	png_ptr = png_create_read_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL);
+
+	if (!png_ptr)
+		assert("[read_png_file] png_create_read_struct failed");
+
+	info_ptr = png_create_info_struct(png_ptr);
+	if (!info_ptr)
+		assert("[read_png_file] png_create_info_struct failed");
+
+	if (setjmp(png_jmpbuf(png_ptr)))
+		assert("[read_png_file] Error during init_io");
+
+	png_set_sig_bytes(png_ptr, 8);
+	png_set_read_fn( png_ptr, fp, PNGRead );
+
+	png_read_info(png_ptr, info_ptr);
+
+	image = new RawImageData;
+
+	image->m_width = info_ptr->width;
+	image->m_height = info_ptr->height;
+	color_type = info_ptr->color_type;
+	bit_depth = info_ptr->bit_depth;
+
+//	if ( color_type & PNG_COLOR_MASK_PALETTE )
+//	{
+//		SAFE_DELETE(image);
+//		assert("Cannot open paletted PNG files.");
+//	}
+	if (color_type == PNG_COLOR_TYPE_PALETTE)
+		png_set_palette_to_rgb(png_ptr);
+
+	number_of_passes = png_set_interlace_handling(png_ptr);
+	png_read_update_info(png_ptr, info_ptr);
+
+	// read file 
+	if (setjmp(png_jmpbuf(png_ptr)))
+	{
+		SAFE_DELETE_ARRAY(image);
+		assert("[read_png_file] Error during read_image");
+	}
+
+	row_pointers = (png_bytep*) malloc(sizeof(png_bytep) * image->m_height);
+	unsigned int y;
+	for ( y=0; y < (unsigned)image->m_height; y++)
+		row_pointers[y] = (png_byte*) malloc(info_ptr->rowbytes);
+
+	png_read_image(png_ptr, row_pointers);
+
+	png_read_end( png_ptr, info_ptr );
+	png_destroy_read_struct( &png_ptr, &info_ptr, NULL );
+
+	png_free_data(png_ptr, info_ptr, PNG_FREE_ALL, -1);
+
+	if (color_type & PNG_COLOR_MASK_ALPHA)
+		image->m_ColorByteType = RGBA;	
+	else
+		image->m_ColorByteType = RGB;	
+
+//	SAFE_DELETE(texture->m_data);
+	
+	image->m_data = new unsigned char[sizeof(unsigned char) * image->m_height * image->m_width *  4];
+
+	switch (image->m_ColorByteType)
+	{
+		case RGBA:
+			for ( y=0; y < (unsigned)image->m_height; ++y) {
+				png_byte* row = row_pointers[y];
+				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];
+					image->m_data[(x + y * image->m_width) * 4 + 2] = ptr[2];
+					image->m_data[(x + y * image->m_width) * 4 + 3] = ptr[3];
+				}	
+			}
+			break;
+		case RGB:
+			for ( y=0; y < (unsigned)image->m_height; y++) {
+				png_byte* row = row_pointers[y];
+				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];
+					image->m_data[(x + y * image->m_width) * 3 + 2] = ptr[2];
+				}	
+			}
+			break;
+		default:
+			printf("Invalid color byte type for PNG.\n");
+			SAFE_DELETE_ARRAY( image );
+			return false;
+	}
+
+	for ( y=0; y < (unsigned)image->m_height; y++)
+		SAFE_FREE(row_pointers[y]);
+	SAFE_FREE(row_pointers);
+
+//	texture->CorrectSize();
+//	texture->CreateCache(); 
+
+	return image;
+}
+
+REGISTER_IMAGE_TYPE(\x89PN, LoadPNG);
+
+/* 
+ * Copyright (c) 2004 Glenn Maynard
+ * (c) 2008 Joshua Allen
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or
+ * without modification, are permitted provided that the following
+ * conditions are met:
+ *	-	Redistributions of source code must retain the above
+ *		copyright notice, this list of conditions and the following disclaimer.
+ *	-	Redistributions in binary form must reproduce the above copyright
+ *		notice, this list of conditions and the following disclaimer in
+ *		the documentation and/or other materials provided with the distribution.
+ *	-	Neither the name of the Mercury Engine nor the names of its
+ *		contributors may be used to endorse or promote products derived from
+ *		this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * 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


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




2005	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec (46)
2006	Jan (185)	Feb (242)	Mar (237)	Apr (180)	May (102)	Jun (278)	Jul (114)	Aug (92)	Sep (246)	Oct (212)	Nov (279)	Dec (99)
2007	Jan (130)	Feb (194)	Mar (22)	Apr (72)	May (40)	Jun (111)	Jul (114)	Aug (154)	Sep (114)	Oct (2)	Nov (1)	Dec (5)
2008	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep (6)	Oct (51)	Nov (34)	Dec (130)
2009	Jan (22)	Feb (20)	Mar (41)	Apr (45)	May (82)	Jun (96)	Jul (48)	Aug (90)	Sep (13)	Oct (49)	Nov (31)	Dec (21)
2010	Jan (25)	Feb (9)	Mar (7)	Apr (28)	May (27)	Jun (7)	Jul (1)	Aug	Sep (1)	Oct (1)	Nov (13)	Dec (2)
2013	Jan (1)	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec