projects/guix·blob python-team · refs

91 lines · 3.1 KiB

1Retrieved-from: https://patch-diff.githubusercontent.com/raw/OGRECave/ogre/pull/3642.patch
2
3From 760c80029e7b405e5b5d256b2a81d373329a5488 Mon Sep 17 00:00:00 2001
4From: Pavel Rojtberg <[email protected]>
5Date: Sun, 31 May 2026 13:15:43 +0200
6Subject: [PATCH 1/3] Codec: STB Image - catch stbi_failure_reason = NULL
7
8---
9 PlugIns/STBICodec/src/OgreSTBICodec.cpp | 6 +++---
10 1 file changed, 3 insertions(+), 3 deletions(-)
11
12diff --git a/PlugIns/STBICodec/src/OgreSTBICodec.cpp b/PlugIns/STBICodec/src/OgreSTBICodec.cpp
13index da432fdcd37..aa6f978ce14 100644
14--- a/PlugIns/STBICodec/src/OgreSTBICodec.cpp
15+++ b/PlugIns/STBICodec/src/OgreSTBICodec.cpp
16@@ -178,9 +178,9 @@ namespace Ogre {
17
18 if (!pixelData)
19 {
20- OGRE_EXCEPT(Exception::ERR_INTERNAL_ERROR,
21- "Error decoding image: " + String(stbi_failure_reason()),
22- "STBIImageCodec::decode");
23+ const char* reason = stbi_failure_reason();
24+ OGRE_EXCEPT(Exception::ERR_INTERNAL_ERROR,
25+ "Error decoding image: " + String(reason ? reason : "no reason"));
26 }
27
28 if (width <= 0 || height <= 0)
29
30From cb25260f1171617e6e78c427fd69fbf7a0d41027 Mon Sep 17 00:00:00 2001
31From: Pavel Rojtberg <[email protected]>
32Date: Sun, 31 May 2026 13:36:04 +0200
33Subject: [PATCH 2/3] Main: Mesh - add missing vector include
34
35---
36 OgreMain/include/OgreMesh.h | 2 ++
37 1 file changed, 2 insertions(+)
38
39diff --git a/OgreMain/include/OgreMesh.h b/OgreMain/include/OgreMesh.h
40index dbdc0688825..552df6f4052 100644
41--- a/OgreMain/include/OgreMesh.h
42+++ b/OgreMain/include/OgreMesh.h
43@@ -30,6 +30,8 @@ THE SOFTWARE.
44
45 #include "OgrePrerequisites.h"
46
47+#include <vector>
48+
49 #include "OgreResource.h"
50 #include "OgreAxisAlignedBox.h"
51 #include "OgreVertexBoneAssignment.h"
52
53From 9d5ded11a1b6a7ea078816318fde64645d176e3c Mon Sep 17 00:00:00 2001
54From: Pavel Rojtberg <[email protected]>
55Date: Sun, 31 May 2026 13:48:23 +0200
56Subject: [PATCH 3/3] Plugins: DotScene - unregister in uninstall
57
58to match registration
59---
60 PlugIns/DotScene/include/OgreDotSceneLoader.h | 4 ++--
61 PlugIns/DotScene/src/DotSceneLoader.cpp | 2 +-
62 2 files changed, 3 insertions(+), 3 deletions(-)
63
64diff --git a/PlugIns/DotScene/include/OgreDotSceneLoader.h b/PlugIns/DotScene/include/OgreDotSceneLoader.h
65index 92604a25247..107cec22cfa 100644
66--- a/PlugIns/DotScene/include/OgreDotSceneLoader.h
67+++ b/PlugIns/DotScene/include/OgreDotSceneLoader.h
68@@ -87,8 +87,8 @@ class _OgreDotScenePluginExport DotScenePlugin : public Plugin
69
70 void install() override;
71 void initialise() override {}
72- void shutdown() override;
73- void uninstall() override {}
74+ void uninstall() override;
75+ void shutdown() override {}
76 private:
77 Codec* mCodec;
78 };
79diff --git a/PlugIns/DotScene/src/DotSceneLoader.cpp b/PlugIns/DotScene/src/DotSceneLoader.cpp
80index bb5f9b3ccc9..33c26b87faf 100644
81--- a/PlugIns/DotScene/src/DotSceneLoader.cpp
82+++ b/PlugIns/DotScene/src/DotSceneLoader.cpp
83@@ -1143,7 +1143,7 @@ void DotScenePlugin::install()
84 Codec::registerCodec(mCodec);
85 }
86
87-void DotScenePlugin::shutdown() {
88+void DotScenePlugin::uninstall() {
89 Codec::unregisterCodec(mCodec);
90 delete mCodec;
91 }