One more round of fixing compilation errors with VS2008

Author: flanglet

src/api/Compressor.cpp

@@ -144,7 +144,7 @@ int CDECL initCompressor(struct cData* pData, FILE* dst, struct cContext** pCtx)
         cctx->fos = fos;
         *pCtx = cctx;
     }
-    catch (const exception& e) {
+    catch (const exception&) {
         if (fos != nullptr)
            delete fos;
 

src/api/Compressor.hpp

@@ -24,7 +24,6 @@ limitations under the License.
 #endif
 
 #include <stdio.h>
-#include <stdint.h>
 
 
 #ifdef __cplusplus

src/api/Decompressor.cpp

@@ -49,24 +49,34 @@ namespace kanzi {
        char _buffer[BUF_SIZE];
 
        virtual int_type underflow() {
-          if (gptr() < egptr())
-              return traits_type::to_int_type(*gptr());
+           if (gptr() < egptr())
+               return traits_type::to_int_type(*gptr());
 
-          // Preserve up to 4 bytes of putback
-          const int putback = std::min<int>(gptr() - eback(), 4);
+           // Number of characters to preserve (putback)
+           int putback = int(gptr() - eback());
 
-          // Move putback bytes to the front
-          std::memmove(_buffer + (4 - putback), gptr() - putback, putback);
+           if (putback > 4) putback = 4;
 
-          // Read new bytes after putback
-          const int n = READ(_fd, _buffer + 4, BUF_SIZE - 4);
-          if (n <= 0)
-              return traits_type::eof();
+           // Prevent reading before buffer start
+           const char* src = gptr() - putback;
 
-          // Set new buffer pointers
-          setg(_buffer + (4 - putback), _buffer + 4, _buffer + 4 + n);
-          return traits_type::to_int_type(*gptr());
-      }
+           if (src < _buffer) {
+               putback = int(gptr() - _buffer);
+               src = _buffer;
+           }
+
+           // Move putback characters to start of buffer
+           std::memmove(_buffer + (4 - putback), src, putback);
+
+           // Read new characters into buffer
+           const int n = int(READ(_fd, _buffer + 4, BUF_SIZE - 4));
+
+           if (n <= 0)
+               return EOF;
+
+           setg(_buffer + (4 - putback), _buffer + 4, _buffer + 4 + n);
+           return traits_type::to_int_type(*gptr());
+       }
    };
 
    class FileInputStream FINAL : public istream

src/types.hpp

@@ -17,7 +17,27 @@ limitations under the License.
 #ifndef _types_
 #define _types_
 
-    #ifdef _MSC_VER
+    #if defined(_MSC_VER) && _MSC_VER < 1600
+       // Visual Studio < 2010: no stdint.h
+       typedef unsigned char      uint8_t;
+       typedef signed char        int8_t;
+       typedef unsigned short     uint16_t;
+       typedef short              int16_t;
+       typedef unsigned int       uint32_t;
+       typedef int                int32_t;
+       typedef unsigned __int64   uint64_t;
+       typedef __int64            int64_t;
+    #else
+       // Modern compilers
+       #include <cstdint>
+    #endif
+
+    #if defined(_MSC_VER)
+        #if _MSC_VER < 1900
+            // snprintf macro for MSVC < 2015
+            #define snprintf _snprintf
+        #endif
+
         #if !defined(__x86_64__)
             #define __x86_64__  _M_X64
         #endif