ShuriZma
/
project64
mirror of https://github.com/project64/project64.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

from fixed warnings and errors in vs2012 

56f2b7ef85
This commit is contained in:
zilmar 2015-10-12 07:17:01 +11:00
parent 3d002e831f
commit 5e06520cb5
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Glide64/3dmath.cpp
View File

@ -387,8 +387,8 @@ void MulMatricesSSE(float m1[4][4],float m2[4][4],float r[4][4])
{ {
#ifndef _DEBUG #ifndef _DEBUG
int IsSSE = FALSE; int IsSSE = FALSE;
int edx, eax;
#if defined(__GNUC__) && !defined(NO_ASM) && !defined(NOSSE) #if defined(__GNUC__) && !defined(NO_ASM) && !defined(NOSSE)
int edx, eax;
GLIDE64_TRY GLIDE64_TRY
{ {
#if defined(__x86_64__) #if defined(__x86_64__)

5
Source/GlideHQ/TxImage.cpp
View File

@ -496,7 +496,8 @@ TxImage::readBMP(FILE* fp, int* width, int* height, uint16* format)
uint8 *image = NULL; uint8 *image = NULL;
uint8 *image_row = NULL; uint8 *image_row = NULL;
uint8 *tmpimage = NULL; uint8 *tmpimage = NULL;
int row_bytes, pos, i, j; unsigned int row_bytes, pos;
int i, j;
/* Windows Bitmap */ /* Windows Bitmap */
BITMAPFILEHEADER bmp_fhdr; BITMAPFILEHEADER bmp_fhdr;
BITMAPINFOHEADER bmp_ihdr; BITMAPINFOHEADER bmp_ihdr;
@ -560,7 +561,7 @@ TxImage::readBMP(FILE* fp, int* width, int* height, uint16* format)
fseek(fp, pos, SEEK_SET); fseek(fp, pos, SEEK_SET);
fread(image_row, row_bytes, 1, fp); fread(image_row, row_bytes, 1, fp);
/* expand 4bpp to 8bpp. stuff 4bit values into 8bit comps. */ /* expand 4bpp to 8bpp. stuff 4bit values into 8bit comps. */
for (j = 0; j < row_bytes; j++) { for (j = 0; j < (int) row_bytes; j++) {
tmpimage[j << 1] = image_row[j] & 0x0f; tmpimage[j << 1] = image_row[j] & 0x0f;
tmpimage[(j << 1) + 1] = (image_row[j] & 0xf0) >> 4; tmpimage[(j << 1) + 1] = (image_row[j] & 0xf0) >> 4;
} }