[Vegastrike-cvs] SF.net SVN: vegastrike:[12929] trunk/vegastrike/src

[<ac...@us...>]

Revision: 12929
          http://vegastrike.svn.sourceforge.net/vegastrike/?rev=12929&view=rev
Author:   ace123
Date:     2010-10-10 23:30:28 +0000 (Sun, 10 Oct 2010)

Log Message:
-----------
Forgot to commit png function. Set the version number of windows al.

Modified Paths:
--------------
    trunk/vegastrike/src/audio/renderers/OpenAL/al.h
    trunk/vegastrike/src/gfx/vsimage.cpp

Modified: trunk/vegastrike/src/audio/renderers/OpenAL/al.h
===================================================================
--- trunk/vegastrike/src/audio/renderers/OpenAL/al.h	2010-10-10 19:39:51 UTC (rev 12928)
+++ trunk/vegastrike/src/audio/renderers/OpenAL/al.h	2010-10-10 23:30:28 UTC (rev 12929)
@@ -24,8 +24,8 @@
 #define ALC_INVALID_ENUM ALC_ILLEGAL_ENUM
 #endif
 
-#if !defined(ALC_MAJOR_VERSION) || !defined(ALC_MINOR_VERSION) || ALC_MAJOR_VERSION < 0x1000 || ALC_MINOR_VERSION < 0x1001
-#define ALCstring const ALCubyte*
+#if !defined(ALC_MAJOR_VERSION) || !defined(ALC_MINOR_VERSION) || ALC_MAJOR_VERSION < 0x1000 || (ALC_MAJOR_VERSION == 0x1000 && ALC_MINOR_VERSION < 0x1002)
+#define ALCstring ALCubyte*
 #else
 #define ALCstring const ALCchar*
 #endif

Modified: trunk/vegastrike/src/gfx/vsimage.cpp
===================================================================
--- trunk/vegastrike/src/gfx/vsimage.cpp	2010-10-10 19:39:51 UTC (rev 12928)
+++ trunk/vegastrike/src/gfx/vsimage.cpp	2010-10-10 23:30:28 UTC (rev 12929)
@@ -321,8 +321,13 @@
             png_set_strip_16( png_ptr );
         if (strip_16 && this->img_color_type == PNG_COLOR_TYPE_PALETTE)
             png_set_palette_to_rgb( png_ptr );
-        if (this->img_color_type == PNG_COLOR_TYPE_GRAY && this->img_depth < 8)
+        if (this->img_color_type == PNG_COLOR_TYPE_GRAY && this->img_depth < 8) {
+#ifdef _WIN32
+            png_set_gray_1_2_4_to_8( png_ptr );
+#else
             png_set_expand_gray_1_2_4_to_8( png_ptr );
+#endif
+        }
         png_set_expand( png_ptr );
         png_read_update_info( png_ptr, info_ptr );
         this->sizeX     = 1;