[Scummvm-cvs-logs] CVS: scummvm-new/scumm/smush blitter.cpp,1.2,1.3 frenderer.cpp,1.1,1.2 imuse_channel.cpp,1.4,1.5 player.cpp,1.3,1.4 saud_channel.cpp,1.3,1.4 scumm_renderer.h,1.3,1.4
Max Horn
fingolfin at users.sourceforge.net
Sun Aug 25 03:51:04 CEST 2002
Update of /cvsroot/scummvm/scummvm-new/scumm/smush
In directory usw-pr-cvs1:/tmp/cvs-serv7513/scumm/smush
Modified Files:
blitter.cpp frenderer.cpp imuse_channel.cpp player.cpp
saud_channel.cpp scumm_renderer.h
Log Message:
fixed some endian issues in the new SMUSH decoder; cleanup
Index: blitter.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm-new/scumm/smush/blitter.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- blitter.cpp 24 Aug 2002 17:18:55 -0000 1.2
+++ blitter.cpp 25 Aug 2002 10:50:18 -0000 1.3
@@ -19,17 +19,14 @@
*
*/
-#include <stdafx.h>
+#include "stdafx.h"
+#include "common/util.h"
#include "blitter.h"
#include "chunk.h"
#include <assert.h>
#include <string.h> // for memcpy
-#ifndef min
-#define min(x, y) ((x) > (y) ? (y) : (x))
-#endif
-
Blitter::Blitter(char * ptr, const Point & dstsize, const Rect & src) :
_ptr(ptr),
_clip(dstsize),
@@ -91,7 +88,7 @@
#endif
break;
}
- int l = min((int)len, min(_clip.getX() - _cur.getX(), _src.right() - _cur.getX()));
+ int l = MIN((int)len, MIN(_clip.getX() - _cur.getX(), _src.right() - _cur.getX()));
len -= l;
memset(_offset, data, l);
advance(l);
@@ -106,7 +103,7 @@
#endif
break;
}
- int l = min((int)len, min(_clip.getX() - _cur.getX(), _src.right() - _cur.getX()));
+ int l = MIN((int)len, MIN(_clip.getX() - _cur.getX(), _src.right() - _cur.getX()));
len -= l;
memcpy(_offset, ptr, l);
ptr += l;
@@ -122,7 +119,7 @@
#endif
break;
}
- int l = min((int)len, min(_clip.getX() -_cur.getX(), _src.right() - _cur.getX()));
+ int l = MIN((int)len, MIN(_clip.getX() -_cur.getX(), _src.right() - _cur.getX()));
len -= l;
src.read(_offset, l);
advance(l);
@@ -134,6 +131,7 @@
assert((_clip.getX() & 3) == 0);
unsigned int * dst = (unsigned int *)_offset;
int line_size = _clip.getX() >> 2;
+ data = TO_LE_32(data);
*dst = data; dst += line_size;
*dst = data; dst += line_size;
@@ -154,10 +152,10 @@
unsigned int * dst = (unsigned int *)_offset;
int line_size = _clip.getX() >> 2;
- *dst = d4; dst += line_size;
- *dst = d3; dst += line_size;
- *dst = d2; dst += line_size;
- *dst = d1;
+ *dst = TO_LE_32(d4); dst += line_size;
+ *dst = TO_LE_32(d3); dst += line_size;
+ *dst = TO_LE_32(d2); dst += line_size;
+ *dst = TO_LE_32(d1);
#ifdef DEBUG_CLIPPER
} else {
@@ -173,10 +171,10 @@
unsigned int * dst = (unsigned int *)_offset;
int line_size = _clip.getX() >> 2;
unsigned int * src = (unsigned int *)data;
- *dst = *src++; dst += line_size;
- *dst = *src++; dst += line_size;
- *dst = *src++; dst += line_size;
- *dst = *src++;
+ *dst = TO_LE_32(*src++); dst += line_size;
+ *dst = TO_LE_32(*src++); dst += line_size;
+ *dst = TO_LE_32(*src++); dst += line_size;
+ *dst = TO_LE_32(*src++);
#ifdef DEBUG_CLIPPER
} else {
_clippedBlock ++;
@@ -190,10 +188,10 @@
assert((_clip.getX() & 3) == 0);
unsigned int * dst = (unsigned int *)_offset;
int line_size = _clip.getX() >> 2;
- *dst = src.getDword(); dst += line_size;
- *dst = src.getDword(); dst += line_size;
- *dst = src.getDword(); dst += line_size;
- *dst = src.getDword();
+ *dst = TO_LE_32(src.getDword()); dst += line_size;
+ *dst = TO_LE_32(src.getDword()); dst += line_size;
+ *dst = TO_LE_32(src.getDword()); dst += line_size;
+ *dst = TO_LE_32(src.getDword());
#ifdef DEBUG_CLIPPER
} else {
_clippedBlock ++;
Index: frenderer.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm-new/scumm/smush/frenderer.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- frenderer.cpp 24 Aug 2002 15:31:37 -0000 1.1
+++ frenderer.cpp 25 Aug 2002 10:50:18 -0000 1.2
@@ -20,16 +20,14 @@
*/
#include <stdafx.h>
+#include "common/util.h"
+
#include "frenderer.h"
#include "rect.h"
#include <assert.h>
#include <string.h> // for memcpy, strcat, strdup
-#ifndef max
-#define max(x, y) ((x) > (y) ? (x) : (y))
-#endif
-
FontRenderer::FontRenderer(bool use_original_colors) : _nbChars(0), _color(-1), _original(use_original_colors) {
}
@@ -75,7 +73,7 @@
for(int i = 0; str[i] != 0; i++) {
int h = charHeight(str[i]);
- ret = max(ret, h);
+ ret = MAX(ret, h);
}
return ret;
Index: imuse_channel.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm-new/scumm/smush/imuse_channel.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- imuse_channel.cpp 24 Aug 2002 23:21:55 -0000 1.4
+++ imuse_channel.cpp 25 Aug 2002 10:50:18 -0000 1.5
@@ -26,9 +26,6 @@
#include <assert.h>
#include <string.h> // for memcpy.h
-#ifndef min
-#define min(x, y) ((x) > (y) ? (y) : (x))
-#endif
ImuseChannel::ImuseChannel(int track, int freq) :
_track(track),
Index: player.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm-new/scumm/smush/player.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- player.cpp 24 Aug 2002 23:21:55 -0000 1.3
+++ player.cpp 25 Aug 2002 10:50:18 -0000 1.4
@@ -20,6 +20,7 @@
*/
#include <stdafx.h>
+#include "common/util.h"
#include "player.h"
#include "renderer.h"
@@ -34,10 +35,6 @@
#include <string.h> // for strchr, strrchr
#include <ctype.h> // for isdigit
-#ifndef max
-#define max(x, y) ((x) > (y) ? (x) : (y))
-#endif
-
const int WAIT = 100;
/*! @brief parser and map of string resources
@@ -371,7 +368,7 @@
if(flags == 0 || flags == 4) {
fr->drawStringAbsolute(str, _curBuffer, _frameSize, pos_x, pos_y);
} else {
- fr->drawStringCentered(str, _curBuffer, _frameSize, max(pos_y, top), left, width, pos_x);
+ fr->drawStringCentered(str, _curBuffer, _frameSize, MAX(pos_y, top), left, width, pos_x);
}
}
Index: saud_channel.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm-new/scumm/smush/saud_channel.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- saud_channel.cpp 24 Aug 2002 21:56:58 -0000 1.3
+++ saud_channel.cpp 25 Aug 2002 10:50:18 -0000 1.4
@@ -26,9 +26,6 @@
#include <assert.h>
#include <string.h> // for memcpy.h
-#ifndef min
-#define min(x, y) ((x) > (y) ? (y) : (x))
-#endif
void SaudChannel::handleStrk(Chunk & b) {
int size = b.getSize();
Index: scumm_renderer.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm-new/scumm/smush/scumm_renderer.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- scumm_renderer.h 24 Aug 2002 23:21:55 -0000 1.3
+++ scumm_renderer.h 25 Aug 2002 10:50:18 -0000 1.4
@@ -39,10 +39,6 @@
#include "rect.h"
#include "blitter.h"
-#ifndef min
-#define min(x, y) ((x) > (y) ? (y) : (x))
-#endif
-
class scumm_mixer;
class ScummRenderer : public BaseRenderer {
More information about the Scummvm-git-logs
mailing list