[Scummvm-cvs-logs] scummvm master -> 4aaa74aea7b678d736c70d380a29987c2e003ca6

criezy criezy at scummvm.org
Wed Sep 10 21:27:00 CEST 2014


This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
4eb8b28986 NEWS: Fix typo
4aaa74aea7 SWORD1: Avoid possible division by zero in speech endianness heuristic


Commit: 4eb8b2898679856d66adb3faaf6e55c217433edf
    https://github.com/scummvm/scummvm/commit/4eb8b2898679856d66adb3faaf6e55c217433edf
Author: Thierry Crozat (criezy at scummvm.org)
Date: 2014-09-10T20:25:13+01:00

Commit Message:
NEWS: Fix typo

Changed paths:
    NEWS



diff --git a/NEWS b/NEWS
index 81c26bb..cc95d83 100644
--- a/NEWS
+++ b/NEWS
@@ -4,7 +4,7 @@ For a more comprehensive changelog of the latest experimental code, see:
 1.8.0 (????-??-??)
 
 Broken Sword 1:
-   - Fix speech endianness dectection on big endian systems for the mac
+   - Fix speech endianness detection on big endian systems for the mac
      version (bug #6720).
 
 1.7.0 (2014-07-21)


Commit: 4aaa74aea7b678d736c70d380a29987c2e003ca6
    https://github.com/scummvm/scummvm/commit/4aaa74aea7b678d736c70d380a29987c2e003ca6
Author: Thierry Crozat (criezy at scummvm.org)
Date: 2014-09-10T20:25:51+01:00

Commit Message:
SWORD1: Avoid possible division by zero in speech endianness heuristic

Changed paths:
    engines/sword1/sound.cpp



diff --git a/engines/sword1/sound.cpp b/engines/sword1/sound.cpp
index 37f92fc..9140bdd 100644
--- a/engines/sword1/sound.cpp
+++ b/engines/sword1/sound.cpp
@@ -160,6 +160,8 @@ double Sound::endiannessHeuristicValue(int16* data, uint32 dataSize, uint32 &max
 			prev_value = value;
 		}
 	}
+	if (cpt == 0)
+		return 50000.;
 	maxSamples = cpt;
 	return diff_sum / cpt;
 }






More information about the Scummvm-git-logs mailing list