[Scummvm-cvs-logs] CVS: scummvm-new/scumm/smush blitter.h,1.2,1.3 brenderer.h,1.1,1.2 channel.h,1.2,1.3 chunk.h,1.1,1.2 chunk_type.h,1.1,1.2 codec1.h,1.2,1.3 codec37.cpp,1.2,1.3 codec37.h,1.2,1.3 codec44.h,1.2,1.3 codec47.h,1.2,1.3 color.h,1.2,1.3 config.h,1.1,1.2 decoder.h,1.2,1.3 frenderer.h,1.2,1.3 imuse_channel.cpp,1.3,1.4 mixer.h,1.1,1.2 palette.h,1.1,1.2 player.cpp,1.2,1.3 player.h,1.2,1.3 rect.h,1.1,1.2 renderer.h,1.1,1.2 scumm_renderer.h,1.2,1.3

Max Horn fingolfin at users.sourceforge.net
Sat Aug 24 16:22:17 CEST 2002


Update of /cvsroot/scummvm/scummvm-new/scumm/smush
In directory usw-pr-cvs1:/tmp/cvs-serv5396/scumm/smush

Modified Files:
	blitter.h brenderer.h channel.h chunk.h chunk_type.h codec1.h 
	codec37.cpp codec37.h codec44.h codec47.h color.h config.h 
	decoder.h frenderer.h imuse_channel.cpp mixer.h palette.h 
	player.cpp player.h rect.h renderer.h scumm_renderer.h 
Log Message:
endian fixes; cleanup

Index: blitter.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm-new/scumm/smush/blitter.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- blitter.h	24 Aug 2002 17:18:55 -0000	1.2
+++ blitter.h	24 Aug 2002 23:21:55 -0000	1.3
@@ -19,8 +19,8 @@
  *
  */
 
-#ifndef __BLITTER_H_
-#define __BLITTER_H_
+#ifndef BLITTER_H
+#define BLITTER_H
 
 #include "config.h"
 

Index: brenderer.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm-new/scumm/smush/brenderer.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- brenderer.h	24 Aug 2002 15:31:37 -0000	1.1
+++ brenderer.h	24 Aug 2002 23:21:55 -0000	1.2
@@ -19,8 +19,8 @@
  *
  */
 
-#ifndef __BRENDERER_H_
-#define __BRENDERER_H_
+#ifndef BRENDERER_H
+#define BRENDERER_H
 
 #include "config.h"
 

Index: channel.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm-new/scumm/smush/channel.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- channel.h	24 Aug 2002 17:18:55 -0000	1.2
+++ channel.h	24 Aug 2002 23:21:55 -0000	1.3
@@ -19,8 +19,8 @@
  *
  */
 
-#ifndef __CHANNEL_H_
-#define __CHANNEL_H_
+#ifndef CHANNEL_H
+#define CHANNEL_H
 
 #include "config.h"
 

Index: chunk.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm-new/scumm/smush/chunk.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- chunk.h	24 Aug 2002 17:18:55 -0000	1.1
+++ chunk.h	24 Aug 2002 23:21:55 -0000	1.2
@@ -19,8 +19,8 @@
  *
  */
 
-#ifndef __CHUNK_H_
-#define __CHUNK_H_
+#ifndef CHUNK_H
+#define CHUNK_H
 
 #include "config.h"
 

Index: chunk_type.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm-new/scumm/smush/chunk_type.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- chunk_type.h	24 Aug 2002 17:18:55 -0000	1.1
+++ chunk_type.h	24 Aug 2002 23:21:55 -0000	1.2
@@ -19,8 +19,8 @@
  *
  */
 
-#ifndef __CHUNK_TYPE_H
-#define __CHUNK_TYPE_H
+#ifndef CHUNK_TYPE_H
+#define CHUNK_TYPE_H
 
 #include "Chunk.h"
 

Index: codec1.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm-new/scumm/smush/codec1.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- codec1.h	24 Aug 2002 17:18:55 -0000	1.2
+++ codec1.h	24 Aug 2002 23:21:55 -0000	1.3
@@ -19,8 +19,8 @@
  *
  */
 
-#ifndef __CODEC1_H_
-#define __CODEC1_H_
+#ifndef CODEC1_H
+#define CODEC1_H
 
 #include "config.h"
 

