diff --git a/build/cmake/CMakeLists.txt b/build/cmake/CMakeLists.txt index a12c776..6134d74 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.5") + SET(LIBRAW "3rdPartyLibs/LibRaw-0.18.6") 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.5") + SET(LIBRAW "3rdPartyLibs/LibRaw-0.18.6") 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.5/COPYRIGHT b/build/cmake/mac/3rdPartyLibs/LibRaw-0.18.6/COPYRIGHT similarity index 100% rename from build/cmake/mac/3rdPartyLibs/LibRaw-0.18.5/COPYRIGHT rename to build/cmake/mac/3rdPartyLibs/LibRaw-0.18.6/COPYRIGHT diff --git a/build/cmake/mac/3rdPartyLibs/LibRaw-0.18.5/LICENSE.LGPL b/build/cmake/mac/3rdPartyLibs/LibRaw-0.18.6/LICENSE.LGPL similarity index 100% rename from build/cmake/mac/3rdPartyLibs/LibRaw-0.18.5/LICENSE.LGPL rename to build/cmake/mac/3rdPartyLibs/LibRaw-0.18.6/LICENSE.LGPL diff --git a/build/cmake/mac/3rdPartyLibs/LibRaw-0.18.5/README b/build/cmake/mac/3rdPartyLibs/LibRaw-0.18.6/README similarity index 100% rename from build/cmake/mac/3rdPartyLibs/LibRaw-0.18.5/README rename to build/cmake/mac/3rdPartyLibs/LibRaw-0.18.6/README diff --git a/build/cmake/mac/3rdPartyLibs/LibRaw-0.18.5/lib/libraw.a b/build/cmake/mac/3rdPartyLibs/LibRaw-0.18.6/lib/libraw.a similarity index 84% rename from build/cmake/mac/3rdPartyLibs/LibRaw-0.18.5/lib/libraw.a rename to build/cmake/mac/3rdPartyLibs/LibRaw-0.18.6/lib/libraw.a index def2bd4..f157fcf 100644 Binary files a/build/cmake/mac/3rdPartyLibs/LibRaw-0.18.5/lib/libraw.a and b/build/cmake/mac/3rdPartyLibs/LibRaw-0.18.6/lib/libraw.a differ diff --git a/build/cmake/mac/3rdPartyLibs/LibRaw-0.18.5/lib/libraw_r.a b/build/cmake/mac/3rdPartyLibs/LibRaw-0.18.6/lib/libraw_r.a similarity index 85% rename from build/cmake/mac/3rdPartyLibs/LibRaw-0.18.5/lib/libraw_r.a rename to build/cmake/mac/3rdPartyLibs/LibRaw-0.18.6/lib/libraw_r.a index dcbc70f..d9d4fa3 100644 Binary files a/build/cmake/mac/3rdPartyLibs/LibRaw-0.18.5/lib/libraw_r.a and b/build/cmake/mac/3rdPartyLibs/LibRaw-0.18.6/lib/libraw_r.a differ diff --git a/build/cmake/mac/3rdPartyLibs/LibRaw-0.18.5/libraw/libraw.h b/build/cmake/mac/3rdPartyLibs/LibRaw-0.18.6/libraw/libraw.h similarity index 100% rename from build/cmake/mac/3rdPartyLibs/LibRaw-0.18.5/libraw/libraw.h rename to build/cmake/mac/3rdPartyLibs/LibRaw-0.18.6/libraw/libraw.h diff --git a/build/cmake/mac/3rdPartyLibs/LibRaw-0.18.5/libraw/libraw_alloc.h b/build/cmake/mac/3rdPartyLibs/LibRaw-0.18.6/libraw/libraw_alloc.h similarity index 100% rename from build/cmake/mac/3rdPartyLibs/LibRaw-0.18.5/libraw/libraw_alloc.h rename to build/cmake/mac/3rdPartyLibs/LibRaw-0.18.6/libraw/libraw_alloc.h diff --git a/build/cmake/mac/3rdPartyLibs/LibRaw-0.18.5/libraw/libraw_const.h b/build/cmake/mac/3rdPartyLibs/LibRaw-0.18.6/libraw/libraw_const.h similarity index 91% rename from build/cmake/mac/3rdPartyLibs/LibRaw-0.18.5/libraw/libraw_const.h rename to build/cmake/mac/3rdPartyLibs/LibRaw-0.18.6/libraw/libraw_const.h index 52bcdd5..bdda5bc 100644 --- a/build/cmake/mac/3rdPartyLibs/LibRaw-0.18.5/libraw/libraw_const.h +++ b/build/cmake/mac/3rdPartyLibs/LibRaw-0.18.6/libraw/libraw_const.h @@ -166,23 +166,22 @@ enum LibRaw_constructor_flags enum LibRaw_warnings { - LIBRAW_WARN_NONE =0, - LIBRAW_WARN_FOVEON_NOMATRIX =1, - LIBRAW_WARN_FOVEON_INVALIDWB =1<<1, - LIBRAW_WARN_BAD_CAMERA_WB =1<<2, - LIBRAW_WARN_NO_METADATA =1<<3, - LIBRAW_WARN_NO_JPEGLIB = 1<<4, - LIBRAW_WARN_NO_EMBEDDED_PROFILE = 1<<5, - LIBRAW_WARN_NO_INPUT_PROFILE = 1<<6, - LIBRAW_WARN_BAD_OUTPUT_PROFILE= 1<<7, - LIBRAW_WARN_NO_BADPIXELMAP=1<<8, - LIBRAW_WARN_BAD_DARKFRAME_FILE=1<<9, - LIBRAW_WARN_BAD_DARKFRAME_DIM=1<<10, - LIBRAW_WARN_NO_JASPER = 1<<11, - LIBRAW_WARN_RAWSPEED_PROBLEM = 1<<12, - LIBRAW_WARN_RAWSPEED_UNSUPPORTED = 1<<13, - LIBRAW_WARN_RAWSPEED_PROCESSED = 1<<14, - LIBRAW_WARN_FALLBACK_TO_AHD = 1<<15 + LIBRAW_WARN_NONE = 0, + LIBRAW_WARN_BAD_CAMERA_WB = 1 << 2, + LIBRAW_WARN_NO_METADATA = 1 << 3, + LIBRAW_WARN_NO_JPEGLIB = 1 << 4, + LIBRAW_WARN_NO_EMBEDDED_PROFILE = 1 << 5, + LIBRAW_WARN_NO_INPUT_PROFILE = 1 << 6, + LIBRAW_WARN_BAD_OUTPUT_PROFILE = 1 << 7, + LIBRAW_WARN_NO_BADPIXELMAP = 1 << 8, + LIBRAW_WARN_BAD_DARKFRAME_FILE = 1 << 9, + LIBRAW_WARN_BAD_DARKFRAME_DIM = 1 << 10, + LIBRAW_WARN_NO_JASPER = 1 << 11, + LIBRAW_WARN_RAWSPEED_PROBLEM = 1 << 12, + LIBRAW_WARN_RAWSPEED_UNSUPPORTED = 1 << 13, + LIBRAW_WARN_RAWSPEED_PROCESSED = 1 << 14, + LIBRAW_WARN_FALLBACK_TO_AHD = 1 << 15, + LIBRAW_WARN_PARSEFUJI_PROCESSED = 1 << 16 }; enum LibRaw_exceptions diff --git a/build/cmake/mac/3rdPartyLibs/LibRaw-0.18.5/libraw/libraw_datastream.h b/build/cmake/mac/3rdPartyLibs/LibRaw-0.18.6/libraw/libraw_datastream.h similarity index 100% rename from build/cmake/mac/3rdPartyLibs/LibRaw-0.18.5/libraw/libraw_datastream.h rename to build/cmake/mac/3rdPartyLibs/LibRaw-0.18.6/libraw/libraw_datastream.h diff --git a/build/cmake/mac/3rdPartyLibs/LibRaw-0.18.5/libraw/libraw_internal.h b/build/cmake/mac/3rdPartyLibs/LibRaw-0.18.6/libraw/libraw_internal.h similarity index 100% rename from build/cmake/mac/3rdPartyLibs/LibRaw-0.18.5/libraw/libraw_internal.h rename to build/cmake/mac/3rdPartyLibs/LibRaw-0.18.6/libraw/libraw_internal.h diff --git a/build/cmake/mac/3rdPartyLibs/LibRaw-0.18.5/libraw/libraw_types.h b/build/cmake/mac/3rdPartyLibs/LibRaw-0.18.6/libraw/libraw_types.h similarity index 100% rename from build/cmake/mac/3rdPartyLibs/LibRaw-0.18.5/libraw/libraw_types.h rename to build/cmake/mac/3rdPartyLibs/LibRaw-0.18.6/libraw/libraw_types.h diff --git a/build/cmake/windows/3rdPartyLibs/LibRaw-0.18.5/libraw/libraw_version.h b/build/cmake/mac/3rdPartyLibs/LibRaw-0.18.6/libraw/libraw_version.h similarity index 98% rename from build/cmake/windows/3rdPartyLibs/LibRaw-0.18.5/libraw/libraw_version.h rename to build/cmake/mac/3rdPartyLibs/LibRaw-0.18.6/libraw/libraw_version.h index dae0826..ad2f398 100644 --- a/build/cmake/windows/3rdPartyLibs/LibRaw-0.18.5/libraw/libraw_version.h +++ b/build/cmake/mac/3rdPartyLibs/LibRaw-0.18.6/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 5 +#define LIBRAW_PATCH_VERSION 6 #define LIBRAW_VERSION_TAIL Release #define LIBRAW_SHLIB_CURRENT 16 diff --git a/build/cmake/windows/3rdPartyLibs/LibRaw-0.18.5/lib/libraw.lib b/build/cmake/windows/3rdPartyLibs/LibRaw-0.18.5/lib/libraw.lib deleted file mode 100644 index eb15f67..0000000 Binary files a/build/cmake/windows/3rdPartyLibs/LibRaw-0.18.5/lib/libraw.lib and /dev/null differ diff --git a/build/cmake/windows/3rdPartyLibs/LibRaw-0.18.5/COPYRIGHT b/build/cmake/windows/3rdPartyLibs/LibRaw-0.18.6/COPYRIGHT similarity index 100% rename from build/cmake/windows/3rdPartyLibs/LibRaw-0.18.5/COPYRIGHT rename to build/cmake/windows/3rdPartyLibs/LibRaw-0.18.6/COPYRIGHT diff --git a/build/cmake/windows/3rdPartyLibs/LibRaw-0.18.5/LICENSE.LGPL b/build/cmake/windows/3rdPartyLibs/LibRaw-0.18.6/LICENSE.LGPL similarity index 100% rename from build/cmake/windows/3rdPartyLibs/LibRaw-0.18.5/LICENSE.LGPL rename to build/cmake/windows/3rdPartyLibs/LibRaw-0.18.6/LICENSE.LGPL diff --git a/build/cmake/windows/3rdPartyLibs/LibRaw-0.18.5/README b/build/cmake/windows/3rdPartyLibs/LibRaw-0.18.6/README similarity index 100% rename from build/cmake/windows/3rdPartyLibs/LibRaw-0.18.5/README rename to build/cmake/windows/3rdPartyLibs/LibRaw-0.18.6/README 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 new file mode 100644 index 0000000..b1e4f18 Binary files /dev/null and b/build/cmake/windows/3rdPartyLibs/LibRaw-0.18.6/lib/debug/libraw.lib 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 new file mode 100644 index 0000000..c95262a Binary files /dev/null and b/build/cmake/windows/3rdPartyLibs/LibRaw-0.18.6/lib/libraw.lib differ diff --git a/build/cmake/windows/3rdPartyLibs/LibRaw-0.18.5/libraw/libraw.h b/build/cmake/windows/3rdPartyLibs/LibRaw-0.18.6/libraw/libraw.h similarity index 100% rename from build/cmake/windows/3rdPartyLibs/LibRaw-0.18.5/libraw/libraw.h rename to build/cmake/windows/3rdPartyLibs/LibRaw-0.18.6/libraw/libraw.h diff --git a/build/cmake/windows/3rdPartyLibs/LibRaw-0.18.5/libraw/libraw_alloc.h b/build/cmake/windows/3rdPartyLibs/LibRaw-0.18.6/libraw/libraw_alloc.h similarity index 100% rename from build/cmake/windows/3rdPartyLibs/LibRaw-0.18.5/libraw/libraw_alloc.h rename to build/cmake/windows/3rdPartyLibs/LibRaw-0.18.6/libraw/libraw_alloc.h diff --git a/build/cmake/windows/3rdPartyLibs/LibRaw-0.18.5/libraw/libraw_const.h b/build/cmake/windows/3rdPartyLibs/LibRaw-0.18.6/libraw/libraw_const.h similarity index 91% rename from build/cmake/windows/3rdPartyLibs/LibRaw-0.18.5/libraw/libraw_const.h rename to build/cmake/windows/3rdPartyLibs/LibRaw-0.18.6/libraw/libraw_const.h index 52bcdd5..bdda5bc 100644 --- a/build/cmake/windows/3rdPartyLibs/LibRaw-0.18.5/libraw/libraw_const.h +++ b/build/cmake/windows/3rdPartyLibs/LibRaw-0.18.6/libraw/libraw_const.h @@ -166,23 +166,22 @@ enum LibRaw_constructor_flags enum LibRaw_warnings { - LIBRAW_WARN_NONE =0, - LIBRAW_WARN_FOVEON_NOMATRIX =1, - LIBRAW_WARN_FOVEON_INVALIDWB =1<<1, - LIBRAW_WARN_BAD_CAMERA_WB =1<<2, - LIBRAW_WARN_NO_METADATA =1<<3, - LIBRAW_WARN_NO_JPEGLIB = 1<<4, - LIBRAW_WARN_NO_EMBEDDED_PROFILE = 1<<5, - LIBRAW_WARN_NO_INPUT_PROFILE = 1<<6, - LIBRAW_WARN_BAD_OUTPUT_PROFILE= 1<<7, - LIBRAW_WARN_NO_BADPIXELMAP=1<<8, - LIBRAW_WARN_BAD_DARKFRAME_FILE=1<<9, - LIBRAW_WARN_BAD_DARKFRAME_DIM=1<<10, - LIBRAW_WARN_NO_JASPER = 1<<11, - LIBRAW_WARN_RAWSPEED_PROBLEM = 1<<12, - LIBRAW_WARN_RAWSPEED_UNSUPPORTED = 1<<13, - LIBRAW_WARN_RAWSPEED_PROCESSED = 1<<14, - LIBRAW_WARN_FALLBACK_TO_AHD = 1<<15 + LIBRAW_WARN_NONE = 0, + LIBRAW_WARN_BAD_CAMERA_WB = 1 << 2, + LIBRAW_WARN_NO_METADATA = 1 << 3, + LIBRAW_WARN_NO_JPEGLIB = 1 << 4, + LIBRAW_WARN_NO_EMBEDDED_PROFILE = 1 << 5, + LIBRAW_WARN_NO_INPUT_PROFILE = 1 << 6, + LIBRAW_WARN_BAD_OUTPUT_PROFILE = 1 << 7, + LIBRAW_WARN_NO_BADPIXELMAP = 1 << 8, + LIBRAW_WARN_BAD_DARKFRAME_FILE = 1 << 9, + LIBRAW_WARN_BAD_DARKFRAME_DIM = 1 << 10, + LIBRAW_WARN_NO_JASPER = 1 << 11, + LIBRAW_WARN_RAWSPEED_PROBLEM = 1 << 12, + LIBRAW_WARN_RAWSPEED_UNSUPPORTED = 1 << 13, + LIBRAW_WARN_RAWSPEED_PROCESSED = 1 << 14, + LIBRAW_WARN_FALLBACK_TO_AHD = 1 << 15, + LIBRAW_WARN_PARSEFUJI_PROCESSED = 1 << 16 }; enum LibRaw_exceptions diff --git a/build/cmake/windows/3rdPartyLibs/LibRaw-0.18.5/libraw/libraw_datastream.h b/build/cmake/windows/3rdPartyLibs/LibRaw-0.18.6/libraw/libraw_datastream.h similarity index 100% rename from build/cmake/windows/3rdPartyLibs/LibRaw-0.18.5/libraw/libraw_datastream.h rename to build/cmake/windows/3rdPartyLibs/LibRaw-0.18.6/libraw/libraw_datastream.h diff --git a/build/cmake/windows/3rdPartyLibs/LibRaw-0.18.5/libraw/libraw_internal.h b/build/cmake/windows/3rdPartyLibs/LibRaw-0.18.6/libraw/libraw_internal.h similarity index 100% rename from build/cmake/windows/3rdPartyLibs/LibRaw-0.18.5/libraw/libraw_internal.h rename to build/cmake/windows/3rdPartyLibs/LibRaw-0.18.6/libraw/libraw_internal.h diff --git a/build/cmake/windows/3rdPartyLibs/LibRaw-0.18.5/libraw/libraw_types.h b/build/cmake/windows/3rdPartyLibs/LibRaw-0.18.6/libraw/libraw_types.h similarity index 100% rename from build/cmake/windows/3rdPartyLibs/LibRaw-0.18.5/libraw/libraw_types.h rename to build/cmake/windows/3rdPartyLibs/LibRaw-0.18.6/libraw/libraw_types.h diff --git a/build/cmake/mac/3rdPartyLibs/LibRaw-0.18.5/libraw/libraw_version.h b/build/cmake/windows/3rdPartyLibs/LibRaw-0.18.6/libraw/libraw_version.h similarity index 98% rename from build/cmake/mac/3rdPartyLibs/LibRaw-0.18.5/libraw/libraw_version.h rename to build/cmake/windows/3rdPartyLibs/LibRaw-0.18.6/libraw/libraw_version.h index dae0826..ad2f398 100644 --- a/build/cmake/mac/3rdPartyLibs/LibRaw-0.18.5/libraw/libraw_version.h +++ b/build/cmake/windows/3rdPartyLibs/LibRaw-0.18.6/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 5 +#define LIBRAW_PATCH_VERSION 6 #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 66d34a1..e94a7a3 100644 --- a/build/cmake/windows/support/package/package.xml +++ b/build/cmake/windows/support/package/package.xml @@ -1,9 +1,9 @@ + Language='1033' Codepage='1252' Version='17.12.09' Manufacturer='Michal Duda'> - @@ -255,6 +255,7 @@ + @@ -264,7 +265,7 @@ - +