.cvsignore

+bin
+config.status
+config.log
+config.cache

.gitignore

+bin/
+config.log
+config.status
+config/Linux.mak
+config/common.mak
+OBJ.Linux
+OBJ.win32
+OBJ.win64
+lib/Linux
+ogdi-config
+ogdi.pc

ChangeLog

+2018-03-01  Even Rouault <even.rouault@spatialys.com>
+
+    * various changes to support Win64 and MSVC 2015
+
+2018-03-01  Even Rouault <even.rouault@spatialys.com>
+
+    * ogdi/driver/vrf/feature.c, object.c, vrf.h: make sure to take into
+    account tile id when merging feature segments, and deal with situations
+    where consecutive segments of same feature in edge table are not
+    mergeable. Needed on some DNC products.
+
 2016-07-19  Even Rouault <even.rouault@spatialys.com>
 
         * New 3.2.0 release

HOWTO-RELEASE

@@ -13,7 +13,7 @@
 
 4) Run testsuite on these platforms. 
 
-5) Add release notice in devdir/ChangeLog.
+5) Add release notice in ChangeLog.
 
 6) Update the NEWS file based on a digested form of the ChangeLog file.
 
@@ -23,15 +23,12 @@
 
    ie. 
 
-   cd devdir
-   cvs tag ogdi_3_1_0
+   git tag -a ogdi_3_2_1
 
 8) Create the source distributions using the mkogdidist.sh script.  The
    version name should include subrelease name components as appropriate.
-   Hit enter when prompted for a CVS password.
 
    ie. 
-   cd devdir
    mkogdidist.sh 3.1beta2
 
 9) Publish the resulting files.  For public (ie. final) releases they should

NEWS

@@ -4,6 +4,15 @@
 View the ChangeLog file for detailed, file by file notes on changes.  The
 NEWS file is just used to sumarize major changes, and new features. 
 
+3.2.1
+=====
+
+ o  MSVC 2015 related fixes
+
+ o  Win64 target
+
+ o  VRF: fixes for some linear features in DNC products
+
 3.2.0
 =====
 

VERSION

-3.2.0: mardi 19 juillet 2016, 14:20:47 (UTC+0200)

config/common.mak.in

@@ -73,7 +73,9 @@ LIBDIR		= $(TOPDIR)/lib/$(TARGET)
 #
 #	Final OS installation location.
 #
+ifndef prefix
 prefix		= /usr/local
+endif
 exec_prefix 	= ${prefix}
 INST_INCLUDE	= ${prefix}/include
 INST_LIB	= ${exec_prefix}/lib

config/mkinstalldirs

@@ -4,7 +4,7 @@
 # Created: 1993-05-16
 # Public domain
 
-# $Id: mkinstalldirs,v 1.1.1.1 2000/10/29 20:54:55 warmerda Exp $
+# $Id$
 
 errstatus=0
 

config/win64.mak

