ENH: Ok since OJ warnings are not going to be fixed anytime soon remove them

[gdcm.git] / src / gdcmjasper / src / libjasper / include / jasper / jas_config.h.in

diff --git a/src/gdcmjasper/src/libjasper/include/jasper/jas_config.h.in b/src/gdcmjasper/src/libjasper/include/jasper/jas_config.h.in
index 62f2fe58776e7e2ca01c9988df9fe6594b8814e2..ef0b7e3306b6239cf7b3aaf53a1df99f6ae5bb7b 100644 (file)
--- a/src/gdcmjasper/src/libjasper/include/jasper/jas_config.h.in
+++ b/src/gdcmjasper/src/libjasper/include/jasper/jas_config.h.in
@@ -16,6 +16,10 @@
 #undef DEBUG_OVERFLOW
 #endif
 
+#if defined(_MSC_VER) && _MSC_VER < 1300
+#  pragma warning ( disable : 4761 ) /* integral size mismatch in argument; conversion supplied */
+#endif
+
 /* Define to 1 if you have the <dlfcn.h> header file. */
 #cmakedefine HAVE_DLFCN_H
 
@@ -217,6 +221,9 @@ typedef __int64            longlong;
 /* #define  ssize_t    int */
 #endif /* HAVE_SYS_TYPES_H */
 
+/* check how the compiler implement the return of malloc(0) */
+/* jasper does not support the case where it returns NULL */
+#cmakedefine NULL_ON_MALLOC_0
 
 #cmakedefine JASPERSTATIC
 #cmakedefine JASPERDLL