Changeset 980

Timestamp:

Dec 30, 2020, 4:30:02 PM (4 years ago)

Author:

djay

Message:

Remove wrong tag and set 1.8.0 version in configure.ac and Makefile.in

Files:

• tags/rel-1.8.0 (deleted)
• trunk/zoo-project/HISTORY.txt (modified) (1 diff)
• trunk/zoo-project/zoo-kernel/Makefile.in (modified) (1 diff)
• trunk/zoo-project/zoo-kernel/configure.ac (modified) (1 diff)
• trunk/zoo-project/zoo-services/cgal/voronoi.c (modified) (1 diff)
• trunk/zoo-project/zoo-services/gdal/profile/service.c (modified) (1 diff)

trunk/zoo-project/HISTORY.txt

@@ -1 @@
-Version 1.8.0-dev
+Version 1.8.0
   * Support raw response in OGC API - Processes
   * Add a ZOO-API section to the howtos documentation

trunk/zoo-project/zoo-kernel/Makefile.in

@@ -4 +4 @@
 
 version.h: Makefile
-        echo "#define ZOO_VERSION \"1.8.0-rc1 `svnversion`\"" > version.h
+        echo "#define ZOO_VERSION \"1.8.0 `svnversion`\"" > version.h
         echo "@ETC_DEF@" >> version.h
         echo "#define LOCALEDIR \"@localedir@\"" >>  version.h

trunk/zoo-project/zoo-kernel/configure.ac

@@ -1 @@
-AC_INIT([ZOO Kernel], [1.8.0-rc1], [bugs@zoo-project.org])
+AC_INIT([ZOO Kernel], [1.8.0], [bugs@zoo-project.org])
 
 AC_CONFIG_MACRO_DIR([macros])

trunk/zoo-project/zoo-services/cgal/voronoi.c

@@ -198 +198 @@
     int nr = 0;
     int nf = 0;
-    Face_iterator fit =T.faces_begin();
-    FILE* f=fopen("/tmp/toto.log","w+");
-    for ( ; fit !=T.faces_end(); ++fit) {
-      fprintf(stderr," *** %s %d %d %d\n",__FILE__,__LINE__,nf,fit.info());
-      fflush(stderr);
-      
-      nf++;
-    }
-    fclose(f);
     Edge_iterator eit =T.edges_begin();
     for ( ; eit !=T.edges_end(); ++eit) {

trunk/zoo-project/zoo-services/gdal/profile/service.c

@@ -35 +35 @@
 #include "cpl_conv.h"
 #include "ogr_api.h"
-#if !defined(WIN32) && GDAL_VERSION_MAJOR >= 2
-#include <gdal_priv.h>
-#endif
 
 #ifdef ZOO_SERVICE