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

Fix mismatched parameters.

Browse Source 
Bug caught by the Debian team on GrafX2 2.3.


git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@2072 416bcca6-2ee7-4201-b75f-2eb2f807beb1
This commit is contained in:
Adrien Destugues 2014-05-16 10:15:07 +00:00
parent 1248100ae9
commit 5e26436c48
3 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/libraw2crtc.c
View File

@ -57,7 +57,7 @@ unsigned char mode3interlace(T_IO_Context * context, unsigned char x, unsigned c
unsigned char (*ptrMode)(T_IO_Context * context, unsigned char x, unsigned char y); unsigned char (*ptrMode)(T_IO_Context * context, unsigned char x, unsigned char y);
unsigned char *raw2crtc(T_IO_Context *context, unsigned short width, unsigned short height, unsigned char mode, unsigned char r9, unsigned long *outSize, unsigned char *r1, unsigned char r12, unsigned char r13) unsigned char *raw2crtc(T_IO_Context *context, unsigned char mode, unsigned char r9, unsigned long *outSize, unsigned char *r1, unsigned char r12, unsigned char r13)
{ {
unsigned char *outBuffer; unsigned char *outBuffer;
unsigned char *tmpBuffer; unsigned char *tmpBuffer;
@ -76,6 +76,9 @@ unsigned char *raw2crtc(T_IO_Context *context, unsigned short width, unsigned sh
unsigned char rcc; unsigned char rcc;
unsigned char hcc; unsigned char hcc;
unsigned char cclk; unsigned char cclk;
int width = context->Width;
int height = context->Height;
switch(mode) switch(mode)
{ {

4
src/libraw2crtc.h
View File

@ -9,6 +9,8 @@
#ifndef LIBRAW2CRTC_H #ifndef LIBRAW2CRTC_H
#define LIBRAW2CRTC_H 1 #define LIBRAW2CRTC_H 1
unsigned char * raw2crtc(unsigned short width, unsigned short height, unsigned char mode, unsigned char r9, unsigned long *outSize, unsigned char *r1, unsigned char r12, unsigned char r13); #include "loadsave.h"
unsigned char * raw2crtc(T_IO_Context* context, unsigned char mode, unsigned char r9, unsigned long *outSize, unsigned char *r1, unsigned char r12, unsigned char r13);
#endif #endif

2
src/miscfileformats.c
View File

@ -3117,7 +3117,7 @@ void Save_SCR(T_IO_Context * context)
break; break;
} }
output = raw2crtc(context->Width,context->Height,cpc_mode,7,&outsize,&r1,0,0); output = raw2crtc(context, cpc_mode, 7, &outsize, &r1, 0, 0);
file = fopen(filename,"wb"); file = fopen(filename,"wb");
Write_bytes(file, output, outsize); Write_bytes(file, output, outsize);