Skip to content

Commit 235e364

Browse files
authored
deps: Update to the R3D SDK version 9.2.0 (#5148)
Only version has been changed and one line removed. --------- Signed-off-by: Peter Kovář <peter.kovar@reflexion.tv>
1 parent 94ec2de commit 235e364

1 file changed

Lines changed: 9 additions & 10 deletions

File tree

src/r3d.imageio/r3dinput.cpp

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
// R3D SDK can be downloaded from the following site:
66
// https://www.red.com/download/r3d-sdk
77
//
8-
// The code has been tested with the version 8.5.1 installed in
9-
// /opt/R3DSDKv8_5_1 directory and setting up the variable
10-
// export R3DSDK_ROOT="/opt/R3DSDKv8_5_1"
8+
// The code has been tested with the version 9.2.0 installed in
9+
// /opt/R3DSDKv9_2_0 directory and setting up the variable
10+
// export R3DSDK_ROOT="/opt/R3DSDKv9_2_0"
1111

1212
#include <algorithm>
1313
#include <cassert>
@@ -149,7 +149,7 @@ OIIO_EXPORT const char*
149149
r3d_imageio_library_version()
150150
{
151151
// Note: SDK version can differ from the actual library loaded
152-
return "R3D 8.5.1";
152+
return "R3D 9.2.0";
153153
}
154154

155155
OIIO_EXPORT ImageInput*
@@ -158,7 +158,7 @@ r3d_input_imageio_create()
158158
return new R3dInput;
159159
}
160160

161-
OIIO_EXPORT const char* r3d_input_extensions[] = { "r3d", nullptr };
161+
OIIO_EXPORT const char* r3d_input_extensions[] = { "r3d", "nev", nullptr };
162162

163163
OIIO_PLUGIN_EXPORTS_END
164164

@@ -172,11 +172,11 @@ R3dInput::initialize()
172172
std::string library_path
173173
= Sysutil::getenv("OIIO_R3D_LIBRARY_PATH",
174174
#if defined(__linux__)
175-
"/opt/R3DSDKv8_5_1/Redistributable/linux"
175+
"/opt/R3DSDKv9_2_0/Redistributable/linux"
176176
#elif defined(__APPLE__)
177-
"/Library/R3DSDKv8_5_1/Redistributable/mac"
177+
"/Library/R3DSDKv9_2_0/Redistributable/mac"
178178
#elif defined(__WINDOWS__)
179-
"C:\\R3DSDKv8_5_1\\Redistributable\\win"
179+
"C:\\R3DSDKv9_2_0\\Redistributable\\win"
180180
#else
181181
# error "Unknown OS"
182182
#endif
@@ -279,8 +279,7 @@ R3dInput::open(const std::string& name, ImageSpec& newspec)
279279
m_job.OutputBuffer = m_image_buffer;
280280

281281
// Interleaved RGB decoding in 16-bits per pixel
282-
m_job.PixelType = R3DSDK::PixelType_16Bit_RGB_Interleaved;
283-
m_job.BytesPerRow = m_channels * width * sizeof(uint16_t);
282+
m_job.PixelType = R3DSDK::PixelType_16Bit_RGB_Interleaved;
284283

285284
m_spec = ImageSpec(width, height, m_channels, TypeDesc::UINT16);
286285
m_spec.attribute("FramesPerSecond", TypeFloat, &m_fps);

0 commit comments

Comments
 (0)