Ticket #2063: osgeolive.patch

caching.c

@@ -40 +40 @@
  * @warning make sure to free resources returned by this function
  */
 char* getMd5(char* url){
-  EVP_MD_CTX md5ctx;
+  EVP_MD_CTX *md5ctx=EVP_MD_CTX_create();
   char* fresult=(char*)malloc((EVP_MAX_MD_SIZE+1)*sizeof(char));
   unsigned char result[EVP_MAX_MD_SIZE];
   unsigned int len;
-  EVP_DigestInit(&md5ctx, EVP_md5());
-  EVP_DigestUpdate(&md5ctx, url, strlen(url));
-  EVP_DigestFinal_ex(&md5ctx,result,&len);
-  EVP_MD_CTX_cleanup(&md5ctx);
+  EVP_DigestInit(md5ctx, EVP_md5());
+  EVP_DigestUpdate(md5ctx, url, strlen(url));
+  EVP_DigestFinal_ex(md5ctx,result,&len);
+  EVP_MD_CTX_destroy(md5ctx);
   int i;
   for(i = 0; i < len; i++){
     if(i>0){

configure.ac

@@ -830 +830 @@
         if test "$IVERS" == "$ITKVERS"; then
            ITK_LDFLAGS="-lITKBiasCorrection-$ITKVERS -lITKCommon-$ITKVERS -lITKIOImageBase-$ITKVERS -lITKKLMRegionGrowing-$ITKVERS -lITKLabelMap-$ITKVERS -lITKMesh-$ITKVERS -lITKMetaIO-$ITKVERS -lITKOptimizers-$ITKVERS -lITKPath-$ITKVERS -lITKPolynomials-$ITKVERS -lITKQuadEdgeMesh-$ITKVERS -lITKSpatialObjects-$ITKVERS -lITKStatistics-$ITKVERS -lITKVNLInstantiation-$ITKVERS -lITKWatersheds-$ITKVERS -litkNetlibSlatec-$ITKVERS -litksys-$ITKVERS -litkv3p_netlib-$ITKVERS -litkvcl-$ITKVERS -litkvnl-$ITKVERS"
         else
-                ITK_LDFLAGS="-lITKBiasCorrection-$ITKVERS -lITKCommon-$ITKVERS -lITKIOImageBase-$ITKVERS -lITKKLMRegionGrowing-$ITKVERS -lITKLabelMap-$ITKVERS -lITKMesh-$ITKVERS -lITKMetaIO-$ITKVERS -lITKOptimizers-$ITKVERS -lITKPath-$ITKVERS -lITKPolynomials-$ITKVERS -lITKQuadEdgeMesh-$ITKVERS -lITKSpatialObjects-$ITKVERS -lITKStatistics-$ITKVERS -lITKVNLInstantiation-$ITKVERS -lITKWatersheds-$ITKVERS -litkNetlibSlatec-$ITKVERS -litksys-$ITKVERS -litkv3p_lsqr-$ITKVERS -litkv3p_netlib-$ITKVERS -litkvcl-$ITKVERS -litkvnl-$ITKVERS -litkvnl_algo-$ITKVERS"
+                ITK_LDFLAGS="-lITKBiasCorrection-$ITKVERS -lITKCommon-$ITKVERS -lITKIOImageBase-$ITKVERS -lITKKLMRegionGrowing-$ITKVERS -lITKLabelMap-$ITKVERS -lITKMesh-$ITKVERS -lITKMetaIO-$ITKVERS -lITKOptimizers-$ITKVERS -lITKPath-$ITKVERS -lITKPolynomials-$ITKVERS -lITKQuadEdgeMesh-$ITKVERS -lITKSpatialObjects-$ITKVERS -lITKStatistics-$ITKVERS -lITKVNLInstantiation-$ITKVERS -lITKWatersheds-$ITKVERS -litkNetlibSlatec-$ITKVERS -litksys-$ITKVERS -litkv3p_netlib-$ITKVERS -litkvcl-$ITKVERS -litkvnl-$ITKVERS -litkvnl_algo-$ITKVERS"
         fi
 
         if test -a "${OTBPATH}/include/OTB-${OTBVERS}" ; then 
@@ -858 +858 @@
         #echo $OTB_LDFLAGS
         #UVERS="$(echo -e '5.8\n$OTBVERS' | sort -r | head -n1)"
         #if test "$OTBVERS" ==  "$UVERS" ; then 
-        AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include "otbWrapperApplicationRegistry.h"]],[[std::vector<std::string> list = otb::Wrapper::ApplicationRegistry::GetAvailableApplications();]])],
-                        [AC_MSG_RESULT([checking for GetAvailableApplications... yes])],[AC_MSG_ERROR([checking for GetAvailableApplications... failed])])
+        #AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include "otbWrapperApplicationRegistry.h"]],[[std::vector<std::string> list = otb::Wrapper::ApplicationRegistry::GetAvailableApplications();]])],
+        #               [AC_MSG_RESULT([checking for GetAvailableApplications... yes])],[AC_MSG_ERROR([checking for GetAvailableApplications... failed])])
         #else
         #       AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include "otbWrapperApplication.h"]],[[std::vector<std::string> list = otb::Wrapper::ApplicationRegistry::GetAvailableApplication();]])],
         #                                                  [AC_MSG_RESULT([checking for GetAvailableApplication... yes])],[AC_MSG_ERROR([checking for GetAvailableApplication... failed])])

