Fix dcp.cc with some help from the implementation in ART

2020-10-16 12:39:17 +02:00
parent 8b4389ade9
commit d9799ec5de
8 changed files with 327 additions and 389 deletions
--- a/rtengine/CMakeLists.txt
+++ b/rtengine/CMakeLists.txt
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 if(EXTRA_INCDIR)
    include_directories("${EXTRA_INCDIR}")
 endif()