COMMON: Add template ctor to MemoryReadStream for arrays

Creating a MemoryReadStream around an array buffer.

src/aurora/erffile.cpp

@@ -208,7 +208,7 @@ void ERFFile::verifyPasswordDigest() {
 		for (size_t i = 0; i < sizeof(buffer); i++)
 			buffer[i] = i;
 
-		Common::MemoryReadStream bufferStream(buffer, sizeof(buffer));
+		Common::MemoryReadStream bufferStream(buffer);
 		Common::ScopedPtr<Common::SeekableReadStream>
 			bufferEncrypted(Common::encryptBlowfishEBC(bufferStream, _password));
 

src/common/memreadstream.cpp

@@ -56,14 +56,6 @@
 
 namespace Common {
 
-MemoryReadStream::MemoryReadStream(const byte *dataPtr, size_t dataSize, bool disposeMemory) :
-	_ptrOrig(dataPtr, disposeMemory), _ptr(dataPtr), _size(dataSize), _pos(0), _eos(false) {
-
-}
-
-MemoryReadStream::~MemoryReadStream() {
-}
-
 size_t MemoryReadStream::read(void *dataPtr, size_t dataSize) {
 	assert(dataPtr);
 

src/common/memreadstream.h

@@ -67,10 +67,21 @@ class MemoryReadStream : boost::noncopyable, public SeekableReadStream {
 public:
 	/** This constructor takes a pointer to a memory buffer and a length, and
 	 *  wraps it. If disposeMemory is true, the MemoryReadStream takes ownership
-	 *  of the buffer and hence delete[]'s it when destructed.
-	 */
-	MemoryReadStream(const byte *dataPtr, size_t dataSize, bool disposeMemory = false);
-	~MemoryReadStream();
+	 *  of the buffer and hence delete[]'s it when destructed. */
+	MemoryReadStream(const byte *dataPtr, size_t dataSize, bool disposeMemory = false) :
+		_ptrOrig(dataPtr, disposeMemory), _ptr(dataPtr), _size(dataSize), _pos(0), _eos(false) {
+
+	}
+
+	/** Template constructor to create a MemoryReadStream around a static array buffer.
+	 *  Never disposes its memory. */
+	template<size_t N>
+	MemoryReadStream(const byte (&array)[N]) :
+		_ptrOrig(array, false), _ptr(array), _size(N), _pos(0), _eos(false) {
+
+	}
+
+	~MemoryReadStream() { }
 
 	size_t read(void *dataPtr, size_t dataSize);
 

src/common/systemfonts.cpp

@@ -20761,7 +20761,7 @@ static const byte kDejaVuSansMonoBold[] = {
 
 
 SeekableReadStream *getSystemFontMono() {
-	return new MemoryReadStream(kDejaVuSansMonoBold, sizeof(kDejaVuSansMonoBold));
+	return new MemoryReadStream(kDejaVuSansMonoBold);
 }
 
 } // End of namespace Common