otbZooWatcher.cxx

@@ -51 +51 @@
 ZooWatcher
 ::StartFilter()
 {
-  m_TimeProbe.Start();
+//  m_TimeProbe.Start();
 }
 
 void
@@ -58 +58 @@
 ZooWatcher
 ::EndFilter()
 {
-  m_TimeProbe.Stop();
+/*  m_TimeProbe.Stop();
   std::ostringstream elapsedTime;
   elapsedTime.precision(1);
   elapsedTime << m_TimeProbe.GetMean();
@@ -67 +67 @@
             << elapsedTime.str()
             << " seconds)"
             << std::endl;
+            */
 }

response_print.c

@@ -22 +22 @@
  * THE SOFTWARE.
  */
 
-#include "response_print.h"
-#include "request_parser.h"
-#include "server_internal.h"
-#include "service_internal.h"
 #ifdef USE_MS
 #include "service_internal_ms.h"
 #else
 #include "cpl_vsi.h"
 #endif
+#include "response_print.h"
+#include "request_parser.h"
+#include "server_internal.h"
+#include "service_internal.h"
 
-#ifndef TRUE
-#define TRUE 1
-#endif
-#ifndef FALSE
-#define FALSE -1
-#endif
 
 #ifndef WIN32
 #include <dlfcn.h>

response_print.h

@@ -79 +79 @@
 #endif
 #endif
 #ifndef WIN32
-#include <xlocale.h>
+#include <locale.h>
 #endif
 #include "ulinet.h"
 

service_internal.h

@@ -81 +81 @@
 #include <unistd.h>
 #endif
 #ifndef WIN32
-#include <xlocale.h>
+#include <locale.h>
 #endif
 
 #include "service.h"

service_internal_ms.h

@@ -25 +25 @@
 #define ZOO_SERVICE_INTERNAL_MS_H 1
 
 #include <sys/stat.h>
-#include "service_internal.h"
-#include "service.h"
 #include "cpl_conv.h"
 #include "cpl_multiproc.h"
 #include "ogr_api.h"
 #include "gdal.h"
 #include "ogr_srs_api.h"
+#include "service_internal.h"
+#include "service.h"
 #include "ulinet.h"
 #ifdef WIN32
 #include <unistd.h>

service_internal_python.h

@@ -27 +27 @@
 
 #pragma once 
 
+#include <Python.h>
 #include "service_internal.h"
 #include "response_print.h"
-#include <Python.h>
 #include "cgic.h"
 #ifdef WIN32
 #include <windows.h>

ulinet.h

@@ -42 +42 @@
 #endif
 #include "jsapi.h"
 #endif
-#ifndef bool
+#ifndef __cplusplus
 #define bool int
-#endif
-#ifndef true
 #define true 1
 #define false 0
 #endif