[neon/backports-focal/assimp/Neon/unstable] debian/patches: Revert "Add patch to fix crash with LWO models"

Jonathan Riddell null at kde.org
Thu Dec 16 13:23:59 GMT 2021


Git commit df5f6ff7cfa07acf5b344713fab0e089343191ae by Jonathan Riddell.
Committed on 16/12/2021 at 13:23.
Pushed by jriddell into branch 'Neon/unstable'.

Revert "Add patch to fix crash with LWO models"

This reverts commit d37c7751d9024ba52fec44e903900d977bb8da5a.

D  +0    -21   debian/patches/fix-LWOLoader.patch
M  +0    -1    debian/patches/series

https://invent.kde.org/neon/backports-focal/assimp/commit/df5f6ff7cfa07acf5b344713fab0e089343191ae

diff --git a/debian/patches/fix-LWOLoader.patch b/debian/patches/fix-LWOLoader.patch
deleted file mode 100644
index 5121bce..0000000
--- a/debian/patches/fix-LWOLoader.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Description: Fix typo in LWOLoader that leads to crashes
-Author: IOhannes m zmölnig
-Forwarded: https://github.com/assimp/assimp/pull/4226
-Last-Update: 2021-12-07
----
- code/AssetLib/LWO/LWOLoader.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/code/AssetLib/LWO/LWOLoader.cpp b/code/AssetLib/LWO/LWOLoader.cpp
-index bc62152..801da1d 100644
---- a/code/AssetLib/LWO/LWOLoader.cpp
-+++ b/code/AssetLib/LWO/LWOLoader.cpp
-@@ -393,7 +393,7 @@ void LWOImporter::InternReadFile(const std::string &pFile,
- 
-                             // If a RGB color map is explicitly requested delete the
-                             // alpha channel - it could theoretically be != 1.
--                            if (_mSurfaces[i].mVCMapType == AI_LWO_RGB)
-+                            if (_mSurfaces[j].mVCMapType == AI_LWO_RGB)
-                                 pvVC[w]->a = 1.f;
- 
-                             pvVC[w]++;
diff --git a/debian/patches/series b/debian/patches/series
index 92e466a..6a91ea6 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,4 +5,3 @@ use-system-libdraco.patch
 pyassimp.patch
 pyassimp_faces.patch
 doxygen.patch
-fix-LWOLoader.patch



More information about the Neon-commits mailing list