Ticket #2282: zoo-patch-test4.patch
File zoo-patch-test4.patch, 5.6 KB (added by , 4 years ago) |
---|
-
thirds/otb2zcfg/otb2zcfg.cxx
221 221 222 222 if(type == ParameterType_StringList || type == ParameterType_String || type == ParameterType_Float 223 223 || type == ParameterType_Int || type == ParameterType_Choice || type == ParameterType_ListView 224 || type == ParameterType_RAM || type == ParameterType_Empty|| type == ParameterType_Directory){224 || type == ParameterType_RAM /*|| type == ParameterType_Empty*/ || type == ParameterType_Directory){ 225 225 std::cout << " <LiteralData>" << std::endl; 226 226 std::string lt; 227 227 if(type == ParameterType_Int || type == ParameterType_RAM) … … 232 232 || type == ParameterType_Choice || type == ParameterType_Directory 233 233 || type == ParameterType_ListView) 234 234 lt="string"; 235 if(type == ParameterType_Empty)236 lt="boolean"; 235 /*if(type == ParameterType_Empty) 236 lt="boolean";*/ 237 237 std::cout << " dataType = " << lt << std::endl; 238 238 if(type == ParameterType_Choice || type == ParameterType_ListView){ 239 239 const std::vector<std::string> nList = m_Application->GetChoiceNames(paramKey); … … 280 280 printOutputImage(m_Application->GetParameterOutputImagePixelType(paramKey)); 281 281 } 282 282 else{ 283 if(type == ParameterType_ComplexOutputImage){283 /*if(type == ParameterType_ComplexOutputImage){ 284 284 printOutputComplexImage(m_Application->GetParameterComplexOutputImagePixelType(paramKey)); 285 }else {285 }else*/{ 286 286 std::cout << " <ComplexData>" << std::endl; 287 if(type == ParameterType_InputImage || type == ParameterType_InputImageList || type == ParameterType_ComplexInputImage){287 if(type == ParameterType_InputImage || type == ParameterType_InputImageList){ 288 288 printImages(); 289 289 } 290 290 else … … 337 337 338 338 if(paramKey!="inxml" && paramKey!="outxml" && 339 339 ((type == ParameterType_OutputVectorData || type == ParameterType_OutputImage 340 || type == ParameterType_OutputImage || type == ParameterType_ComplexOutputImage340 || type == ParameterType_OutputImage //|| type == ParameterType_ComplexOutputImage 341 341 || type == ParameterType_OutputFilename) || role==1) && type != ParameterType_Group){ 342 342 hasOutput=1; 343 343 std::vector<std::string> values; … … 355 355 std::cout << " Abstract = " << paramKey << std::endl; 356 356 } 357 357 358 if(type == ParameterType_OutputImage || type == ParameterType_ComplexOutputImage){358 if(type == ParameterType_OutputImage){// || type == ParameterType_ComplexOutputImage){ 359 359 std::cout << " <ComplexData>" << std::endl; 360 360 printImages(); 361 361 std::cout << " </ComplexData>" << std::endl; -
zoo-project/zoo-kernel/configure.ac
414 414 # Check headers file 415 415 CPPFLAGS_SAVE="$CPPFLAGS" 416 416 CPPFLAGS="$PROJ_CPPFLAGS" 417 AC_CHECK_HEADERS([proj_api.h],418 [], [AC_MSG_ERROR([could not find headers include related to PROJ4])])417 #AC_CHECK_HEADERS([proj_api.h], 418 # [], [AC_MSG_ERROR([could not find headers include related to PROJ4])]) 419 419 420 420 AC_SUBST([PROJ_CPPFLAGS]) 421 421 AC_SUBST([PROJ_LDFLAGS]) … … 617 617 618 618 # Ensure we can link against libphp 619 619 LIBS_SAVE="$LIBS" 620 LIBS="$PYTHON_LDFLAG S"621 PY _LIB=`$PYTHONCONFIG --libs | sed \622 -e 's/.*\(python[[0-9]]\.[[0-9]]\).*/\1/'`623 AC_CHECK_LIB([$ PY_LIB], [PyObject_CallObject], [], [AC_MSG_ERROR([could not find libpython])], [])620 LIBS="$PYTHON_LDFLAG -lpython${PYTHON_VERS}" 621 PYTHON_LDFLAG="$LIBS" 622 PY_LIB=`$PYTHONCONFIG --libs` 623 AC_CHECK_LIB([$LIBS], [PyObject_CallObject], [], [AC_MSG_ERROR([could not find libpython])], []) 624 624 LIBS="$LIBS_SAVE" 625 625 fi 626 626 -
zoo-project/zoo-kernel/service_internal_otb.c
361 361 } 362 362 else 363 363 if(type == ParameterType_InputImage 364 || type == ParameterType_ ComplexInputImage || type == ParameterType_InputVectorData364 || type == ParameterType_InputVectorData 365 365 || type == ParameterType_InputFilename){ 366 366 m_Application->SetParameterString(paramKey, test->value); 367 367 } -
zoo-project/zoo-kernel/ulinet.h
33 33 #endif 34 34 #include "jsapi.h" 35 35 #endif 36 #include "fcgi_stdio.h"36 //#include "fcgi_stdio.h" 37 37 #include <stdlib.h> 38 38 #include <fcntl.h> 39 39 #include <curl/curl.h> -
zoo-project/zoo-services/ogr/base-vect-ops/service.c
37 37 #include "service.h" 38 38 #include "service_internal.h" 39 39 40 extern "C" {41 40 #include <libxml/tree.h> 42 41 #include <libxml/parser.h> 43 42 #include <libxml/xpath.h> 44 43 #include <libxml/xpathInternals.h> 45 44 46 /*#include <openssl/sha.h> 47 #include <openssl/hmac.h> 48 #include <openssl/evp.h> 49 #include <openssl/bio.h> 50 #include <openssl/buffer.h> 51 */ 45 extern "C" { 52 46 47 53 48 void printExceptionReportResponse(maps*,map*); 54 49 char *base64(const char *input, int length); 55 50