diff --git a/build/cmake/CMakeLists.txt b/build/cmake/CMakeLists.txt index 6134d74..72e2050 100644 --- a/build/cmake/CMakeLists.txt +++ b/build/cmake/CMakeLists.txt @@ -165,7 +165,7 @@ TARGET_LINK_LIBRARIES(vooki_kimg_rgb Qt5::Gui) # Camera RAW Thumbnails (raf, mos, cr2, erf, dng, mrw, nef, orf, rw2, pef, x3f, srw, x3f, arw) # if(APPLE) - SET(LIBRAW "3rdPartyLibs/LibRaw-0.18.6") + SET(LIBRAW "3rdPartyLibs/LibRaw-0.18.7") SET(CMAKE_CXX_FLAGS "-I../${LIBRAW} ${CMAKE_CXX_FLAGS}") SET(CMAKE_MODULE_LINKER_FLAGS "-L../${LIBRAW}/lib ${CMAKE_MODULE_LINKER_FLAGS}") @@ -174,7 +174,7 @@ if(APPLE) elseif(WIN32) add_definitions(-DLIBRAW_NODLL) - SET(LIBRAW "3rdPartyLibs/LibRaw-0.18.6") + SET(LIBRAW "3rdPartyLibs/LibRaw-0.18.7") SET(CMAKE_CXX_FLAGS "-I../${LIBRAW} ${CMAKE_CXX_FLAGS}") add_library(vooki_raw_thumb MODULE ../../src/plugins/rawthumb/rawThumbHandler.cpp ../../src/plugins/rawthumb/rawThumbPlugin.cpp) diff --git a/build/cmake/mac/3rdPartyLibs/LibRaw-0.18.6/COPYRIGHT b/build/cmake/mac/3rdPartyLibs/LibRaw-0.18.7/COPYRIGHT similarity index 100% rename from build/cmake/mac/3rdPartyLibs/LibRaw-0.18.6/COPYRIGHT rename to build/cmake/mac/3rdPartyLibs/LibRaw-0.18.7/COPYRIGHT diff --git a/build/cmake/mac/3rdPartyLibs/LibRaw-0.18.6/LICENSE.LGPL b/build/cmake/mac/3rdPartyLibs/LibRaw-0.18.7/LICENSE.LGPL similarity index 100% rename from build/cmake/mac/3rdPartyLibs/LibRaw-0.18.6/LICENSE.LGPL rename to build/cmake/mac/3rdPartyLibs/LibRaw-0.18.7/LICENSE.LGPL diff --git a/build/cmake/mac/3rdPartyLibs/LibRaw-0.18.6/README b/build/cmake/mac/3rdPartyLibs/LibRaw-0.18.7/README similarity index 100% rename from build/cmake/mac/3rdPartyLibs/LibRaw-0.18.6/README rename to build/cmake/mac/3rdPartyLibs/LibRaw-0.18.7/README diff --git a/build/cmake/mac/3rdPartyLibs/LibRaw-0.18.6/lib/libraw.a b/build/cmake/mac/3rdPartyLibs/LibRaw-0.18.7/lib/libraw.a similarity index 81% rename from build/cmake/mac/3rdPartyLibs/LibRaw-0.18.6/lib/libraw.a rename to build/cmake/mac/3rdPartyLibs/LibRaw-0.18.7/lib/libraw.a index f157fcf..167c133 100644 Binary files a/build/cmake/mac/3rdPartyLibs/LibRaw-0.18.6/lib/libraw.a and b/build/cmake/mac/3rdPartyLibs/LibRaw-0.18.7/lib/libraw.a differ diff --git a/build/cmake/mac/3rdPartyLibs/LibRaw-0.18.6/lib/libraw_r.a b/build/cmake/mac/3rdPartyLibs/LibRaw-0.18.7/lib/libraw_r.a similarity index 82% rename from build/cmake/mac/3rdPartyLibs/LibRaw-0.18.6/lib/libraw_r.a rename to build/cmake/mac/3rdPartyLibs/LibRaw-0.18.7/lib/libraw_r.a index d9d4fa3..d3e6f8e 100644 Binary files a/build/cmake/mac/3rdPartyLibs/LibRaw-0.18.6/lib/libraw_r.a and b/build/cmake/mac/3rdPartyLibs/LibRaw-0.18.7/lib/libraw_r.a differ diff --git a/build/cmake/mac/3rdPartyLibs/LibRaw-0.18.6/libraw/libraw.h b/build/cmake/mac/3rdPartyLibs/LibRaw-0.18.7/libraw/libraw.h similarity index 100% rename from build/cmake/mac/3rdPartyLibs/LibRaw-0.18.6/libraw/libraw.h rename to build/cmake/mac/3rdPartyLibs/LibRaw-0.18.7/libraw/libraw.h diff --git a/build/cmake/mac/3rdPartyLibs/LibRaw-0.18.6/libraw/libraw_alloc.h b/build/cmake/mac/3rdPartyLibs/LibRaw-0.18.7/libraw/libraw_alloc.h similarity index 100% rename from build/cmake/mac/3rdPartyLibs/LibRaw-0.18.6/libraw/libraw_alloc.h rename to build/cmake/mac/3rdPartyLibs/LibRaw-0.18.7/libraw/libraw_alloc.h diff --git a/build/cmake/mac/3rdPartyLibs/LibRaw-0.18.6/libraw/libraw_const.h b/build/cmake/mac/3rdPartyLibs/LibRaw-0.18.7/libraw/libraw_const.h similarity index 100% rename from build/cmake/mac/3rdPartyLibs/LibRaw-0.18.6/libraw/libraw_const.h rename to build/cmake/mac/3rdPartyLibs/LibRaw-0.18.7/libraw/libraw_const.h diff --git a/build/cmake/mac/3rdPartyLibs/LibRaw-0.18.6/libraw/libraw_datastream.h b/build/cmake/mac/3rdPartyLibs/LibRaw-0.18.7/libraw/libraw_datastream.h similarity index 100% rename from build/cmake/mac/3rdPartyLibs/LibRaw-0.18.6/libraw/libraw_datastream.h rename to build/cmake/mac/3rdPartyLibs/LibRaw-0.18.7/libraw/libraw_datastream.h diff --git a/build/cmake/mac/3rdPartyLibs/LibRaw-0.18.6/libraw/libraw_internal.h b/build/cmake/mac/3rdPartyLibs/LibRaw-0.18.7/libraw/libraw_internal.h similarity index 100% rename from build/cmake/mac/3rdPartyLibs/LibRaw-0.18.6/libraw/libraw_internal.h rename to build/cmake/mac/3rdPartyLibs/LibRaw-0.18.7/libraw/libraw_internal.h diff --git a/build/cmake/mac/3rdPartyLibs/LibRaw-0.18.6/libraw/libraw_types.h b/build/cmake/mac/3rdPartyLibs/LibRaw-0.18.7/libraw/libraw_types.h similarity index 100% rename from build/cmake/mac/3rdPartyLibs/LibRaw-0.18.6/libraw/libraw_types.h rename to build/cmake/mac/3rdPartyLibs/LibRaw-0.18.7/libraw/libraw_types.h diff --git a/build/cmake/mac/3rdPartyLibs/LibRaw-0.18.6/libraw/libraw_version.h b/build/cmake/mac/3rdPartyLibs/LibRaw-0.18.7/libraw/libraw_version.h similarity index 98% rename from build/cmake/mac/3rdPartyLibs/LibRaw-0.18.6/libraw/libraw_version.h rename to build/cmake/mac/3rdPartyLibs/LibRaw-0.18.7/libraw/libraw_version.h index ad2f398..b6cacec 100644 --- a/build/cmake/mac/3rdPartyLibs/LibRaw-0.18.6/libraw/libraw_version.h +++ b/build/cmake/mac/3rdPartyLibs/LibRaw-0.18.7/libraw/libraw_version.h @@ -22,7 +22,7 @@ it under the terms of the one of two licenses as you choose: #define LIBRAW_MAJOR_VERSION 0 #define LIBRAW_MINOR_VERSION 18 -#define LIBRAW_PATCH_VERSION 6 +#define LIBRAW_PATCH_VERSION 7 #define LIBRAW_VERSION_TAIL Release #define LIBRAW_SHLIB_CURRENT 16 diff --git a/build/cmake/windows/3rdPartyLibs/LibRaw-0.18.6/lib/debug/libraw.lib b/build/cmake/windows/3rdPartyLibs/LibRaw-0.18.6/lib/debug/libraw.lib deleted file mode 100644 index b1e4f18..0000000 Binary files a/build/cmake/windows/3rdPartyLibs/LibRaw-0.18.6/lib/debug/libraw.lib and /dev/null differ diff --git a/build/cmake/windows/3rdPartyLibs/LibRaw-0.18.6/lib/libraw.lib b/build/cmake/windows/3rdPartyLibs/LibRaw-0.18.6/lib/libraw.lib deleted file mode 100644 index c95262a..0000000 Binary files a/build/cmake/windows/3rdPartyLibs/LibRaw-0.18.6/lib/libraw.lib and /dev/null differ diff --git a/build/cmake/windows/3rdPartyLibs/LibRaw-0.18.6/COPYRIGHT b/build/cmake/windows/3rdPartyLibs/LibRaw-0.18.7/COPYRIGHT similarity index 100% rename from build/cmake/windows/3rdPartyLibs/LibRaw-0.18.6/COPYRIGHT rename to build/cmake/windows/3rdPartyLibs/LibRaw-0.18.7/COPYRIGHT diff --git a/build/cmake/windows/3rdPartyLibs/LibRaw-0.18.6/LICENSE.LGPL b/build/cmake/windows/3rdPartyLibs/LibRaw-0.18.7/LICENSE.LGPL similarity index 100% rename from build/cmake/windows/3rdPartyLibs/LibRaw-0.18.6/LICENSE.LGPL rename to build/cmake/windows/3rdPartyLibs/LibRaw-0.18.7/LICENSE.LGPL diff --git a/build/cmake/windows/3rdPartyLibs/LibRaw-0.18.6/README b/build/cmake/windows/3rdPartyLibs/LibRaw-0.18.7/README similarity index 100% rename from build/cmake/windows/3rdPartyLibs/LibRaw-0.18.6/README rename to build/cmake/windows/3rdPartyLibs/LibRaw-0.18.7/README diff --git a/build/cmake/windows/3rdPartyLibs/LibRaw-0.18.7/lib/debug/libraw.lib b/build/cmake/windows/3rdPartyLibs/LibRaw-0.18.7/lib/debug/libraw.lib new file mode 100644 index 0000000..4320a5a Binary files /dev/null and b/build/cmake/windows/3rdPartyLibs/LibRaw-0.18.7/lib/debug/libraw.lib differ diff --git a/build/cmake/windows/3rdPartyLibs/LibRaw-0.18.7/lib/libraw.lib b/build/cmake/windows/3rdPartyLibs/LibRaw-0.18.7/lib/libraw.lib new file mode 100644 index 0000000..27e73a8 Binary files /dev/null and b/build/cmake/windows/3rdPartyLibs/LibRaw-0.18.7/lib/libraw.lib differ diff --git a/build/cmake/windows/3rdPartyLibs/LibRaw-0.18.6/libraw/libraw.h b/build/cmake/windows/3rdPartyLibs/LibRaw-0.18.7/libraw/libraw.h similarity index 100% rename from build/cmake/windows/3rdPartyLibs/LibRaw-0.18.6/libraw/libraw.h rename to build/cmake/windows/3rdPartyLibs/LibRaw-0.18.7/libraw/libraw.h diff --git a/build/cmake/windows/3rdPartyLibs/LibRaw-0.18.6/libraw/libraw_alloc.h b/build/cmake/windows/3rdPartyLibs/LibRaw-0.18.7/libraw/libraw_alloc.h similarity index 100% rename from build/cmake/windows/3rdPartyLibs/LibRaw-0.18.6/libraw/libraw_alloc.h rename to build/cmake/windows/3rdPartyLibs/LibRaw-0.18.7/libraw/libraw_alloc.h diff --git a/build/cmake/windows/3rdPartyLibs/LibRaw-0.18.6/libraw/libraw_const.h b/build/cmake/windows/3rdPartyLibs/LibRaw-0.18.7/libraw/libraw_const.h similarity index 100% rename from build/cmake/windows/3rdPartyLibs/LibRaw-0.18.6/libraw/libraw_const.h rename to build/cmake/windows/3rdPartyLibs/LibRaw-0.18.7/libraw/libraw_const.h diff --git a/build/cmake/windows/3rdPartyLibs/LibRaw-0.18.6/libraw/libraw_datastream.h b/build/cmake/windows/3rdPartyLibs/LibRaw-0.18.7/libraw/libraw_datastream.h similarity index 100% rename from build/cmake/windows/3rdPartyLibs/LibRaw-0.18.6/libraw/libraw_datastream.h rename to build/cmake/windows/3rdPartyLibs/LibRaw-0.18.7/libraw/libraw_datastream.h diff --git a/build/cmake/windows/3rdPartyLibs/LibRaw-0.18.6/libraw/libraw_internal.h b/build/cmake/windows/3rdPartyLibs/LibRaw-0.18.7/libraw/libraw_internal.h similarity index 100% rename from build/cmake/windows/3rdPartyLibs/LibRaw-0.18.6/libraw/libraw_internal.h rename to build/cmake/windows/3rdPartyLibs/LibRaw-0.18.7/libraw/libraw_internal.h diff --git a/build/cmake/windows/3rdPartyLibs/LibRaw-0.18.6/libraw/libraw_types.h b/build/cmake/windows/3rdPartyLibs/LibRaw-0.18.7/libraw/libraw_types.h similarity index 100% rename from build/cmake/windows/3rdPartyLibs/LibRaw-0.18.6/libraw/libraw_types.h rename to build/cmake/windows/3rdPartyLibs/LibRaw-0.18.7/libraw/libraw_types.h diff --git a/build/cmake/windows/3rdPartyLibs/LibRaw-0.18.6/libraw/libraw_version.h b/build/cmake/windows/3rdPartyLibs/LibRaw-0.18.7/libraw/libraw_version.h similarity index 98% rename from build/cmake/windows/3rdPartyLibs/LibRaw-0.18.6/libraw/libraw_version.h rename to build/cmake/windows/3rdPartyLibs/LibRaw-0.18.7/libraw/libraw_version.h index ad2f398..b6cacec 100644 --- a/build/cmake/windows/3rdPartyLibs/LibRaw-0.18.6/libraw/libraw_version.h +++ b/build/cmake/windows/3rdPartyLibs/LibRaw-0.18.7/libraw/libraw_version.h @@ -22,7 +22,7 @@ it under the terms of the one of two licenses as you choose: #define LIBRAW_MAJOR_VERSION 0 #define LIBRAW_MINOR_VERSION 18 -#define LIBRAW_PATCH_VERSION 6 +#define LIBRAW_PATCH_VERSION 7 #define LIBRAW_VERSION_TAIL Release #define LIBRAW_SHLIB_CURRENT 16 diff --git a/build/cmake/windows/support/package/package.xml b/build/cmake/windows/support/package/package.xml index e94a7a3..d3f694a 100644 --- a/build/cmake/windows/support/package/package.xml +++ b/build/cmake/windows/support/package/package.xml @@ -1,7 +1,7 @@ + Language='1033' Codepage='1252' Version='18.01.19' Manufacturer='Michal Duda'>