Skip to content

Commit 0e9b7da

Browse files
committed
update to libraw-0.17 final
1 parent 454df11 commit 0e9b7da

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

libraw.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
import numpy as np
1919

2020
# _hdl = cdll.LoadLibrary(ctypes.util.find_library("raw"))
21-
_hdl = cdll.LoadLibrary("libraw.so.13.0.0")
21+
_hdl = cdll.LoadLibrary("libraw.so.15.0.0")
2222

2323
enum_LibRaw_thumbnail_formats = c_int
2424
time_t = c_long
@@ -85,7 +85,7 @@ def colormatrix(self):
8585
def calibration(self):
8686
return _array_from_memory(self._calibration, (4, 4), np.float32)
8787

88-
class canon_makernotes_t(Structure):
88+
class libraw_canon_makernotes_t(Structure):
8989
_fields_ = [
9090
('CanonColorDataVer', c_int),
9191
('CanonColorDataSubVer', c_int),
@@ -116,7 +116,7 @@ class libraw_colordata_t(Structure):
116116
('black_stat', c_uint * 8),
117117
# 0.17+
118118
('dng_color', libraw_dng_color_t * 2),
119-
('canon_makernotes', canon_makernotes_t),
119+
('canon_makernotes', libraw_canon_makernotes_t),
120120
('baseline_exposure', c_float),
121121
('OlympusSensorCalibration', c_int * 2),
122122
('FujiExpoMidPointShift', c_float),
@@ -406,7 +406,7 @@ def versionNumber():
406406

407407
class LibRaw:
408408
def __init__(self, flags=0):
409-
if versionNumber()[1] > 15:
409+
if versionNumber()[1] != 17:
410410
sys.stdout.write("libraw.py: warning - structure definitions are not compatible with your version.\n")
411411

412412
self._proc = _hdl.libraw_init(flags)

0 commit comments

Comments
 (0)