+# Copyright (C) 1996 Her Majesty the Queen in Right of Canada.
+# Permission to use, copy, modify and distribute this software and
+# its documentation for any purpose and without fee is hereby granted,
+# provided that the above copyright notice appear in all copies, that
+# both the copyright notice and this permission notice appear in
+# supporting documentation, and that the name of Her Majesty the Queen
+# in Right  of Canada not be used in advertising or publicity pertaining
+# to distribution of the software without specific, written prior
+# permission.  Her Majesty the Queen in Right of Canada makes no
+# representations about the suitability of this software for any purpose.
+# It is provided "as is" without express or implied warranty.
+#
+#
+#
+# win32 configuration file
+#
+
+MAKE 		= $(MAKE_COMMAND) $(MAKEOVERRIDES)
+
+
+#
+# Platform specific symbols
+#
+
+Platform	= win32
+
+#
+# Standard tools
+#
+
+CC		= cl.exe /nologo
+LD		= link.exe /nologo
+SHLIB_LD	= link.exe /nologo
+AR		= lib.exe /nologo
+FILECOPY	= cp
+MKDIR		= mkdir
+DIRCOPY		= cp -rf
+ifndef SHELL
+SHELL		= /bin/sh
+endif
+MKINSTALLDIR	= $(TOPDIR)/config/mkinstalldirs
+RSC             = rc.exe
+RM		= rm
+RMALL           = rm -rf
+RMDIR           = rmdir
+
+
+REVERSETOPDIR   = $(subst /,\,$(TOPDIR))
+
+#
+# File name extensions
+#
+
+APP_EXT         = .exe
+ARCH_EXT        = lib
+LIB_PREFIX	= 
+LIB_SUFFIX	= .lib
+OBJ_EXT		= obj
+SHLIB_EXT	= dll
+
+#
+# Command switches
+#
+
+DEFINE_SW	= /D
+INCL_SW		= /I
+LIB_SW		= /
+LINK_SW		= 
+
+
+#
+# Endian definition, could be little or big
+#
+
+BIG_ENDIAN          = 0
+
+#
+#Compilation and linking flags
+#
+
+# These flags are appropriate for a compiling with Visual C++ 5.0
+# With these flags, you could run purify.
+#
+
+WINCPP_DEBUG	= /EHsc /D_DEBUG /Zi $(CPP_DEBUG) 
+WINCPP_RELEASE	= /EHsc /Gy /Od /DNDEBUG $(CPP_RELEASE) 
+LINK_DEBUG	= /DEBUG /INCREMENTAL:no /FIXED:NO
+LINK_RELEASE	= /INCREMENTAL:no /OPT:REF
+
+#flags
+
+# These flags are appropriate for a compiling with Visual C++ 4.0
+# With these flags, you could run purify.
+#
+
+#LINK_DEBUG	= /DEBUG /INCREMENTAL:no /debugtype:cv
+#WINCPP_RELEASE	= /EHsc /Gi- /Gy /O2 /DNDEBUG $(CPP_RELEASE) 
+
+
+SMARTHEAP_LIB =
+
+ifneq ($(CFG),release)
+OPTIMIZATION	= $(WINCPP_DEBUG)
+LINK_OPTIMIZATION = $(LINK_DEBUG)
+else
+OPTIMIZATION  = $(WINCPP_RELEASE)
+LINK_OPTIMIZATION = $(LINK_RELEASE)
+endif
+
+SHLIB_CFLAGS	=
+SHLIB_LDFLAGS	= /DLL
+COMMON_LDFLAGS	= /DEBUG
+
+#
+# Standard location of compiled component libraries
+#
+
+LINKDIR		= $(LIBDIR)
+
+#
+# INCLUDE locations for include command
+#
+
+SYSTEM_INCLUDE	= $(patsubst %,$(INCL_SW)%,$(subst \,/,$(subst ;, ,$(INCLUDE))))
+COMPAT_INCLUDE  = $(INCL_SW)$(TOPDIR)/include/win32/compat
+
+RPC_INCLUDE     = $(INCL_SW)$(TOPDIR)/external/rpc_win32/rpc
+SYS_INCLUDE     = $(INCL_SW)$(TOPDIR)/include/win32/sys
+
+# Library locations for link command
+
+WIN_LINKLIB           =  user32.lib gdi32.lib wsock32.lib advapi32.lib kernel32.lib
+#LXLIB_LINKLIB         = $(LIBDIR)/lxlib.lib
+ODBC_LINKLIB          = odbc32.lib odbccp32.lib
+RPC_LINKLIB           = $(LIBDIR)/static/rpc.lib
+
+#
+# rules
+#
+
+COMMON_CFLAGS = /D_WINDOWS /DWIN32 /D_MBCS \
+	/Dhypot=_hypot /DNO_DIRENT_H \
+	/DSIGQUIT=SIGBREAK /Dioctl=Ioctl /DSIGPIPE=SIGTERM \
+	/DSIGHUP=SIGTERM /DSIGALRM=SIGTERM   /Dpopen=_popen \
+	/Dpclose=_pclose \
+	/DMISSING_DLFCN_H \
+	$(OPTIMIZATION) \
+	/W3 /MD /c /Fpheaders.pch
+
+#FLAGS_X86DEF = /D_X86_
+
+$(subst :,\:,$(ARCHGEN)): $(OBJECTS)
+	@echo Making archive file: $@
+	$(AR) /OUT:$@ $^ 
+	@echo $@ made successfully ...
+
+DEF_FILE=$(TOBEGEN_STRIPPED).def
+RES_FILE=$(TOBEGEN).res
+RC_FILE=$(TOBEGEN).rc
+
+$(subst :,\:,$(DYNAGEN)): $(DEF_FILE) $(OBJECTS)
+	@echo Making dynamic file: $@
+	@echo 
+	$(SHLIB_LD) /DLL $(LINK_OPTIMIZATION) \
+	$(filter %.$(OBJ_EXT),$^) $(LINK_LIBS) /DEF:$(filter %.def,$^) \
+	/OUT:$(TOBEGEN).dll \
+	/IMPLIB:$(TOPDIR)/lib/$(TARGET)/$(LIB_PREFIX)$(TOBEGEN).$(ARCH_EXT) \
+	/OUT:$@
+
+ifndef WITHICON
+$(subst :,\:,$(PROGGEN)): $(OBJECTS)
+	@echo Making executable file:  $@
+	$(LD) $^ $(LINK_LIBS) \
+	$(LINK_OPTIMIZATION) $(SMARTHEAP_LINKLIB)  \
+	/OUT:$@
+
+else
+$(subst :,\:,$(PROGGEN)): $(RES_FILE) $(OBJECTS)
+	@echo Making executable file:  $@
+	$(LD) $(filter %.$(OBJ_EXT),$^) $(LINK_LIBS) \
+	$(filter %.res,$^) \
+	$(LINK_OPTIMIZATION) $(SMARTHEAP_LINKLIB) \
+	/OUT:$@
+endif
+
+
+%.obj: %.c 
+	$(CC) $(CFLAGS) $(CPPFLAGS) $< 
+
+$(subst :,\:,$(RES_FILE)): $(RC_FILE)
+	$(RSC) /fo"$@" $(GENERAL_INCLUDE) $(TCLTK_INCLUDE) $^
+

