diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml deleted file mode 100644 index 4505423..0000000 --- a/.github/workflows/build.yaml +++ /dev/null @@ -1,26 +0,0 @@ -name: Build - -on: - push: - branches: - - master - - -jobs: - build: - runs-on: ubuntu-latest - steps: - - name: Install Dependencies - run: sudo apt-get install cmake qtbase5-dev libavcodec-dev libavformat-dev libavutil-dev libopencv-dev libopencv-video-dev libopencv-contrib-dev - - - name: Build CMake - uses: ashutoshvarma/action-cmake-build@v1 - with: - build-dir: ${{ runner.workspace }}/build - build-type: Release - # Extra options pass to cmake while configuring project - configure-options: -DUSE_WERROR=OFF - # install the build using cmake --install - install-build: true - # run build using '-j [parallel]' to use multiple threads to build - parallel: 8 \ No newline at end of file diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b6abb12..ea75ab0 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -1,4 +1,4 @@ -name: CMake +name: Build on Linux on: push: @@ -21,7 +21,7 @@ jobs: steps: - name: Install dependencies run: sudo apt-get install cmake qtbase5-dev libavcodec-dev libavformat-dev libavutil-dev libopencv-dev libopencv-video-dev libopencv-contrib-dev - + - uses: actions/checkout@v2 - name: Configure CMake @@ -31,5 +31,5 @@ jobs: - name: Build # Build your program with the given configuration - run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}} - + run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}} + diff --git a/README.md b/README.md index f06cd8d..0298fa4 100644 --- a/README.md +++ b/README.md @@ -3,9 +3,10 @@ ## Build Status -Master branch | Development branch +Linux | Windows ------------ | ------------- -[![Linux Status](https://travis-ci.org/pixlra/calyp.svg?branch=master)](https://travis-ci.org/pixlra/calyp.svg?branch=master) [![Windows status](https://ci.appveyor.com/api/projects/status/ea2ktvtg7uqwrika/branch/master?svg=true)](https://ci.appveyor.com/project/jfmcarreira/calyp/branch/master) | Comming soon! +[Build Action](https://github.com/pixlra/calyp/actions/workflows/build.yml/badge.svg?branch=master) | +[![Linux Status](https://travis-ci.org/pixlra/calyp.svg?branch=master)](https://travis-ci.org/pixlra/calyp.svg?branch=master) | [![Windows status](https://ci.appveyor.com/api/projects/status/ea2ktvtg7uqwrika/branch/master?svg=true)](https://ci.appveyor.com/project/jfmcarreira/calyp/branch/master) ## Features diff --git a/lib/CalypDefs.h b/lib/CalypDefs.h index d5d66d4..b8f6c72 100644 --- a/lib/CalypDefs.h +++ b/lib/CalypDefs.h @@ -26,6 +26,7 @@ #ifndef __CALYPDEFS_H__ #define __CALYPDEFS_H__ +#include #include #include #include @@ -107,14 +108,14 @@ static const double S_PI_2 = 1.57079632679489661923; inline ClpString clpLowercase( const ClpString& in ) { ClpString out; - transform( in.begin(), in.end(), std::back_inserter( out ), tolower ); + std::transform( in.begin(), in.end(), std::back_inserter( out ), tolower ); return out; } inline ClpString clpUppercase( const ClpString& in ) { ClpString out; - transform( in.begin(), in.end(), std::back_inserter( out ), toupper ); + std::transform( in.begin(), in.end(), std::back_inserter( out ), toupper ); return out; }