diff --git a/bazaar/plugin/geotiff/geotiff.cpp b/bazaar/plugin/geotiff/geotiff.cpp
index d172902d5..a22631008 100644
--- a/bazaar/plugin/geotiff/geotiff.cpp
+++ b/bazaar/plugin/geotiff/geotiff.cpp
@@ -238,7 +238,7 @@ void GeoTIFF::Band::LoadBlock(int column, int row) const
 	Point block_offset(block_size.cx * column, block_size.cy * row);
 	One<Block> new_block = new Block(block_size, type, pixel_bytes);
 	band->ReadBlock(column, row, new_block->bytes);
-	blocks[block_index] = new_block;
+	blocks[block_index] = pick(new_block);
 }
 
 void GeoTIFF::Band::CalcStatistics() const
diff --git a/bazaar/plugin/geotiff/libgeotiff/gcore/Version.rc b/bazaar/plugin/geotiff/libgeotiff/gcore/Version.rc
deleted file mode 100644
index a1eecaf1b..000000000
--- a/bazaar/plugin/geotiff/libgeotiff/gcore/Version.rc
+++ /dev/null
@@ -1,95 +0,0 @@
-/******************************************************************************
- * $Id: Version.rc 13360 2007-12-18 03:47:06Z mloskot $
- *
- * Project:  GDAL Core
- * Purpose:  GDAL DLL registration information. 
- * Author:   Martin Daly (Cadcorp)
- *
- * Copyright assignment provided by Martin Daly by email, "Be my guest.  Fame!  
- * At last!  Best not let it go to my head, eh?"
- *
- ******************************************************************************
- * Copyright (c) 2005, Frank Warmerdam <warmerdam@pobox.com>
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included
- * in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
- ******************************************************************************
- * $Log$
- * Revision 1.6  2006/03/30 15:42:55  fwarmerdam
- * Added explicit not on right to use.
- *
- * Revision 1.5  2006/03/28 14:49:56  fwarmerdam
- * updated contact info
- *
- */
-#define APSTUDIO_HIDDEN_SYMBOLS
-#include <windows.h>
-#undef APSTUDIO_HIDDEN_SYMBOLS
-#include <winver.h>
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_NEU)
-#ifdef _WIN32
-LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
-#pragma code_page(1252)
-#endif //_WIN32
-
-#include "gdal.h"
-
-#ifndef _MAC
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Version
-//
-
-VS_VERSION_INFO VERSIONINFO
- FILEVERSION GDAL_VERSION_MAJOR,GDAL_VERSION_MINOR,GDAL_VERSION_REV,GDAL_VERSION_BUILD
- PRODUCTVERSION GDAL_VERSION_MAJOR,GDAL_VERSION_MINOR,GDAL_VERSION_REV,GDAL_VERSION_BUILD
- FILEFLAGSMASK 0x3fL
-#ifdef _DEBUG
- FILEFLAGS 0x1L
-#else
- FILEFLAGS 0x0L
-#endif
- FILEOS 0x4L
- FILETYPE 0x2L
- FILESUBTYPE 0x0L
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "000004b0"
-        BEGIN
-            VALUE "CompanyName", "OSGeo\0"
-            VALUE "FileDescription", "Geospatial Data Abstraction Library\0"
-            VALUE "FileVersion", GDAL_RELEASE_NAME "\0"
-            VALUE "InternalName", "GDAL\0"
-            VALUE "LegalCopyright", "See LICENSE.TXT"
-            VALUE "ProductName", "GDAL/OGR\0"
-            VALUE "ProductVersion", GDAL_RELEASE_NAME "\0"
-            VALUE "WebPage", "http://www.gdal.org/\0"
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-        VALUE "Translation", 0x0, 1200
-    END
-END
-
-#endif    // !_MAC
-
-#endif    // Neutral resources
diff --git a/bazaar/plugin/geotiff/libgeotiff/libgeotiff.upp b/bazaar/plugin/geotiff/libgeotiff/libgeotiff.upp
index 49d0636b4..2b8f43ff2 100644
--- a/bazaar/plugin/geotiff/libgeotiff/libgeotiff.upp
+++ b/bazaar/plugin/geotiff/libgeotiff/libgeotiff.upp
@@ -116,7 +116,6 @@ file
 	gcore\makefile.vc,
 	gcore\overview.cpp,
 	gcore\rasterio.cpp,
-	gcore\Version.rc,
 	ogr readonly separator,
 	ogr\gml2ogrgeometry.cpp,
 	ogr\ogr2gmlgeometry.cpp,
diff --git a/bazaar/plugin/geotiff/libgeotiff/port/cpl_config.h b/bazaar/plugin/geotiff/libgeotiff/port/cpl_config.h
index 0b77aabc6..ad93d0719 100644
--- a/bazaar/plugin/geotiff/libgeotiff/port/cpl_config.h
+++ b/bazaar/plugin/geotiff/libgeotiff/port/cpl_config.h
@@ -97,6 +97,8 @@
 #endif
 
 #ifdef flagWIN32
+#if _MSC_VER < 1900 // MSC from VS2015 error if snprintf redefined
 #define snprintf _snprintf
+#endif
 //#define vsnprintf _vsnprintf
 #endif
diff --git a/bazaar/plugin/geotiff/libgeotiff/port/cpl_vsil_win32.cpp b/bazaar/plugin/geotiff/libgeotiff/port/cpl_vsil_win32.cpp
index 07b966639..be5f0d494 100644
--- a/bazaar/plugin/geotiff/libgeotiff/port/cpl_vsil_win32.cpp
+++ b/bazaar/plugin/geotiff/libgeotiff/port/cpl_vsil_win32.cpp
@@ -457,7 +457,7 @@ char **VSIWin32FilesystemHandler::ReadDir( const char *pszPath )
 
 {
     struct _finddata_t c_file;
-    long    hFile;
+    intptr_t hFile;
     char    *pszFileSpec, **papszDir = NULL;
 
     if (strlen(pszPath) == 0)