1. 16 Jan, 2019 1 commit
  2. 16 Oct, 2018 1 commit
  3. 25 Jul, 2018 1 commit
  4. 19 Jul, 2018 2 commits
  5. 18 Jul, 2018 3 commits
    • Julien Michel's avatar
    • Victor Poughon's avatar
      REFAC: remove unnecessary calls to c_str · ee124eea
      Victor Poughon authored
      This was done with this script:
      
          #!/bin/bash
      
          set -eou pipefail
      
          # Use C++11 sstream constructor from string
          # Exclude 'ThirdParty' because it uses ossimFilename type
          find Modules/ Examples/ -not -iwholename "*ThirdParty*" -type f -print0 | xargs -0 sed -i -E "s/std::ifstream (.*)\((.*)\.c_str\(\)/std::ifstream \1\(\2/"
          find Modules/ Examples/ -not -iwholename "*ThirdParty*" -type f -print0 | xargs -0 sed -i -E "s/std::ofstream (.*)\((.*)\.c_str\(\)/std::ofstream \1\(\2/"
      
          # Use C++11 ::open(const std::string&) of ifstream, ofstream, etc.
          # Exclude ThirdParty because of ossimFilename type
          find Modules/ Examples/ -not -iwholename "*ThirdParty*" -type f -print0 | xargs -0 sed -i -E "s/\.open\((.*).c_str\(\)/\.open\(\1/"
      
          # No need for c_str when outputing to std::cout and such
          find Modules/ Examples/ -type f -print0 | xargs -0 sed -i -E "s/\.c_str\(\) ?<</ <</"
      
          # Use itk::ExceptionObject::SetDescription and SetLocation string versions
          find Modules/ Examples/ -type f -print0 | xargs -0 sed -i -E "s/e\.SetDescription\((.*)\.c_str\(\)\)/e\.SetDescription\(\1\)/"
          find Modules/ Examples/ -type f -print0 | xargs -0 sed -i -E "s/e\.SetLocation\((.*)\.c_str\(\)\)/e\.SetLocation\(\1\)/"
      
          # Use itksys::SystemTool:: string versions
          find Modules/ Examples/ -type f -print0 | xargs -0 sed -i -E "s/itksys::SystemTools::(.*)\((.*)\.c_str\(\)/itksys::SystemTools::\1\(\2/"
          # Exclude otbLogger because it uses GetCurrentDateTime which does not have a string version
          git checkout --  Modules/Core/Common/src/otbLogger.cxx
          # Exclude test/otbOGRLayerStreamStitchingFilter.cxx because there's a double use which is not compatible with the regex
          git checkout -- Modules/Segmentation/OGRProcessing/test/otbOGRLayerStreamStitchingFilter.cxx
      ee124eea
    • Victor Poughon's avatar
      COMP: add missing string includes · fc923078
      Victor Poughon authored
      Before this commit, many files are using std::string without including
      <string>. It can work accidentally but causes issues when refactoring,
      especially if using operator <<() which is included implicitly by some
      compilers.
      
      To find guilty header files, I used:
      
          grep -l "^ *std::string" $(grep -L "#include <string>" $(find . -type f -name "*.h"))
      
      which finds all files containing "std::string" at the beginning of a line
      (usually a member or variable declaration), but not "#include <string>".
      And then this script to add the includes (plus some manual ediing):
      
          #!/usr/bin/env python3
      
          import re
          import argparse
      
          def fix_file(filename, header):
      
              with open(filename, "r") as f:
                  content = f.read()
      
              matches = list(re.finditer(r"(#include .*\n)\n", content))
              if len(matches) == 0:
                  print("no include!")
                  sys.exit(-1)
      
              pos = matches[-1].end(1)
              open(filename, "w").write(content[:pos] + "#include <{}>\n".format(header) + content[pos:])
      
          if __name__ == "__main__":
              parser = argparse.ArgumentParser()
              parser.add_argument('--header', type=str, required=True)
              parser.add_argument('files', type=str, nargs='+')
              args = parser.parse_args()
      
              for filename in args.files:
                  fix_file(filename, args.header)
      fc923078
  6. 12 Jul, 2018 2 commits
    • Laurentiu Nicola's avatar
      ENH: Use std instead of vcl headers · eb259c64
      Laurentiu Nicola authored
      find \( -name "*.hxx" -or -name "*.h" -or -name "*.cxx" \) -not -path "*ThirdParty*" -print0 | xargs -0 sed -sri "s/vcl_(algorithm|complex|cmath)\.h/\1/g"
      
      find \( -name "*.hxx" -or -name "*.h" -or -name "*.cxx" \) -not -path "*ThirdParty*" -print0 | xargs -0 sed -sri "s/std::complex\.h/complex/g"
      
      find \( -name "*.hxx" -or -name "*.h" -or -name "*.cxx" \) -not -path "*ThirdParty*" -print0 | xargs -0 sed -sri 's/#include "(algorithm|cmath|complex)"/#include <\1>/g'
      eb259c64
    • Laurentiu Nicola's avatar
      ENH: Use math functions in std:: instead of vcl · fcbf830b
      Laurentiu Nicola authored
      find \( -name "*.hxx" -or -name "*.h" -or -name "*.cxx" \) -not -path "*ThirdParty*" -print0 | xargs -0 sed -sri "s/([^<])vcl_(adjacent_find|and|binary|binary_search|copy|copy_|count|count_if|equal|equal_range|fill|fill_n|find|find_end|find_first_of|find_if|for_each|generate|generate_n|generators_|heap|includes|inplace_merge|iter_swap|lexicographical_compare|lower_bound|make_heap|max|min|max_element|merge|merge_|min_element|mismatch|next_permutation|nth_element|partial_sort|partial_sort_copy|partition|stable_partition|partitions_|pop_heap|prev_permutation|push_heap|random_shuffle|remove|remove_copy|remove_copy_if|remove_if|replace|replace_copy|replace_copy_if|replace_if|reverse|reverse_copy|rotate|rotate_copy|search|search_n|set_difference|set_intersection|set_symmetric_difference|set_union|sort|sort_|sort_heap|stable_sort|swap|swap_|swap_ranges|transform|unique|unique_copy|upper_bound|bitset|abs|acos|asin|atan|atan2|ceil|cos|cosh|exp|fabs|floor|fmod|frexp|ldexp|log|log10|modf|pow|sin|sinh|sqrt|tan|tanh|complex|real|imag|arg|norm|conj|polar|jmp_buf|longjmp|sig_atomic_t|raise|signal|va_list|ptrdiff_t|size_t|FILE|fpos_t|fopen|fclose|feof|ferror|fflush|fgetc|fgetpos|fgets|fwrite|fread|fseek|ftell|perror|clearerr|rename|fputc|fputs|freopen|fsetpos|getc|getchar|gets|putc|putchar|puts|rewind|setbuf|setvbuf|tmpfile|tmpnam|ungetc|printf|sprintf|fprintf|vprintf|vsprintf|vfprintf)/\1std::\2/g"
      
      find \( -name "*.hxx" -or -name "*.h" -or -name "*.cxx" \) -not -path "*ThirdParty*" -print0 | xargs -0 sed -sri "s/<<vcl_log/<<std::log/g"
      fcbf830b
  7. 25 Jun, 2018 2 commits
    • Manuel Grizonnet's avatar
      7fe54ded
    • Manuel Grizonnet's avatar
      ENH: rename files with txx extension to hxx · 3a1fd1fc
      Manuel Grizonnet authored
      OTB followed since the beginning the ITK convention and use .txx extension for all
      template classes. Nevertheless, some development tools do not recognize .txx
      file extension. Other tool like GitHub can't do in-browser syntax highlighting for
      txx files I think.
      
      The root problem is the use of the txx which should be changed to hxx (or hpp).
      
      In 2011, after an in-depth discussion near April 20, 2011 on the
      Insight-Developers mailing list, ITK rename all txx files to hxx (and event
      prevent the push of .txx files with a pre-commit hook). It happens is major release v4.
      
      You can find some arguments in the discussion about the change and also in other
      projects related to ITK which applied the same modification, see for instance VXL:
      
      https://github.com/vxl/vxl/issues/209
      
      This commit apply now the same modification for OTB.
      
      I understand that it will change some habit for developers and don't bring new
      features but I think that in general it is better to stay align with ITK guidelines.
      
      In my opinion, it always facilitate the use of OTB and ITK together if we share
      when we can the same code architecture, directory organization, naming
      conventions...
      3a1fd1fc
  8. 07 Jun, 2018 2 commits
  9. 29 May, 2018 1 commit
  10. 12 Mar, 2018 1 commit
  11. 01 Nov, 2017 1 commit
  12. 25 Oct, 2017 1 commit
  13. 05 Apr, 2017 1 commit
  14. 08 Mar, 2017 2 commits
  15. 23 Sep, 2016 2 commits
  16. 16 Sep, 2016 1 commit
  17. 15 Sep, 2016 1 commit
  18. 20 Jul, 2016 2 commits
  19. 05 Jul, 2016 1 commit
  20. 16 Jun, 2016 1 commit
    • Manuel Grizonnet's avatar
      STYLE: Use ITK_NULLPTR to utilize c++11 features · 0f26e689
      Manuel Grizonnet authored
          Where available, use c++11 features to identify
          potential nullptr usage errors.
      
          python run-clang-tidy.py -clang-tidy-binary ~/software/clang+llvm-3.8.0-x86_64-linux-gnu-ubuntu-14.04/bin/clang-tidy -checks=-*,modernize-use-nullptr -header-filter=/home/grizonnetm/projets/otb/src/OTB/Modules/.*/.*/include/.* -j8 -fix -p ~/projets/otb/bin/release/OTB-clang3.8/ ~/projets/otb/src/OTB/Modules/*/*/src/*.cxx ~/projets/otb/src/OTB/Modules/*/*/app/*.cxx ~/projets/otb/src/OTB/Examples/*/*.cxx ~/projets/otb/src/OTB/Modules/*/*/test/*.cxx > ~/temporary/run-clang-tidy-nullptr-log.txt
      
          find . -type f -print -name "*.h" -o -name "*.txx" -o -name "*.cxx" |xargs perl -pi -e 's/nullptr/ITK_NULLPTR/g'
      0f26e689
  21. 13 Jun, 2016 1 commit
    • Manuel Grizonnet's avatar
      ENH: Remove double underscore in header guards (.txx & __otb*_h form) · 82842d15
      Manuel Grizonnet authored
      Used the following command:
      
      find . \( -iname *.txx -and ! -path *ThirdParty* \) -exec perl -pi -w -e 's/__otb(.*)_txx/otb$1_txx/g;' {} \;
      find . \( -iname *.h -and ! -path *ThirdParty* \) -exec perl -pi -w -e 's/__otb(.*)_h/otb$1_h/g;' {} \;
      
      Fixes many, but not all, clang -Wreserved-id-macro warnings.
      82842d15
  22. 10 Jun, 2016 1 commit
    • Manuel Grizonnet's avatar
      ENH: Explicitly recognize virtual functions · 3de2b346
      Manuel Grizonnet authored
          clang-tidy tool can insert missing override keyword as a macro so that missing [optional] virtual identifiers can be easily added.
      
          build otb with clang 3.8 and use cmake option CMAKE_EXPORT_COMPILE_COMMANDS=ON. Most modules and third parties have been activated.
      
          #Save override occurences in otb code
          cd src/Modules ; grep -nR "override" * > ~/temporary/override_otb.txt
      
          #Run clang modernize check using utility script which allow to process the code in parallel
          python run-clang-tidy.py -clang-tidy-binary ~/software/clang+llvm-3.8.0-x86_64-linux-gnu-ubuntu-14.04/bin/clang-tidy -checks=-*,modernize-use-override -header-filter=/home/grizonnetm/projets/otb/src/OTB/Modules/.*/.*/include/.* -j8 -fix -p ~/projets/otb/bin/release/OTB-clang3.8/ ~/projets/otb/src/OTB/Modules/*/*/src/*.cxx ~/projets/otb/src/OTB/Examples/*/*.cxx ~/projets/otb/src/OTB/Modules/*/*/test/*.cxx > ~/temporary/run-clang-tidy-log.txt
      
          #Replace override by ITK macro (to maintain compat with c++98)
          find . -type f -print -name "*.h" -o -name "*.txx" |xargs perl -pi -e 's/\ override/\ ITK_OVERRIDE/g'
      3de2b346
  23. 13 May, 2016 1 commit
  24. 02 May, 2016 1 commit
  25. 01 Apr, 2016 1 commit
  26. 30 Mar, 2016 1 commit
  27. 23 Mar, 2016 2 commits
  28. 16 Mar, 2016 1 commit
  29. 13 Jan, 2016 1 commit
  30. 12 Jan, 2016 1 commit