Changeset 487 for trunk/src/image

Timestamp:

03/08/16 08:05:51 (9 years ago)

Author:

epyon

Message:

 

Location:

trunk/src/image

Files:

• miniz.cc (modified) (1 diff)
• png_loader.cc (modified) (3 diffs)

trunk/src/image/miniz.cc

@@ -3 +3 @@
 
 using namespace nv;
+
+#define MINIZ_NO_TIME
+#define MINIZ_NO_ZLIB_COMPATIBLE_NAMES
+
+#define MINIZ_HAS_64BIT_REGISTERS 0
+#define TINFL_USE_64BIT_BITBUF 0
+
+#if NV_COMPILER == NV_CLANG
+#pragma clang diagnostic ignored "-Wunused-macros"
+#pragma clang diagnostic ignored "-Wold-style-cast"
+#pragma clang diagnostic ignored "-Wsign-conversion"
+#endif
 
 #if defined( _M_IX86 ) || defined( _M_X64 ) || defined( __i386__ ) || defined( __i386 ) || defined( __i486__ ) || defined( __i486 ) || defined( i386 ) || defined( __ia64__ ) || defined( __x86_64__ )

trunk/src/image/png_loader.cc

@@ -10 +10 @@
 
 using namespace nv;
+
+#if NV_COMPILER == NV_CLANG
+#pragma clang diagnostic ignored "-Wunused-macros"
+#pragma clang diagnostic ignored "-Wold-style-cast"
+#pragma clang diagnostic ignored "-Wsign-conversion"
+#pragma clang diagnostic ignored "-Wreserved-id-macro"
+#pragma clang diagnostic ignored "-Wmissing-prototypes"
+#define NULL 0
+#endif
 
 enum
@@ -322 +331 @@
 };
 
+static int iabs( int a )
+{
+        return a < 0 ? -a : a;
+}
+
 static int stbi__paeth( int a, int b, int c )
 {
         int p = a + b - c;
-        int pa = abs( p - a );
-        int pb = abs( p - b );
-        int pc = abs( p - c );
+        int pa = iabs( p - a );
+        int pb = iabs( p - b );
+        int pc = iabs( p - c );
         if ( pa <= pb && pa <= pc ) return a;
         if ( pb <= pc ) return b;
@@ -1050 +1064 @@
                 case 3: format.format = RGB; break;
                 case 4: format.format = RGBA; break;
-                default: return false;
+                default: return nullptr;
                 }
                 size = ivec2( x, y );