[Scummvm-cvs-logs] scummvm-tools master -> 425af256599fcbc4c7774d1b4306215e9f8e629c

[lordhoto]

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

Summary:
ddec903aeb TOOLS: Fix compiler warning in FLAC compression code.
425af25659 TOOLS: Fix compiler warning in create_sjisfnt with recent FreeType2 headers.


Commit: ddec903aeb980e4b8ca0421566b06d3a46bb0a6b
    https://github.com/scummvm/scummvm-tools/commit/ddec903aeb980e4b8ca0421566b06d3a46bb0a6b
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2015-11-23T02:16:24+01:00

Commit Message:
TOOLS: Fix compiler warning in FLAC compression code.

Changed paths:
    compress.cpp



diff --git a/compress.cpp b/compress.cpp
index 71eee40..f5ad4ee 100644
--- a/compress.cpp
+++ b/compress.cpp
@@ -529,14 +529,12 @@ void CompressionTool::encodeRaw(const char *rawData, int length, int samplerate,
 
 		if (rawAudioType.bitsPerSample == 8) {
 			for (i = 0; i < samplesPerChannel * numChannels; i++) {
-				FLAC__uint8 *rawDataUnsigned;
-				rawDataUnsigned = (FLAC__uint8 *)rawData;
+				const FLAC__uint8 *rawDataUnsigned = (const FLAC__uint8 *)rawData;
 				flacData[i] = (FLAC__int32)rawDataUnsigned[i] - 0x80;
 			}
 		} else if (rawAudioType.bitsPerSample == 16) {
 			/* The rawData pointer is an 8-bit char so we must create a new pointer to access 16-bit samples */
-			FLAC__int16 *rawData16;
-			rawData16 = (FLAC__int16 *)rawData;
+			const FLAC__int16 *rawData16 = (const FLAC__int16 *)rawData;
 			for (i = 0; i < samplesPerChannel * numChannels; i++) {
 				flacData[i] = (FLAC__int32)rawData16[i];
 			}


Commit: 425af256599fcbc4c7774d1b4306215e9f8e629c
    https://github.com/scummvm/scummvm-tools/commit/425af256599fcbc4c7774d1b4306215e9f8e629c
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2015-11-23T02:18:17+01:00

Commit Message:
TOOLS: Fix compiler warning in create_sjisfnt with recent FreeType2 headers.

Changed paths:
    create_sjisfnt.cpp



diff --git a/create_sjisfnt.cpp b/create_sjisfnt.cpp
index bd31acc..9c411f3 100644
--- a/create_sjisfnt.cpp
+++ b/create_sjisfnt.cpp
@@ -450,7 +450,7 @@ bool TrueTypeFont::renderGlyph(uint32 unicode, Glyph &glyph) {
 		if (glyph.pitch < 0)
 			dst += (glyph.height - 1) * (-glyph.pitch);
 
-		for (int i = 0; i < bitmap.rows; ++i) {
+		for (int i = 0; i < (int)bitmap.rows; ++i) {
 			memcpy(dst, src, abs(glyph.pitch));
 			src += bitmap.pitch;
 			dst += glyph.pitch;