Index: codec37.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm-new/scumm/smush/codec37.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- codec37.cpp	24 Aug 2002 17:18:55 -0000	1.2
+++ codec37.cpp	24 Aug 2002 23:21:55 -0000	1.3
@@ -317,9 +317,6 @@
 }
 
 void Codec37Decoder::proc4(Blitter & dst, Chunk & src, int next_offs, int bw, int bh) {
-#ifdef DEBUG_CODEC37_PROC4
-	int b_nb = 0;
-#endif
 	do {
 		int i = bw;
 		do {

Index: codec37.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm-new/scumm/smush/codec37.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- codec37.h	24 Aug 2002 17:18:55 -0000	1.2
+++ codec37.h	24 Aug 2002 23:21:55 -0000	1.3
@@ -19,8 +19,8 @@
  *
  */
 
-#ifndef __CODEC37_H_
-#define __CODEC37_H_
+#ifndef CODEC37_H
+#define CODEC37_H
 
 #include "config.h"
 

Index: codec44.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm-new/scumm/smush/codec44.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- codec44.h	24 Aug 2002 17:18:55 -0000	1.2
+++ codec44.h	24 Aug 2002 23:21:55 -0000	1.3
@@ -19,8 +19,8 @@
  *
  */
 
-#ifndef __CODEC44_H_
-#define __CODEC44_H_
+#ifndef CODEC44_H
+#define CODEC44_H
 
 #include "config.h"
 

Index: codec47.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm-new/scumm/smush/codec47.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- codec47.h	24 Aug 2002 17:18:55 -0000	1.2
+++ codec47.h	24 Aug 2002 23:21:55 -0000	1.3
@@ -19,8 +19,8 @@
  *
  */
 
-#ifndef __CODEC_47_H_
-#define __CODEC_47_H_
+#ifndef CODEC_47_H
+#define CODEC_47_H
 
 #include "config.h"
 

Index: color.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm-new/scumm/smush/color.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- color.h	24 Aug 2002 17:18:55 -0000	1.2
+++ color.h	24 Aug 2002 23:21:55 -0000	1.3
@@ -19,8 +19,8 @@
  *
  */
 
-#ifndef __Chunk_H_
-#define __Chunk_H_
+#ifndef COLOR_H
+#define COLOR_H
 
 #include "config.h"
 

Index: config.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm-new/scumm/smush/config.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- config.h	24 Aug 2002 15:31:37 -0000	1.1
+++ config.h	24 Aug 2002 23:21:55 -0000	1.2
@@ -19,8 +19,8 @@
  *
  */
 
-#ifndef __CONFIG_H_
-#define __CONFIG_H_
+#ifndef CONFIG_H
+#define CONFIG_H
 
 #include <stdafx.h>
 #include <scumm.h>
@@ -33,7 +33,7 @@
 //~ #define NO_DEBUG_CHANNEL
 //~ #define NO_DEBUG_CLIPPER
 #define NO_DEBUG_CODEC1
-#define NO_DEBUG_CODEC37
+//#define NO_DEBUG_CODEC37
 #define NO_DEBUG_CODEC44
 //~ #define NO_DEBUG_WIN32
 //~ #define NO_DEBUG_FONT_RENDERER

Index: decoder.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm-new/scumm/smush/decoder.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- decoder.h	24 Aug 2002 17:18:55 -0000	1.2
+++ decoder.h	24 Aug 2002 23:21:55 -0000	1.3
@@ -19,8 +19,8 @@
  *
  */
 
-#ifndef __DECODER_H_
-#define __DECODER_H_
+#ifndef DECODER_H
+#define DECODER_H
 
 #include "config.h"
 

Index: frenderer.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm-new/scumm/smush/frenderer.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- frenderer.h	24 Aug 2002 17:18:55 -0000	1.2
+++ frenderer.h	24 Aug 2002 23:21:55 -0000	1.3
@@ -19,8 +19,8 @@
  *
  */
 
-#ifndef __FRENDERER_H_
-#define __FRENDERER_H_
+#ifndef FRENDERER_H
+#define FRENDERER_H
 
 #include "config.h"
 
@@ -158,7 +158,8 @@
 
 		@return \c true if everything went fine, \c false otherwise
 	*/
-	bool drawStringAbsolute(const char * str, char * buffer, const Point & size, int x, int y) const;
+	bool drawStringAbsolute(const char * str, char * buffer, const Point & size, int x, int y) const;
+
 };
 
 #endif

Index: imuse_channel.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm-new/scumm/smush/imuse_channel.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- imuse_channel.cpp	24 Aug 2002 21:56:58 -0000	1.3
+++ imuse_channel.cpp	24 Aug 2002 23:21:55 -0000	1.4
@@ -66,8 +66,8 @@
 bool ImuseChannel::appendData(Chunk & b, int size) {
 	if(_dataSize == -1) { // First call
 		assert(size > 8);
-		Chunk::type imus_type = b.getDword(); imus_type = TO_BE_32(imus_type);
-		unsigned int imus_size = b.getDword(); imus_size = TO_BE_32(imus_size);
+		Chunk::type imus_type = b.getDword(); imus_type = SWAP_BYTES(imus_type);
+		unsigned int imus_size = b.getDword(); imus_size = SWAP_BYTES(imus_size);
 		if(imus_type != TYPE_iMUS) error("Invalid Chunk for imuse_channel");
 		size -= 8;
 		_tbufferSize = size;
@@ -99,14 +99,14 @@
 bool ImuseChannel::handleFormat(Chunk & src) {
 	if(src.getSize() != 20) error("invalid size for FRMT Chunk");
 	unsigned imuse_start = src.getDword();
-	imuse_start = TO_BE_32(imuse_start);
+	imuse_start = SWAP_BYTES(imuse_start);
 	src.seek(4);
 	_bitsize = src.getDword();
-	_bitsize = TO_BE_32(_bitsize);
+	_bitsize = SWAP_BYTES(_bitsize);
 	_rate = src.getDword();
-	_rate = TO_BE_32(_rate);
+	_rate = SWAP_BYTES(_rate);
 	_channels = src.getDword();
-	_channels = TO_BE_32(_channels);
+	_channels = SWAP_BYTES(_channels);
 	assert(_channels == 1 || _channels == 2);
 	return true;
 }

Index: mixer.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm-new/scumm/smush/mixer.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- mixer.h	24 Aug 2002 15:31:37 -0000	1.1
+++ mixer.h	24 Aug 2002 23:21:55 -0000	1.2
@@ -19,8 +19,8 @@
  *
  */
 
-#ifndef __MIXER_H_
-#define __MIXER_H_
+#ifndef MIXER_H
+#define MIXER_H
 
 #include "config.h"
 

Index: palette.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm-new/scumm/smush/palette.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- palette.h	24 Aug 2002 15:31:37 -0000	1.1
+++ palette.h	24 Aug 2002 23:21:55 -0000	1.2
@@ -19,8 +19,8 @@
  *
  */
 
-#ifndef __PALETTE_H_
-#define __PALETTE_H_
+#ifndef PALETTE_H
+#define PALETTE_H
 
 #include "config.h"
 

Index: player.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm-new/scumm/smush/player.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- player.cpp	24 Aug 2002 17:18:55 -0000	1.2
+++ player.cpp	24 Aug 2002 23:21:55 -0000	1.3
@@ -258,9 +258,9 @@
 	int code = b.getDword();
 	debug(6, "SmushPlayer::handleSkip(%d)", code);
 	if(code >= 0 && code < 37)
-		_skipNext =_skips[code];
+		_skipNext = _skips[code];
 	else
-		_skipNext =true;
+		_skipNext = true;
 }
 
 void SmushPlayer::handleStore(Chunk & b) {
@@ -589,7 +589,7 @@
 			error("Wrong secondary version number for SMUSH animation");
 		if(_soundFrequency != 0 && _soundFrequency != 11025 && _soundFrequency != 22050)
 			error("Wrong _sound_frequency number for SMUSH animation");
-	}else if(_version > 2) {
+	} else if(_version > 2) {
 		error("Wrong primary version number for SMUSH animation");
 	}
 	if(_outputSound && _soundFrequency) {

Index: player.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm-new/scumm/smush/player.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- player.h	24 Aug 2002 17:18:55 -0000	1.2
+++ player.h	24 Aug 2002 23:21:55 -0000	1.3
@@ -19,8 +19,8 @@
  *
  */
 
-#ifndef __PLAYER_H_
-#define __PLAYER_H_
+#ifndef PLAYER_H
+#define PLAYER_H
 
 #include "config.h"
 

Index: rect.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm-new/scumm/smush/rect.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- rect.h	24 Aug 2002 15:31:37 -0000	1.1
+++ rect.h	24 Aug 2002 23:21:55 -0000	1.2
@@ -19,8 +19,8 @@
  *
  */
 
-#ifndef __RECT_H_
-#define __RECT_H_
+#ifndef RECT_H
+#define RECT_H
 
 #include "config.h"
 

Index: renderer.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm-new/scumm/smush/renderer.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- renderer.h	24 Aug 2002 15:31:37 -0000	1.1
+++ renderer.h	24 Aug 2002 23:21:55 -0000	1.2
@@ -19,8 +19,8 @@
  *
  */
 
-#ifndef __RENDERER_H_
-#define __RENDERER_H_
+#ifndef RENDERER_H
+#define RENDERER_H
 
 #include "config.h"
 

Index: scumm_renderer.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm-new/scumm/smush/scumm_renderer.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- scumm_renderer.h	24 Aug 2002 17:18:55 -0000	1.2
+++ scumm_renderer.h	24 Aug 2002 23:21:55 -0000	1.3
@@ -19,8 +19,8 @@
  *
  */
 
-#ifndef __SCUMM_RENDERER_H_
-#define __SCUMM_RENDERER_H_
+#ifndef SCUMM_RENDERER_H
+#define SCUMM_RENDERER_H
 
 #include "config.h"
 





More information about the Scummvm-git-logs mailing list