liz/rawTherapee
liz/rawTherapee
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge with dev

Browse Source
This commit is contained in:
Desmis 2020-02-06 10:58:01 +01:00
commit d563b06c3a
3 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
rtengine/CMakeLists.txt
View File

@ -12,6 +12,11 @@ include_directories(${EXTRA_INCDIR}
${LENSFUN_INCLUDE_DIRS} ${LENSFUN_INCLUDE_DIRS}
${RSVG_INCLUDE_DIRS} ${RSVG_INCLUDE_DIRS}
) )
if(NOT WITH_SYSTEM_KLT)
include_directories("${CMAKE_SOURCE_DIR}/rtengine/klt")
else()
include_directories(${KLT_INCLUDE_DIRS})
endif()
link_directories("${PROJECT_SOURCE_DIR}/rtexif" link_directories("${PROJECT_SOURCE_DIR}/rtexif"
${EXPAT_LIBRARY_DIRS} ${EXPAT_LIBRARY_DIRS}
@ -187,6 +192,7 @@ target_link_libraries(rtengine rtexif
${ZLIB_LIBRARIES} ${ZLIB_LIBRARIES}
${LENSFUN_LIBRARIES} ${LENSFUN_LIBRARIES}
${RSVG_LIBRARIES} ${RSVG_LIBRARIES}
${KLT_LIBRARIES}
) )
install(FILES ${CAMCONSTSFILE} DESTINATION "${DATADIR}" PERMISSIONS OWNER_WRITE OWNER_READ GROUP_READ WORLD_READ) install(FILES ${CAMCONSTSFILE} DESTINATION "${DATADIR}" PERMISSIONS OWNER_WRITE OWNER_READ GROUP_READ WORLD_READ)

4
rtengine/calc_distort.cc
View File

@ -5,8 +5,8 @@ locations (before and after tracking) to text files and to PPM files,
and prints the features to the screen. and prints the features to the screen.
**********************************************************************/ **********************************************************************/
#include "klt/pnmio.h" #include <pnmio.h>
#include "klt/klt.h" #include <klt.h>
#include <cmath> #include <cmath>
#include <cstring> #include <cstring>

10
rtengine/canon_cr3_decoder.cc
View File

@ -18,6 +18,7 @@
*/ */
// Code adapted from ART // Code adapted from ART
// https://bitbucket.org/agriggio/art/
/* /*
* *
* This file is part of ART. * This file is part of ART.
@ -37,9 +38,14 @@
*/ */
// Code adapted from libraw // Code adapted from libraw
/* -*- C++ -*- // https://github.com/LibRaw/LibRaw/
* Copyright 2019 LibRaw LLC (info@libraw.org) /*
* File: libraw_crxdec.cpp
* Copyright (C) 2018-2019 Alexey Danilchenko
* Copyright (C) 2019 Alex Tutubalin, LibRaw LLC
* *
Canon CR3 file decoder
LibRaw is free software; you can redistribute it and/or modify LibRaw is free software; you can redistribute it and/or modify
it under the terms of the one of two licenses as you choose: it under the terms of the one of two licenses as you choose: