...
 
Commits (3)
  • Boudewijn Rempt's avatar
    Try to fix the the jenkins build · adf02710
    Boudewijn Rempt authored
    [2019-04-22T08:29:04.736Z] Scanning dependencies of target KisCompositionBenchmark
    [2019-04-22T08:29:04.993Z] [ 43%] Building CXX object benchmarks/CMakeFiles/KisCompositionBenchmark.dir/kis_composition_benchmark.cpp.o
    [2019-04-22T08:29:07.539Z] In file included from /usr/include/boost/random/detail/integer_log2.hpp:19,
    [2019-04-22T08:29:07.539Z]                  from /usr/include/boost/random/detail/large_arithmetic.hpp:19,
    [2019-04-22T08:29:07.539Z]                  from /usr/include/boost/random/detail/const_mod.hpp:23,
    [2019-04-22T08:29:07.539Z]                  from /usr/include/boost/random/detail/seed_impl.hpp:26,
    [2019-04-22T08:29:07.539Z]                  from /usr/include/boost/random/mersenne_twister.hpp:30,
    [2019-04-22T08:29:07.539Z]                  from /home/jenkins/workspace/Extragear/krita/kf5-qt5 SUSEQt5.10/benchmarks/kis_composition_benchmark.cpp:92:
    [2019-04-22T08:29:07.539Z] /usr/include/boost/pending/integer_log2.hpp:7:59: note: #pragma message: This header is deprecated. Use <boost/integer/integer_log2.hpp> instead.
    [2019-04-22T08:29:07.539Z]  BOOST_HEADER_DEPRECATED("<boost/integer/integer_log2.hpp>");
    [2019-04-22T08:29:07.540Z]                                                            ^
    [2019-04-22T08:29:07.540Z] /home/jenkins/workspace/Extragear/krita/kf5-qt5 SUSEQt5.10/benchmarks/kis_composition_benchmark.cpp: In member function ���void KisCompositionBenchmark::compareAlphaDarkenOps()���:
    [2019-04-22T08:29:07.540Z] /home/jenkins/workspace/Extragear/krita/kf5-qt5 SUSEQt5.10/benchmarks/kis_composition_benchmark.cpp:645:72: error: ���KoAlphaDarkenParamsWrapperCreamy��� was not declared in this scope
    [2019-04-22T08:29:07.540Z]      KoCompositeOp *opExp = new KoCompositeOpAlphaDarken<KoBgrU8Traits, KoAlphaDarkenParamsWrapperCreamy>(cs);
    [2019-04-22T08:29:07.540Z]                                                                         ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
    [2019-04-22T08:29:07.540Z] /home/jenkins/workspace/Extragear/krita/kf5-qt5 SUSEQt5.10/benchmarks/kis_composition_benchmark.cpp:645:104: error: template argument 2 is invalid
    [2019-04-22T08:29:07.540Z]      KoCompositeOp *opExp = new KoCompositeOpAlphaDarken<KoBgrU8Traits, KoAlphaDarkenParamsWrapperCreamy>(cs);
    [2019-04-22T08:29:07.540Z]                                                                                                         ^
    [2019-04-22T08:29:07.540Z] /home/jenkins/workspace/Extragear/krita/kf5-qt5 SUSEQt5.10/benchmarks/kis_composition_benchmark.cpp: In member function ���void KisCompositionBenchmark::compareRgbF32AlphaDarkenOps()���:
    [2019-04-22T08:29:07.540Z] /home/jenkins/workspace/Extragear/krita/kf5-qt5 SUSEQt5.10/benchmarks/kis_composition_benchmark.cpp:657:73: error: ���KoAlphaDarkenParamsWrapperCreamy��� was not declared in this scope
    [2019-04-22T08:29:07.540Z]      KoCompositeOp *opExp = new KoCompositeOpAlphaDarken<KoRgbF32Traits, KoAlphaDarkenParamsWrapperCreamy>(cs);
    [2019-04-22T08:29:07.540Z]                                                                          ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
    [2019-04-22T08:29:07.540Z] /home/jenkins/workspace/Extragear/krita/kf5-qt5 SUSEQt5.10/benchmarks/kis_composition_benchmark.cpp:657:105: error: template argument 2 is invalid
    [2019-04-22T08:29:07.540Z]      KoCompositeOp *opExp = new KoCompositeOpAlphaDarken<KoRgbF32Traits, KoAlphaDarkenParamsWrapperCreamy>(cs);
    [2019-04-22T08:29:07.540Z]                                                                                                          ^
    [2019-04-22T08:29:07.540Z] /home/jenkins/workspace/Extragear/krita/kf5-qt5 SUSEQt5.10/benchmarks/kis_composition_benchmark.cpp: In member function ���void KisCompositionBenchmark::compareAlphaDarkenOpsNoMask()���:
    [2019-04-22T08:29:07.540Z] /home/jenkins/workspace/Extragear/krita/kf5-qt5 SUSEQt5.10/benchmarks/kis_composition_benchmark.cpp:669:72: error: ���KoAlphaDarkenParamsWrapperCreamy��� was not declared in this scope
    [2019-04-22T08:29:07.540Z]      KoCompositeOp *opExp = new KoCompositeOpAlphaDarken<KoBgrU8Traits, KoAlphaDarkenParamsWrapperCreamy>(cs);
    [2019-04-22T08:29:07.540Z]                                                                         ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
    [2019-04-22T08:29:07.540Z] /home/jenkins/workspace/Extragear/krita/kf5-qt5 SUSEQt5.10/benchmarks/kis_composition_benchmark.cpp:669:104: error: template argument 2 is invalid
    [2019-04-22T08:29:07.540Z]      KoCompositeOp *opExp = new KoCompositeOpAlphaDarken<KoBgrU8Traits, KoAlphaDarkenParamsWrapperCreamy>(cs);
    [2019-04-22T08:29:07.540Z]                                                                                                         ^
    [2019-04-22T08:29:07.540Z] /home/jenkins/workspace/Extragear/krita/kf5-qt5 SUSEQt5.10/benchmarks/kis_composition_benchmark.cpp: In member function ���void KisCompositionBenchmark::testRgb8CompositeAlphaDarkenLegacy()���:
    [2019-04-22T08:29:07.540Z] /home/jenkins/workspace/Extragear/krita/kf5-qt5 SUSEQt5.10/benchmarks/kis_composition_benchmark.cpp:716:69: error: ���KoAlphaDarkenParamsWrapperCreamy��� was not declared in this scope
    [2019-04-22T08:29:07.540Z]      KoCompositeOp *op = new KoCompositeOpAlphaDarken<KoBgrU8Traits, KoAlphaDarkenParamsWrapperCreamy>(cs);
    [2019-04-22T08:29:07.540Z]                                                                      ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
    [2019-04-22T08:29:07.540Z] /home/jenkins/workspace/Extragear/krita/kf5-qt5 SUSEQt5.10/benchmarks/kis_composition_benchmark.cpp:716:101: error: template argument 2 is invalid
    [2019-04-22T08:29:07.540Z]      KoCompositeOp *op = new KoCompositeOpAlphaDarken<KoBgrU8Traits, KoAlphaDarkenParamsWrapperCreamy>(cs);
    [2019-04-22T08:29:07.540Z]                                                                                                      ^
    [2019-04-22T08:29:07.540Z] /home/jenkins/workspace/Extragear/krita/kf5-qt5 SUSEQt5.10/benchmarks/kis_composition_benchmark.cpp: In member function ���void KisCompositionBenchmark::testRgbF32CompositeAlphaDarkenLegacy()���:
    [2019-04-22T08:29:07.540Z] /home/jenkins/workspace/Extragear/krita/kf5-qt5 SUSEQt5.10/benchmarks/kis_composition_benchmark.cpp:748:70: error: ���KoAlphaDarkenParamsWrapperCreamy��� was not declared in this scope
    [2019-04-22T08:29:07.540Z]      KoCompositeOp *op = new KoCompositeOpAlphaDarken<KoRgbF32Traits, KoAlphaDarkenParamsWrapperCreamy>(cs);
    [2019-04-22T08:29:07.540Z]                                                                       ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
    [2019-04-22T08:29:07.540Z] /home/jenkins/workspace/Extragear/krita/kf5-qt5 SUSEQt5.10/benchmarks/kis_composition_benchmark.cpp:748:102: error: template argument 2 is invalid
    [2019-04-22T08:29:07.540Z]      KoCompositeOp *op = new KoCompositeOpAlphaDarken<KoRgbF32Traits, KoAlphaDarkenParamsWrapperCreamy>(cs);
    [2019-04-22T08:29:07.540Z]                                                                                                       ^
    [2019-04-22T08:29:07.540Z] make[2]: *** [benchmarks/CMakeFiles/KisCompositionBenchmark.dir/build.make:63: benchmarks/CMakeFiles/KisCompositionBenchmark.dir/kis_composition_benchmark.cpp.o] Error 1
    [2019-04-22T08:29:07.540Z] make[1]: *** [CMakeFiles/Makefile2:44556: benchmarks/CMakeFiles/KisCompositionBenchmark.dir/all] Error 2
    [2019-04-22T08:29:07.540Z] make: *** [Makefile:141: all] Error 2
    adf02710
  • Boudewijn Rempt's avatar
    Fix the linux deps build · 5319ceb5
    Boudewijn Rempt authored
    5319ceb5
  • Wolthera van Hövell's avatar
    Add a merge request template. · 1fd8aa7d
    Wolthera van Hövell authored
    This automatically adds the Needs Review label to new merge requests,
    and also gives a basic formalities and required info list.
    
    cc: @rempt, @dkazakov
    1fd8aa7d
