Fix #629: conflicting directives on newer Clang-format versions.#630

rafa-be wants to merge 1 commit intofinos:mainfinos/opengris-scaler:mainfrom

rafa-be:fix-clang-format-single-line-functionsrafa-be/scaler:fix-clang-format-single-line-functionsCopy head branch name to clipboard