configure

@@ -672,6 +672,7 @@ infodir
 docdir
 oldincludedir
 includedir
+runstatedir
 localstatedir
 sharedstatedir
 sysconfdir
@@ -753,6 +754,7 @@ datadir='${datarootdir}'
 sysconfdir='${prefix}/etc'
 sharedstatedir='${prefix}/com'
 localstatedir='${prefix}/var'
+runstatedir='${localstatedir}/run'
 includedir='${prefix}/include'
 oldincludedir='/usr/include'
 docdir='${datarootdir}/doc/${PACKAGE}'
@@ -1005,6 +1007,15 @@ do
   | -silent | --silent | --silen | --sile | --sil)
     silent=yes ;;
 
+  -runstatedir | --runstatedir | --runstatedi | --runstated \
+  | --runstate | --runstat | --runsta | --runst | --runs \
+  | --run | --ru | --r)
+    ac_prev=runstatedir ;;
+  -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \
+  | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \
+  | --run=* | --ru=* | --r=*)
+    runstatedir=$ac_optarg ;;
+
   -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
     ac_prev=sbindir ;;
   -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
@@ -1142,7 +1153,7 @@ fi
 for ac_var in	exec_prefix prefix bindir sbindir libexecdir datarootdir \
 		datadir sysconfdir sharedstatedir localstatedir includedir \
 		oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
-		libdir localedir mandir
+		libdir localedir mandir runstatedir
 do
   eval ac_val=\$$ac_var
   # Remove trailing slashes.
@@ -1295,6 +1306,7 @@ Fine tuning of the installation directories:
   --sysconfdir=DIR        read-only single-machine data [PREFIX/etc]
   --sharedstatedir=DIR    modifiable architecture-independent data [PREFIX/com]
   --localstatedir=DIR     modifiable single-machine data [PREFIX/var]
+  --runstatedir=DIR       modifiable per-process data [LOCALSTATEDIR/run]
   --libdir=DIR            object code libraries [EPREFIX/lib]
   --includedir=DIR        C header files [PREFIX/include]
   --oldincludedir=DIR     C header files for non-gcc [/usr/include]
@@ -2058,7 +2070,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 
-OGDI_VERSION=3.2.0
+OGDI_VERSION=3.2.1
 OGDI_MAJOR=3
 OGDI_MINOR=2
 

configure.in

 dnl Process this file with autoconf to produce a configure script.
 AC_INIT(config/unix.mak)
 
-OGDI_VERSION=3.2.0
+OGDI_VERSION=3.2.1
 OGDI_MAJOR=3
 OGDI_MINOR=2
 

contrib/gdal/.cvsignore

+OBJ.*