(Tell us what you did!)
Test Plan
---------
(Tell us how to test the changes you made.)
Formalities Checklist
---------------------
- [ ] I confirmed this builds.
- [ ] I confirmed Krita ran and the relevant functions work.
- [ ] I tested the relevant unit tests and can confirm they are not broken. (If not possible, don't hesitate to ask for help!)
- [ ] I made sure my commits build individually and have good descriptions as per [KDE guidelines](https://community.kde.org/Policies/Commit_Policy).
- [ ] I made sure my code conforms to the standards set in the HACKING file.
- [ ] I can confirm the code is licensed and attributed appropriately, and that unattributed code is mine, as per [KDE Licensing Policy](https://community.kde.org/Policies/Licensing_Policy).
/label ~"Needs Review"
......@@ -22,7 +22,7 @@ ExternalProject_Add( ext_fftw3
PATCH_COMMAND ${PATCH_COMMAND} -p1 -i ${CMAKE_CURRENT_SOURCE_DIR}/patch_mingw.patch
INSTALL_DIR ${PREFIX_ext_fftw3}
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${PREFIX_ext_fftw3} -DCMAKE_BUILD_TYPE=${GLOBAL_BUILD_TYPE} ${GLOBAL_PROFILE} -DDENABLE_THREADS=ON -ENABLE_SSE=ON -ENABLE_SSE2=ON -DBUILD_TESTS=OFF
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${PREFIX_ext_fftw3} -DCMAKE_BUILD_TYPE=${GLOBAL_BUILD_TYPE} ${GLOBAL_PROFILE} -DENABLE_THREADS=ON -ENABLE_SSE=ON -ENABLE_SSE2=ON -DBUILD_TESTS=OFF
UPDATE_COMMAND ""
)
......
......@@ -47,7 +47,8 @@
#include <KoColorSpaceTraits.h>
#include <KoCompositeOpAlphaDarken.h>
#include <KoCompositeOpOver.h>
#include "KoOptimizedCompositeOpFactory.h"
#include <KoOptimizedCompositeOpFactory.h>
#include <KoAlphaDarkenParamsWrapper.h>
// for posix_memalign()
#include <stdlib.h>
......