Bläddra i källkod

tinyexr: Disabled VS2015 warnings.

Branimir Karadžić 10 år sedan
förälder
incheckning
95f3df2f73
1 ändrade filer med 11 tillägg och 4 borttagningar
  1. 11 4
      3rdparty/tinyexr/tinyexr.h

+ 11 - 4
3rdparty/tinyexr/tinyexr.h

@@ -4210,6 +4210,13 @@ mz_uint tdefl_create_comp_flags_from_zip_params(int level, int window_bits,
 #pragma warning(disable : 4204) // nonstandard extension used : non-constant
                                 // aggregate initializer (also supported by GNU
                                 // C and C99, so no big deal)
+#pragma warning(disable : 4244) // 'initializing': conversion from '__int64' to
+                                // 'int', possible loss of data
+#pragma warning(disable : 4267) // 'argument': conversion from '__int64' to 'int',
+                                // possible loss of data
+#pragma warning(disable : 4996) // 'strdup': The POSIX name for this item is
+                                // deprecated. Instead, use the ISO C and C++
+                                // conformant name: _strdup.
 #endif
 
 // Simple PNG writer function by Alex Evans, 2011. Released into the public
@@ -4301,10 +4308,6 @@ void *tdefl_write_image_to_png_file_in_memory(const void *pImage, int w, int h,
                                                     pLen_out, 6, MZ_FALSE);
 }
 
-#ifdef _MSC_VER
-#pragma warning(pop)
-#endif
-
 // ------------------- .ZIP archive reading
 
 #ifndef MINIZ_NO_ARCHIVE_APIS
@@ -11119,6 +11122,10 @@ int ParseMultiChannelEXRHeaderFromMemory(EXRImage *exrImage,
   return 0; // OK
 }
 
+#ifdef _MSC_VER
+#pragma warning(pop)
+#endif
+
 #endif
 
 #endif // __TINYEXR_H__