|
18 | 18 | import numpy as np
|
19 | 19 |
|
20 | 20 | # _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") |
22 | 22 |
|
23 | 23 | enum_LibRaw_thumbnail_formats = c_int
|
24 | 24 | time_t = c_long
|
@@ -85,7 +85,7 @@ def colormatrix(self):
|
85 | 85 | def calibration(self):
|
86 | 86 | return _array_from_memory(self._calibration, (4, 4), np.float32)
|
87 | 87 |
|
88 |
| -class canon_makernotes_t(Structure): |
| 88 | +class libraw_canon_makernotes_t(Structure): |
89 | 89 | _fields_ = [
|
90 | 90 | ('CanonColorDataVer', c_int),
|
91 | 91 | ('CanonColorDataSubVer', c_int),
|
@@ -116,7 +116,7 @@ class libraw_colordata_t(Structure):
|
116 | 116 | ('black_stat', c_uint * 8),
|
117 | 117 | # 0.17+
|
118 | 118 | ('dng_color', libraw_dng_color_t * 2),
|
119 |
| - ('canon_makernotes', canon_makernotes_t), |
| 119 | + ('canon_makernotes', libraw_canon_makernotes_t), |
120 | 120 | ('baseline_exposure', c_float),
|
121 | 121 | ('OlympusSensorCalibration', c_int * 2),
|
122 | 122 | ('FujiExpoMidPointShift', c_float),
|
@@ -406,7 +406,7 @@ def versionNumber():
|
406 | 406 |
|
407 | 407 | class LibRaw:
|
408 | 408 | def __init__(self, flags=0):
|
409 |
| - if versionNumber()[1] > 15: |
| 409 | + if versionNumber()[1] != 17: |
410 | 410 | sys.stdout.write("libraw.py: warning - structure definitions are not compatible with your version.\n")
|
411 | 411 |
|
412 | 412 | self._proc = _hdl.libraw_init(flags)
|
|
0 commit comments