contrib/gdal/gbgetsymbol.c

 /******************************************************************************
- * $Id: gbgetsymbol.c,v 1.1 2001/05/04 03:13:35 warmerda Exp $
+ * $Id$
  *
  * Project:  GDAL Bridge 
  * Purpose:  Fetch a function pointer from a shared library / DLL.
@@ -29,8 +29,8 @@
  * DEALINGS IN THE SOFTWARE.
  ******************************************************************************
  *
- * $Log: gbgetsymbol.c,v $
- * Revision 1.1  2001/05/04 03:13:35  warmerda
+ * $Log$
+ * Revision 1.1  2001-05-04 03:13:35  warmerda
  * New
  *
  * Revision 1.1  2000/10/25 16:43:20  warmerda

contrib/gdal/gdal_serv.c

 /**********************************************************************
- * $Id: gdal_serv.c,v 1.1 2001/05/04 03:13:35 warmerda Exp $
+ * $Id$
  *
  * Project:  GDAL OGDI Server
  * Purpose:  Implements dynamic entry points into the driver. 
@@ -27,8 +27,8 @@
  * DEALINGS IN THE SOFTWARE.
  **********************************************************************
  * 
- * $Log: gdal_serv.c,v $
- * Revision 1.1  2001/05/04 03:13:35  warmerda
+ * $Log$
+ * Revision 1.1  2001-05-04 03:13:35  warmerda
  * New
  *
  * Revision 1.2  2000/08/28 20:21:47  warmerda

contrib/gdal/gdal_serv.h

 /**********************************************************************
- * $Id: gdal_serv.h,v 1.1 2001/05/04 03:13:35 warmerda Exp $
+ * $Id$
  *
  * Project:  GDAL OGDI Server
  * Purpose:  Declarations.
@@ -27,8 +27,8 @@
  * DEALINGS IN THE SOFTWARE.
  **********************************************************************
  * 
- * $Log: gdal_serv.h,v $
- * Revision 1.1  2001/05/04 03:13:35  warmerda
+ * $Log$
+ * Revision 1.1  2001-05-04 03:13:35  warmerda
  * New
  *
  * Revision 1.2  2000/08/28 20:21:47  warmerda

contrib/gdal/gdalbridge.c

 /******************************************************************************
- * $Id: gdalbridge.c,v 1.1 2001/05/04 03:13:35 warmerda Exp $
+ * $Id$
  *
  * Project:  GDAL Bridge 
  * Purpose:  Implementation of GDALBridgeInitialize()
@@ -29,8 +29,8 @@
  * DEALINGS IN THE SOFTWARE.
  ******************************************************************************
  *
- * $Log: gdalbridge.c,v $
- * Revision 1.1  2001/05/04 03:13:35  warmerda
+ * $Log$
+ * Revision 1.1  2001-05-04 03:13:35  warmerda
  * New
  *
  * Revision 1.1  2000/10/25 16:43:20  warmerda

contrib/gdal/gdalbridge.h

 /******************************************************************************
- * $Id: gdalbridge.h,v 1.1 2001/05/04 03:13:35 warmerda Exp $
+ * $Id$
  *
  * Project:  GDAL Bridge 
  * Purpose:  Declarations for GDAL Bridge support.
@@ -29,8 +29,8 @@
  * DEALINGS IN THE SOFTWARE.
  ******************************************************************************
  *
- * $Log: gdalbridge.h,v $
- * Revision 1.1  2001/05/04 03:13:35  warmerda
+ * $Log$
+ * Revision 1.1  2001-05-04 03:13:35  warmerda
  * New
  *
  * Revision 1.1  2000/10/25 16:43:20  warmerda

contrib/ogdi_import/.cvsignore

+OBJ.*

contrib/ogdi_import/ogdi_import.c

 /******************************************************************************
- * $Id: ogdi_import.c,v 1.13 2007/02/12 15:52:57 cbalint Exp $
+ * $Id$
  *
  * Project:  OGDI Contributed Clients
  * Purpose:  Simple console import to shapefile/raw raster.
@@ -19,8 +19,8 @@
  * It is provided "as is" without express or implied warranty.
  ******************************************************************************
  *
- * $Log: ogdi_import.c,v $
- * Revision 1.13  2007/02/12 15:52:57  cbalint
+ * $Log$
+ * Revision 1.13  2007-02-12 15:52:57  cbalint
  *
  *    Preliminary cleanup.
  *    Get rif of unitialized variables, and unused ones.

contrib/ogdi_info/.cvsignore

+OBJ.*