|
From: <cn...@us...> - 2009-05-12 05:22:13
|
Revision: 228
http://hgengine.svn.sourceforge.net/hgengine/?rev=228&view=rev
Author: cnlohr
Date: 2009-05-12 04:58:42 +0000 (Tue, 12 May 2009)
Log Message:
-----------
Tell Mercury to link libpng only if the zipped file driver is being used (remove dependency on project).
Modified Paths:
--------------
Mercury2/src/PNGLoader.cpp
Modified: Mercury2/src/PNGLoader.cpp
===================================================================
--- Mercury2/src/PNGLoader.cpp 2009-05-12 04:57:54 UTC (rev 227)
+++ Mercury2/src/PNGLoader.cpp 2009-05-12 04:58:42 UTC (rev 228)
@@ -1,14 +1,24 @@
#include <ImageLoader.h>
-#include <png.h>
#include <MercuryUtil.h>
#include <assert.h>
+#if defined(WIN32)
+# include <png.h>
+# if defined(_MSC_VER)
+# pragma comment(lib, "libpng.lib")
+# endif
+# pragma warning(disable: 4611) /* interaction between '_setjmp' and C++ object destruction is non-portable */
+#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, size );
+ int got = f->Read( p, (unsigned long)size );
// int got = fread(p, size, 1, f );
if( got == -1 )
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|