[mupen64plus-video-rice] 50/191: Fix crash in loading Celda 2009 hi-res texture pack for Zelda Ocarina of Time

[Sven Eckelmann]

This is an automated email from the git hooks/post-receive script.

ecsv-guest pushed a commit to branch armhf_test
in repository mupen64plus-video-rice.

commit 24dcd7b59a9cb3d23078c1e2b482051f3e1b2793
Author: Sven Eckelmann <sven at narfation.org>
Date:   Sat Apr 9 10:24:32 2011 +0200

    Fix crash in loading Celda 2009 hi-res texture pack for Zelda Ocarina of Time
---
 debian/changelog                           |  8 ++++++++
 debian/patches/highres_memcorruption.patch | 27 +++++++++++++++++++++++++++
 debian/patches/series                      |  1 +
 3 files changed, 36 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index b629431..6e26125 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+mupen64plus-video-rice (1.99.4-2) UNRELEASED; urgency=low
+
+  * debian/patches:
+    - Add highres_memcorruption.patch, fix crash in loading Celda 2009 hi-res
+      texture pack for Zelda Ocarina of Time
+
+ -- Sven Eckelmann <sven at narfation.org>  Sat, 09 Apr 2011 10:24:04 +0200
+
 mupen64plus-video-rice (1.99.4-1) experimental; urgency=low
 
   * New Upstream Version
diff --git a/debian/patches/highres_memcorruption.patch b/debian/patches/highres_memcorruption.patch
new file mode 100644
index 0000000..8f22074
--- /dev/null
+++ b/debian/patches/highres_memcorruption.patch
@@ -0,0 +1,27 @@
+Description: fix crash in loading Celda 2009 hi-res texture pack for Zelda Ocarina of Time
+Author: Richard Goedeken <Richard at fascinationsoftware.com>
+
+---
+diff --git a/src/TextureFilters.cpp b/src/TextureFilters.cpp
+index e6adc5e115ac8b368544f974d2ca598366caa04c..20f904d8be25a2073b9527202342b0848c72a4d4 100644
+--- a/src/TextureFilters.cpp
++++ b/src/TextureFilters.cpp
+@@ -1288,6 +1288,7 @@ void FindAllHiResTextures(void)
+     gHiresTxtrInfos.clear();
+     if (!osal_is_directory(foldername))
+     {
++        DebugMessage(M64MSG_WARNING, "Couldn't open hi-res texture directory: %s", foldername);
+         return;
+     }
+     else
+@@ -1849,8 +1850,8 @@ void LoadHiresTexture( TxtrCacheEntry &entry )
+     }
+ 
+     // calculate the texture size magnification by comparing the N64 texture size and the hi-res texture size
+-    int scalex = width / (int)entry.ti.WidthToCreate;
+-    int scaley = height / (int)entry.ti.HeightToCreate;
++    int scalex = width / (int)entry.ti.WidthToLoad;
++    int scaley = height / (int)entry.ti.HeightToLoad;
+     int mirrorx = 1;
+     int mirrory = 1;
+     if (entry.ti.WidthToCreate/entry.ti.WidthToLoad == 2) mirrorx = 2;
diff --git a/debian/patches/series b/debian/patches/series
index 16e335d..e93adc0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 default-optimisations.patch
 hurd_os.patch
+highres_memcorruption.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/mupen64plus-video-rice.git