Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

R3D #4216

Merged
merged 19 commits into from
Apr 20, 2024
Merged

R3D #4216

Changes from 1 commit
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
26533d0
R3D
1div0 Apr 5, 2024
d936e15
clang-format
1div0 Apr 5, 2024
c762918
Add instructions fro R3D SDK download and configuration
1div0 Apr 9, 2024
8c03a50
Add macOS
1div0 Apr 13, 2024
2f9fa78
Added conditional compiling of the various decoders
1div0 Apr 14, 2024
849e138
Correction for the forgotten header file
1div0 Apr 14, 2024
faf4c96
Modified the R3D SDK CMake module for macOS
1div0 Apr 16, 2024
a0309e5
clang-format
1div0 Apr 16, 2024
072572d
Improvede debugging controlled by OIIO_COLOR_DEBUG=1 environment vari…
1div0 Apr 16, 2024
cbf7579
Use aligned_malloc()
1div0 Apr 16, 2024
d8f600a
Use copy_image()
1div0 Apr 17, 2024
6c42d2d
Use OIIO_R3D_LIBRARY_PATH environment variable
1div0 Apr 17, 2024
08dc366
clang-format as usual
1div0 Apr 17, 2024
8f7b3af
clang-format one more time
1div0 Apr 17, 2024
e8e7b39
Use interleaved RGB channels
1div0 Apr 18, 2024
6e071e9
Report the R3D library version as a plug-in version
1div0 Apr 20, 2024
34aee60
Get rid of the planar decoding configuration
1div0 Apr 20, 2024
89c0bfb
Allow R3D configuration debugging
1div0 Apr 20, 2024
7cf8579
clang-format again
1div0 Apr 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion src/r3d.imageio/r3dinput.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,8 @@ OIIO_EXPORT int r3d_imageio_version = OIIO_PLUGIN_VERSION;
OIIO_EXPORT const char*
r3d_imageio_library_version()
{
return "R3D";
// Note: SDK version can differ from the actual library loaded
return "R3D 8.5.1";
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you get this from the library or the r3dsdk headers? This will obviously be wrong as soon as a new release is out.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I can get this from the CMake script. Indeed, hardcoding the version string is not proper way to handle this. The actual library version may be different at runtime, as I've tested so far. But nothing exploded. This version is reported just after initialization from R3DSDK::GetSdkVersion().

}

OIIO_EXPORT ImageInput*
Expand Down