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

[freeimage] Updated port to prepare for libraw version 0.21 #29605

Closed
wants to merge 12 commits into from
+44 −4
Closed

[freeimage] Updated port to prepare for libraw version 0.21 #29605

Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
e3be949
[freeimage] Updated port to prepare for libraw version 0.21
aklemets Feb 11, 2023
0f4494c
Update baseline
aklemets Feb 11, 2023
cf6c639
Simpler build fix
aklemets Feb 12, 2023
ce9bc08
Updated the hash of latest freeimage changees
aklemets Feb 12, 2023
413d8f3
Make it possible to use substream
aklemets Feb 12, 2023
1c8f952
Updated freeimage port hash
aklemets Feb 12, 2023
4b5cb4f
Add comment and simplify patch
aklemets Feb 12, 2023
92d9a5f
Updated freeimage port hash
aklemets Feb 12, 2023
2cb660c
Remove const declaration
aklemets Feb 12, 2023
5493303
Updated freeimage port hash
aklemets Feb 12, 2023
01fea71
Someone asked me to make changes to the portfile on their behalf
aklemets Feb 14, 2023
0db2c76
Updated freeimage port hash
aklemets Feb 14, 2023
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
26 changes: 9 additions & 17 deletions ports/freeimage/rawlib-build-fix.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,34 +2,26 @@ diff --git a/Source/FreeImage/PluginRAW.cpp b/Source/FreeImage/PluginRAW.cpp
index c7f8758a..a57fd5f1 100644
--- a/Source/FreeImage/PluginRAW.cpp
+++ b/Source/FreeImage/PluginRAW.cpp
@@ -46,6 +46,11 @@ private:
@@ -46,6 +46,14 @@ private:
long _eof;
INT64 _fsize;

+#if LIBRAW_COMPILE_CHECK_VERSION_NOTLESS(0, 21)
+protected:
+ LibRaw_abstract_datastream *substream = nullptr; // polyfill
+ // Minimal change to make version 3.18.0 of FreeImage compile with
+ // LibRaw 0.20 and later versions.
+ // Once the port of FreeImage has been updated to a version greater
+ // than 3.18.0, this patch should be removed as it will not be needed.
+#if LIBRAW_COMPILE_CHECK_VERSION_NOTLESS(0, 20)
+ LibRaw_abstract_datastream const *substream = nullptr;
Copy link
Contributor

Choose a reason for hiding this comment

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

For the record the const was meant to come after the *: A const pointer, not a pointer to const.

+#endif
+
public:
LibRaw_freeimage_datastream(FreeImageIO *io, fi_handle handle) : _io(io), _handle(handle) {
long start_pos = io->tell_proc(handle);
@@ -56,6 +61,10 @@ public:
}

~LibRaw_freeimage_datastream() {
+#if LIBRAW_COMPILE_CHECK_VERSION_NOTLESS(0, 21)
+ if (substream)
+ delete substream;
+#endif
}

int valid() {
@@ -694,7 +703,11 @@ Load(FreeImageIO *io, fi_handle handle, int page, int flags, void *data) {
@@ -694,7 +702,11 @@ Load(FreeImageIO *io, fi_handle handle, int page, int flags, void *data) {
// --------------------------------------------

// (-s [0..N-1]) Select one raw image from input file
+#if LIBRAW_COMPILE_CHECK_VERSION_NOTLESS(0, 21)
+#if LIBRAW_COMPILE_CHECK_VERSION_NOTLESS(0, 20)
+ RawProcessor->imgdata.rawparams.shot_select = 0;
+#else
RawProcessor->imgdata.params.shot_select = 0;
Expand Down