From 5e26436c482b34c392dea2aad4d46da2431db647 Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@gmail.com>
Date: Fri, 16 May 2014 10:15:07 +0000
Subject: [PATCH] Fix mismatched parameters.

Bug caught by the Debian team on GrafX2 2.3.


git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@2072 416bcca6-2ee7-4201-b75f-2eb2f807beb1
---
 src/libraw2crtc.c     | 5 ++++-
 src/libraw2crtc.h     | 4 +++-
 src/miscfileformats.c | 2 +-
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/libraw2crtc.c b/src/libraw2crtc.c
index 4dd86830..42de562b 100644
--- a/src/libraw2crtc.c
+++ b/src/libraw2crtc.c
@@ -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 *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 *tmpBuffer;
@@ -76,6 +76,9 @@ unsigned char *raw2crtc(T_IO_Context *context, unsigned short width, unsigned sh
   unsigned char rcc;
   unsigned char hcc;
   unsigned char cclk;
+
+  int width = context->Width;
+  int height = context->Height;
   
   switch(mode)
   {
diff --git a/src/libraw2crtc.h b/src/libraw2crtc.h
index f689043c..821d24b0 100644
--- a/src/libraw2crtc.h
+++ b/src/libraw2crtc.h
@@ -9,6 +9,8 @@
 #ifndef LIBRAW2CRTC_H
 #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
diff --git a/src/miscfileformats.c b/src/miscfileformats.c
index 44e70395..aa8e0a22 100644
--- a/src/miscfileformats.c
+++ b/src/miscfileformats.c
@@ -3117,7 +3117,7 @@ void Save_SCR(T_IO_Context * context)
             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");
     Write_bytes(file, output, outsize);