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

[3.x] embree: Fix invalid output operators raising errors with GCC 15 #102023

Merged
merged 1 commit into from
Jan 30, 2025
Merged

[3.x] embree: Fix invalid output operators raising errors with GCC 15 #102023

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions thirdparty/embree/kernels/geometry/pointi.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,9 +210,9 @@ namespace embree
};

/*! output operator */
friend __forceinline embree_ostream operator<<(embree_ostream cout, const PointMi& line)
friend __forceinline embree_ostream operator<<(embree_ostream cout, const PointMi& point)
{
return cout << "Line" << M << "i {" << line.v0 << ", " << line.geomID() << ", " << line.primID() << "}";
return cout << "Point" << M << "i {" << point.geomID() << ", " << point.primID() << "}";
}

public:
Expand Down
2 changes: 1 addition & 1 deletion thirdparty/embree/kernels/subdiv/bezier_curve.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ namespace embree
}

friend embree_ostream operator<<(embree_ostream cout, const QuadraticBezierCurve& a) {
return cout << "QuadraticBezierCurve ( (" << a.u.lower << ", " << a.u.upper << "), " << a.v0 << ", " << a.v1 << ", " << a.v2 << ")";
return cout << "QuadraticBezierCurve (" << a.v0 << ", " << a.v1 << ", " << a.v2 << ")";
}
};

Expand Down
39 changes: 39 additions & 0 deletions thirdparty/embree/patches/embree-fix-output-operator.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
From cda4cf1919bb2a748e78915fbd6e421a1056638d Mon Sep 17 00:00:00 2001
From: Daniel Opitz <[email protected]>
Date: Mon, 13 May 2024 10:17:51 +0200
Subject: [PATCH] fix output operator, issue #486

---
kernels/geometry/pointi.h | 4 ++--
kernels/subdiv/bezier_curve.h | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/kernels/geometry/pointi.h b/kernels/geometry/pointi.h
index f81edb9035..aba8ec4ab3 100644
--- a/kernels/geometry/pointi.h
+++ b/kernels/geometry/pointi.h
@@ -210,9 +210,9 @@ namespace embree
};

/*! output operator */
- friend __forceinline embree_ostream operator<<(embree_ostream cout, const PointMi& line)
+ friend __forceinline embree_ostream operator<<(embree_ostream cout, const PointMi& point)
{
- return cout << "Line" << M << "i {" << line.v0 << ", " << line.geomID() << ", " << line.primID() << "}";
+ return cout << "Point" << M << "i {" << point.geomID() << ", " << point.primID() << "}";
}

public:
diff --git a/kernels/subdiv/bezier_curve.h b/kernels/subdiv/bezier_curve.h
index 257e0afd40..5e3b5c83b3 100644
--- a/kernels/subdiv/bezier_curve.h
+++ b/kernels/subdiv/bezier_curve.h
@@ -135,7 +135,7 @@ namespace embree
}

friend embree_ostream operator<<(embree_ostream cout, const QuadraticBezierCurve& a) {
- return cout << "QuadraticBezierCurve ( (" << a.u.lower << ", " << a.u.upper << "), " << a.v0 << ", " << a.v1 << ", " << a.v2 << ")";
+ return cout << "QuadraticBezierCurve (" << a.v0 << ", " << a.v1 << ", " << a.v2 << ")";
}
};