Ticket #2282: zoo-kernel-fixes.patch

File zoo-kernel-fixes.patch, 2.3 KB (added by djay, 4 years ago)

Patch fixing configure.ac, removing the references from ParameterType_ComplexInputImage and ParameterType_ComplexOutputImage (for zcfg2ptb and service_internal_otb)

  • thirds/otb2zcfg/otb2zcfg.cxx

     
    284284                printOutputComplexImage(m_Application->GetParameterComplexOutputImagePixelType(paramKey));
    285285              }else{
    286286                std::cout << "   <ComplexData>" << std::endl;
    287                 if(type == ParameterType_InputImage || type == ParameterType_InputImageList || type == ParameterType_ComplexInputImage){
     287                if(type == ParameterType_InputImage || type == ParameterType_InputImageList){
    288288                  printImages();
    289289                }
    290290                else
    … …  
    337337       
    338338        if(paramKey!="inxml" && paramKey!="outxml" &&
    339339           ((type == ParameterType_OutputVectorData || type == ParameterType_OutputImage
    340              || type == ParameterType_OutputImage || type == ParameterType_ComplexOutputImage
     340             || type == ParameterType_OutputImage //|| type == ParameterType_ComplexOutputImage
    341341             || type == ParameterType_OutputFilename) || role==1) && type != ParameterType_Group){
    342342          hasOutput=1;
    343343          std::vector<std::string> values;

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

     
    414414# Check headers file
    415415CPPFLAGS_SAVE="$CPPFLAGS"
    416416CPPFLAGS="$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])])
    419419
    420420AC_SUBST([PROJ_CPPFLAGS])
    421421AC_SUBST([PROJ_LDFLAGS])

  • zoo-project/zoo-kernel/service_internal_otb.c

     
    361361                  }
    362362                  else
    363363                    if(type == ParameterType_InputImage
    364                        || type == ParameterType_ComplexInputImage || type == ParameterType_InputVectorData
     364                       || type == ParameterType_InputVectorData
    365365                       || type == ParameterType_InputFilename){
    366366                      m_Application->SetParameterString(paramKey, test->value);
    367367                  }