[Scummvm-git-logs] scummvm master -> 0b19ebe7b239a8e685832c0a5c316e75cd4c557b

[dreammaster]

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

Summary:
0b19ebe7b2 IMAGE: Fix shadowing warning


Commit: 0b19ebe7b239a8e685832c0a5c316e75cd4c557b
    https://github.com/scummvm/scummvm/commit/0b19ebe7b239a8e685832c0a5c316e75cd4c557b
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2017-09-04T09:16:59-04:00

Commit Message:
IMAGE: Fix shadowing warning

Changed paths:
    image/codecs/indeo/get_bits.h


diff --git a/image/codecs/indeo/get_bits.h b/image/codecs/indeo/get_bits.h
index f972e68..a930f43 100644
--- a/image/codecs/indeo/get_bits.h
+++ b/image/codecs/indeo/get_bits.h
@@ -35,10 +35,8 @@ class GetBits : public Common::BitStreamMemory8LSB {
 public:
 	/**
 	* Constructor
-	* @param stream				Source stream to reader from
-	* @param disposeAfterUse	Whether to destroy stream in destructor
 	*/
-	GetBits(const uint8 *ptr, uint32 size) : Common::BitStreamMemory8LSB(new Common::BitStreamMemoryStream(ptr, size), DisposeAfterUse::YES) {}
+	GetBits(const byte *dataPtr, uint32 dataSize) : Common::BitStreamMemory8LSB(new Common::BitStreamMemoryStream(dataPtr, dataSize), DisposeAfterUse::YES) {}
 
 	/**
 	 * The number of bits left