Ticket #2063: osgeolive.patch

File osgeolive.patch, 6.8 KB (added by djay, 4 years ago)

Patch

  • caching.c

     
    4040 * @warning make sure to free resources returned by this function
    4141 */
    4242char* getMd5(char* url){
    43   EVP_MD_CTX md5ctx;
     43  EVP_MD_CTX *md5ctx=EVP_MD_CTX_create();
    4444  char* fresult=(char*)malloc((EVP_MAX_MD_SIZE+1)*sizeof(char));
    4545  unsigned char result[EVP_MAX_MD_SIZE];
    4646  unsigned int len;
    47   EVP_DigestInit(&md5ctx, EVP_md5());
    48   EVP_DigestUpdate(&md5ctx, url, strlen(url));
    49   EVP_DigestFinal_ex(&md5ctx,result,&len);
    50   EVP_MD_CTX_cleanup(&md5ctx);
     47  EVP_DigestInit(md5ctx, EVP_md5());
     48  EVP_DigestUpdate(md5ctx, url, strlen(url));
     49  EVP_DigestFinal_ex(md5ctx,result,&len);
     50  EVP_MD_CTX_destroy(md5ctx);
    5151  int i;
    5252  for(i = 0; i < len; i++){
    5353    if(i>0){
  • configure.ac

     
    830830        if test "$IVERS" == "$ITKVERS"; then
    831831           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"
    832832        else
    833                 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"
     833                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"
    834834        fi
    835835
    836836        if test -a "${OTBPATH}/include/OTB-${OTBVERS}" ; then
     
    858858        #echo $OTB_LDFLAGS
    859859        #UVERS="$(echo -e '5.8\n$OTBVERS' | sort -r | head -n1)"
    860860        #if test "$OTBVERS" ==  "$UVERS" ; then
    861         AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include "otbWrapperApplicationRegistry.h"]],[[std::vector<std::string> list = otb::Wrapper::ApplicationRegistry::GetAvailableApplications();]])],
    862                         [AC_MSG_RESULT([checking for GetAvailableApplications... yes])],[AC_MSG_ERROR([checking for GetAvailableApplications... failed])])
     861        #AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include "otbWrapperApplicationRegistry.h"]],[[std::vector<std::string> list = otb::Wrapper::ApplicationRegistry::GetAvailableApplications();]])],
     862        #               [AC_MSG_RESULT([checking for GetAvailableApplications... yes])],[AC_MSG_ERROR([checking for GetAvailableApplications... failed])])
    863863        #else
    864864        #       AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include "otbWrapperApplication.h"]],[[std::vector<std::string> list = otb::Wrapper::ApplicationRegistry::GetAvailableApplication();]])],
    865865        #                                                  [AC_MSG_RESULT([checking for GetAvailableApplication... yes])],[AC_MSG_ERROR([checking for GetAvailableApplication... failed])])
  • otbZooWatcher.cxx

     
    5151ZooWatcher
    5252::StartFilter()
    5353{
    54   m_TimeProbe.Start();
     54//  m_TimeProbe.Start();
    5555}
    5656
    5757void
     
    5858ZooWatcher
    5959::EndFilter()
    6060{
    61   m_TimeProbe.Stop();
     61/*  m_TimeProbe.Stop();
    6262  std::ostringstream elapsedTime;
    6363  elapsedTime.precision(1);
    6464  elapsedTime << m_TimeProbe.GetMean();
     
    6767            << elapsedTime.str()
    6868            << " seconds)"
    6969            << std::endl;
     70            */
    7071}
  • response_print.c

     
    2222 * THE SOFTWARE.
    2323 */
    2424
    25 #include "response_print.h"
    26 #include "request_parser.h"
    27 #include "server_internal.h"
    28 #include "service_internal.h"
    2925#ifdef USE_MS
    3026#include "service_internal_ms.h"
    3127#else
    3228#include "cpl_vsi.h"
    3329#endif
     30#include "response_print.h"
     31#include "request_parser.h"
     32#include "server_internal.h"
     33#include "service_internal.h"
    3434
    35 #ifndef TRUE
    36 #define TRUE 1
    37 #endif
    38 #ifndef FALSE
    39 #define FALSE -1
    40 #endif
    4135
    4236#ifndef WIN32
    4337#include <dlfcn.h>
  • response_print.h

     
    7979#endif
    8080#endif
    8181#ifndef WIN32
    82 #include <xlocale.h>
     82#include <locale.h>
    8383#endif
    8484#include "ulinet.h"
    8585
  • service_internal.h

     
    8181#include <unistd.h>
    8282#endif
    8383#ifndef WIN32
    84 #include <xlocale.h>
     84#include <locale.h>
    8585#endif
    8686
    8787#include "service.h"
  • service_internal_ms.h

     
    2525#define ZOO_SERVICE_INTERNAL_MS_H 1
    2626
    2727#include <sys/stat.h>
    28 #include "service_internal.h"
    29 #include "service.h"
    3028#include "cpl_conv.h"
    3129#include "cpl_multiproc.h"
    3230#include "ogr_api.h"
    3331#include "gdal.h"
    3432#include "ogr_srs_api.h"
     33#include "service_internal.h"
     34#include "service.h"
    3535#include "ulinet.h"
    3636#ifdef WIN32
    3737#include <unistd.h>
  • service_internal_python.h

     
    2727
    2828#pragma once
    2929
     30#include <Python.h>
    3031#include "service_internal.h"
    3132#include "response_print.h"
    32 #include <Python.h>
    3333#include "cgic.h"
    3434#ifdef WIN32
    3535#include <windows.h>
  • ulinet.h

     
    4242#endif
    4343#include "jsapi.h"
    4444#endif
    45 #ifndef bool
     45#ifndef __cplusplus
    4646#define bool int
    47 #endif
    48 #ifndef true
    4947#define true 1
    5048#define false 0
    5149#endif