From aa1b0312743cbcea3ab92f2b12567766216aec1b Mon Sep 17 00:00:00 2001
From: chacha21 <pierre@chachatelier.fr>
Date: Thu, 2 Mar 2017 16:56:20 +0100
Subject: [PATCH 1/2] get rid of warning C4800 under VS2010

the "std::basic_ios::operator bool" differs between C++98 and C++11. The
"double not" syntax is portable and covers both cases with equivalent
meaning
---
 modules/core/src/persistence.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/core/src/persistence.cpp b/modules/core/src/persistence.cpp
index 946875f5b1..5faede3ae8 100644
--- a/modules/core/src/persistence.cpp
+++ b/modules/core/src/persistence.cpp
@@ -7697,7 +7697,7 @@ std::string base64::make_base64_header(const char * dt)
 bool base64::read_base64_header(std::vector<char> const & header, std::string & dt)
 {
     std::istringstream iss(header.data());
-    return static_cast<bool>(iss >> dt);
+    return !!(iss >> dt);//the "std::basic_ios::operator bool" differs between C++98 and C++11. The "double not" syntax is portable and covers both cases with equivalent meaning
 }
 
 /****************************************************************************

From 74abbd08981ee8f27e07373ec1ca9725ada91dfb Mon Sep 17 00:00:00 2001
From: chacha21 <pierre@chachatelier.fr>
Date: Thu, 2 Mar 2017 16:58:51 +0100
Subject: [PATCH 2/2] Fix compilation when USE_ZLIB is false

create a dummy gzFile type
---
 modules/core/src/persistence.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/modules/core/src/persistence.cpp b/modules/core/src/persistence.cpp
index 5faede3ae8..31004c46e0 100644
--- a/modules/core/src/persistence.cpp
+++ b/modules/core/src/persistence.cpp
@@ -67,6 +67,8 @@
 #    define _FILE_OFFSET_BITS 0
 #  endif
 #  include <zlib.h>
+#else
+typedef void* gzFile;
 #endif
 
 /****************************************************************************************\