Skip to content

Commit

Permalink
Libraw 0.18.6 (#11)
Browse files Browse the repository at this point in the history 
* MacOS: LibRaw updated to version 0.18.6

* Windows: libraw 0.18.5 replaced with 0.18.6
  • Loading branch information
@vookimedlo
vookimedlo authored Dec 9, 2017
1 parent b9782f6 commit 7948271
Show file tree
Hide file tree
Showing 27 changed files with 40 additions and 41 deletions.
4 changes: 2 additions & 2 deletions build/cmake/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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}")

Expand All @@ -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)
Expand Down
0 .../mac/3rdPartyLibs/LibRaw-0.18.5/COPYRIGHT → .../mac/3rdPartyLibs/LibRaw-0.18.6/COPYRIGHT
View file
File renamed without changes.
0 ...c/3rdPartyLibs/LibRaw-0.18.5/LICENSE.LGPL → ...c/3rdPartyLibs/LibRaw-0.18.6/LICENSE.LGPL
View file
File renamed without changes.
0 ...ake/mac/3rdPartyLibs/LibRaw-0.18.5/README → ...ake/mac/3rdPartyLibs/LibRaw-0.18.6/README
View file
File renamed without changes.
Binary file renamed ...c/3rdPartyLibs/LibRaw-0.18.5/lib/libraw.a → ...c/3rdPartyLibs/LibRaw-0.18.6/lib/libraw.a
View file
Binary file not shown.
Binary file renamed ...3rdPartyLibs/LibRaw-0.18.5/lib/libraw_r.a → ...3rdPartyLibs/LibRaw-0.18.6/lib/libraw_r.a
View file
Binary file not shown.
0 ...rdPartyLibs/LibRaw-0.18.5/libraw/libraw.h → ...rdPartyLibs/LibRaw-0.18.6/libraw/libraw.h
View file
File renamed without changes.
0 ...yLibs/LibRaw-0.18.5/libraw/libraw_alloc.h → ...yLibs/LibRaw-0.18.6/libraw/libraw_alloc.h
View file
File renamed without changes.
33 changes: 16 additions & 17 deletions ...yLibs/LibRaw-0.18.5/libraw/libraw_const.h → ...yLibs/LibRaw-0.18.6/libraw/libraw_const.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
0 .../LibRaw-0.18.5/libraw/libraw_datastream.h → .../LibRaw-0.18.6/libraw/libraw_datastream.h
View file
File renamed without changes.
0 ...bs/LibRaw-0.18.5/libraw/libraw_internal.h → ...bs/LibRaw-0.18.6/libraw/libraw_internal.h
View file
File renamed without changes.
0 ...yLibs/LibRaw-0.18.5/libraw/libraw_types.h → ...yLibs/LibRaw-0.18.6/libraw/libraw_types.h
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion ...ibs/LibRaw-0.18.5/libraw/libraw_version.h → ...ibs/LibRaw-0.18.6/libraw/libraw_version.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Binary file removed build/cmake/windows/3rdPartyLibs/LibRaw-0.18.5/lib/libraw.lib
View file
Binary file not shown.
0 ...dows/3rdPartyLibs/LibRaw-0.18.5/COPYRIGHT → ...dows/3rdPartyLibs/LibRaw-0.18.6/COPYRIGHT
View file
File renamed without changes.
0 ...s/3rdPartyLibs/LibRaw-0.18.5/LICENSE.LGPL → ...s/3rdPartyLibs/LibRaw-0.18.6/LICENSE.LGPL
View file
File renamed without changes.
0 ...windows/3rdPartyLibs/LibRaw-0.18.5/README → ...windows/3rdPartyLibs/LibRaw-0.18.6/README
View file
File renamed without changes.
Binary file added build/cmake/windows/3rdPartyLibs/LibRaw-0.18.6/lib/debug/libraw.lib
View file
Binary file not shown.
Binary file added build/cmake/windows/3rdPartyLibs/LibRaw-0.18.6/lib/libraw.lib
View file
Binary file not shown.
0 ...rdPartyLibs/LibRaw-0.18.5/libraw/libraw.h → ...rdPartyLibs/LibRaw-0.18.6/libraw/libraw.h
View file
File renamed without changes.
0 ...yLibs/LibRaw-0.18.5/libraw/libraw_alloc.h → ...yLibs/LibRaw-0.18.6/libraw/libraw_alloc.h
View file
File renamed without changes.
33 changes: 16 additions & 17 deletions ...yLibs/LibRaw-0.18.5/libraw/libraw_const.h → ...yLibs/LibRaw-0.18.6/libraw/libraw_const.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
0 .../LibRaw-0.18.5/libraw/libraw_datastream.h → .../LibRaw-0.18.6/libraw/libraw_datastream.h
View file
File renamed without changes.
0 ...bs/LibRaw-0.18.5/libraw/libraw_internal.h → ...bs/LibRaw-0.18.6/libraw/libraw_internal.h
View file
File renamed without changes.
0 ...yLibs/LibRaw-0.18.5/libraw/libraw_types.h → ...yLibs/LibRaw-0.18.6/libraw/libraw_types.h
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion ...ibs/LibRaw-0.18.5/libraw/libraw_version.h → ...ibs/LibRaw-0.18.6/libraw/libraw_version.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
7 changes: 4 additions & 3 deletions build/cmake/windows/support/package/package.xml
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<?xml version='1.0' encoding='utf-8'?>
<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>
<Product Name='VookiImageViewer' Id='28F2F82D-4157-4A7E-9D27-FEEA3C0AEC15' UpgradeCode='91FA8A80-C971-408A-A735-4EB3D230D9F6'
Language='1033' Codepage='1252' Version='17.11.24' Manufacturer='Michal Duda'>
Language='1033' Codepage='1252' Version='17.12.09' Manufacturer='Michal Duda'>

<Package Id='*' Keywords='Installer' Description="Michal Duda VookiImageViewer 1.0 Installer"
<Package Id='*' Keywords='Installer' Description="Michal Duda VookiImageViewer Installer"
Comments='Lightweight image viewer for a fast image preview.' Manufacturer='Michal Duda'
InstallerVersion='500' Languages='1033' Compressed='yes' SummaryCodepage='1252'
Platform="x64" />
Expand Down Expand Up @@ -255,6 +255,7 @@
<File Id="qjpeg.dll" Name="qjpeg.dll" />
<File Id="qsvg.dll" Name="qsvg.dll" />
<File Id="qtga.dll" Name="qtga.dll" />
<File Id="qtiff.dll" Name="qtiff.dll" />
<File Id="qwbmp.dll" Name="qwbmp.dll" />
<File Id="qwebp.dll" Name="qwebp.dll" />
<File Id="vooki_kimg_pcx.dll" Name="vooki_kimg_pcx.dll" />
Expand All @@ -264,7 +265,7 @@
<File Id="vooki_kimg_rgb.dll" Name="vooki_kimg_rgb.dll" />
<File Id="vooki_kimg_tga.dll" Name="vooki_kimg_tga.dll" />
<File Id="vooki_kimg_xcf.dll" Name="vooki_kimg_xcf.dll" />
<File Id="vooki_raw_thumb.dll" Name="vooki_raw_thumb.dll" KeyPath="yes"/>
<File Id="vooki_raw_thumb.dll" Name="vooki_raw_thumb.dll" KeyPath="yes" />
</Component>
</Directory>

Expand Down

0 comments on commit 7948271

Please sign in to comment.