OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

Merge branch 'master' into modern

Browse source
This commit is contained in:
Christoph Oelckers 2018-06-19 00:11:59 +02:00
commit c8db149c06
9 changed files with 56 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/textures/hires/hirestex.cpp
View file

@ -24,6 +24,12 @@
**
*/
#ifdef _MSC_VER
#include <io.h>
#else
#include <unistd.h>
#endif
#include "w_wad.h"
#include "m_png.h"
#include "sbar.h"
@ -32,7 +38,6 @@
#include "bitmap.h"
#ifndef _WIN32
#include <unistd.h>
#define _access(a,b) access(a,b)
#endif

2
src/textures/hires/hqresize.cpp
View file

@ -235,7 +235,7 @@ static unsigned char *hqNxAsmHelper( void (*hqNxFunction) ( int*, unsigned char*
}
#endif
static unsigned char *hqNxHelper( void (*hqNxFunction) ( unsigned*, unsigned*, int, int ),
static unsigned char *hqNxHelper( void (HQX_CALLCONV *hqNxFunction) ( unsigned*, unsigned*, int, int ),
const int N,
unsigned char *inputBuffer,
const int inWidth,