valter/dosbox-staging
1
0
Fork 0
Code Releases Activity

Fix some gcc compilation issues

Browse source 
Imported-from: https://svn.code.sf.net/p/dosbox/code-0/dosbox/trunk@2457
This commit is contained in:
Sjoerd van der Berg 2006-01-30 10:55:49 +00:00
parent 78f4e566bc
commit 952f8f0d1d
7 changed files with 24 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/libs/zmbv/Makefile.am Normal file
View file

@ -0,0 +1,4 @@
AM_CPPFLAGS = -I$(top_srcdir)/include
noinst_LIBRARIES = libzmbv.a
libzmbv_a_SOURCES = zmbv.cpp zmbv.h

5
src/libs/zmbv/zmbv.cpp
View file

@ -18,6 +18,7 @@
#include <zlib.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <math.h>
@ -396,10 +397,10 @@ void VideoCodec::UnXorFrame(void) {
workPos=(workPos + blockcount*2 + 3) & ~3;
for (int b=0;b<blockcount;b++) {
FrameBlock * block=&blocks[b];
int xor = vectors[b*2+0] & 1;
int delta = vectors[b*2+0] & 1;
int vx = vectors[b*2+0] >> 1;
int vy = vectors[b*2+1] >> 1;
if (xor) UnXorBlock<P>(vx,vy,block);
if (delta) UnXorBlock<P>(vx,vy,block);
else CopyBlock<P>(vx,vy,block);
}
}

8
src/libs/zmbv/zmbv.h
View file

@ -16,8 +16,14 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
#ifndef DOSBOX_DOSBOX_H
#ifdef _MSC_VER
#define INLINE __forceinline
#else
#define INLINE inline
#endif
#endif
#define CODEC_4CC "ZMBV"
typedef enum {