m/grafX2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix libraw2crtc for compiling on strict C99

Browse Source 
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@1159 416bcca6-2ee7-4201-b75f-2eb2f807beb1
This commit is contained in:
Yves Rizoud 2009-11-07 21:29:20 +00:00
parent 74f723c3b0
commit 45f04503c6
1 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
libraw2crtc.c
View File

@ -59,10 +59,18 @@ unsigned char *raw2crtc(unsigned short width, unsigned short height, unsigned ch
unsigned char *allocationBuffer; unsigned char *allocationBuffer;
unsigned short minAddr = 0; unsigned short minAddr = 0;
unsigned char minAddrIsDefined = 0; unsigned char minAddrIsDefined = 0;
unsigned short maxAddr; unsigned short maxAddr = 0;
unsigned char nbPixPerByte; unsigned char nbPixPerByte;
int y,x; int y,x;
unsigned char r6;
unsigned short i;
unsigned char *ptrTmp;
unsigned char *ptrOut;
unsigned char vcc;
unsigned char rcc;
unsigned char hcc;
unsigned char cclk;
switch(mode) switch(mode)
{ {
@ -115,16 +123,15 @@ unsigned char *raw2crtc(unsigned short width, unsigned short height, unsigned ch
} }
memset(allocationBuffer, 0, 0xFFFF); memset(allocationBuffer, 0, 0xFFFF);
unsigned char r6;
r6 = height/(r9+1); r6 = height/(r9+1);
for(unsigned char vcc = 0; vcc < r6; vcc++) for(vcc = 0; vcc < r6; vcc++)
{ {
for(unsigned char rcc = 0; rcc < (r9+1); rcc++) for(rcc = 0; rcc < (r9+1); rcc++)
{ {
for(unsigned char hcc = 0; hcc < *r1; hcc++) for(hcc = 0; hcc < *r1; hcc++)
{ {
for(unsigned char cclk = 0; cclk < 2; cclk++) for(cclk = 0; cclk < 2; cclk++)
{ {
x = (hcc << 1 | cclk); x = (hcc << 1 | cclk);
y = vcc*(r9+1) + rcc; y = vcc*(r9+1) + rcc;
@ -136,7 +143,7 @@ unsigned char *raw2crtc(unsigned short width, unsigned short height, unsigned ch
} }
} }
for(unsigned short i = 0; i < 0xFFFF; i++) for(i = 0; i < 0xFFFF; i++)
{ {
if(*(allocationBuffer + i) > 1) if(*(allocationBuffer + i) > 1)
{ {
@ -162,12 +169,10 @@ unsigned char *raw2crtc(unsigned short width, unsigned short height, unsigned ch
exit(4); exit(4);
} }
unsigned char *ptrTmp;
unsigned char *ptrOut;
ptrTmp = tmpBuffer + minAddr; ptrTmp = tmpBuffer + minAddr;
ptrOut = outBuffer; ptrOut = outBuffer;
for(unsigned short i = minAddr; i <= maxAddr; i++) for(i = minAddr; i <= maxAddr; i++)
{ {
*(ptrOut++) = *(ptrTmp++); *(ptrOut++) = *(ptrTmp++);
} }