diff --git a/src/config.c b/src/config.c index eb4cb5b..712000f 100644 --- a/src/config.c +++ b/src/config.c @@ -308,7 +308,7 @@ Cfg_menu g_cfg_imagewriter_menu[] = { { "", 0, 0, 0, 0 }, { "Fixed Width Font", KNMP(g_imagewriter_fixed_font), CFGTYPE_FILE }, { "", 0, 0, 0, 0 }, -{ "Proporational Font", KNMP(g_imagewriter_prop_font), CFGTYPE_FILE }, +{ "Proportional Font", KNMP(g_imagewriter_prop_font), CFGTYPE_FILE }, { "", 0, 0, 0, 0 }, { "Back to Main Config", g_cfg_main_menu, 0, 0, CFGTYPE_MENU }, { 0, 0, 0, 0, 0 }, diff --git a/src/imagewriter.cpp b/src/imagewriter.cpp index 60876a2..42be88a 100644 --- a/src/imagewriter.cpp +++ b/src/imagewriter.cpp @@ -2168,7 +2168,7 @@ extern "C" void imagewriter_close() delete defaultImagewriter; defaultImagewriter = NULL; } -extern "C" void imagewriter_feed(int port) +extern "C" void imagewriter_feed() { if(defaultImagewriter == NULL) return; defaultImagewriter->formFeed(); diff --git a/src/imagewriter.h b/src/imagewriter.h index 130101b..13e4e8c 100644 --- a/src/imagewriter.h +++ b/src/imagewriter.h @@ -303,7 +303,7 @@ extern "C" void imagewriter_init(int pdpi, int pwidth, int pheight, char* poutput, bool mpage, int port); void imagewriter_loop(Bit8u pchar,int port); void imagewriter_close(); -void imagewriter_feed(int port); +void imagewriter_feed(); #ifdef __cplusplus } #endif diff --git a/src/scc_imagewriter.c b/src/scc_imagewriter.c index 1ce5115..8b9c51f 100644 --- a/src/scc_imagewriter.c +++ b/src/scc_imagewriter.c @@ -24,7 +24,7 @@ #include "scc.h" #include "imagewriter.h" extern Scc scc_stat[2]; -extern int g_vbl_count; +word32 g_vbl_count; extern int g_imagewriter; extern int g_imagewriter_dpi; @@ -32,7 +32,7 @@ extern char* g_imagewriter_output; extern int g_imagewriter_multipage; extern int g_imagewriter_timeout; -int imagewriter_vbl_count = 0; +word32 imagewriter_vbl_count = 0; int imagewriter_port_block = 0; int iw_scc_write = 0; @@ -40,7 +40,7 @@ int scc_imagewriter_init(int port) { Scc *scc_ptr; scc_ptr = &(scc_stat[port]); - imagewriter_init(g_imagewriter_dpi,85,110,g_imagewriter_output,g_imagewriter_multipage, port); + imagewriter_init(g_imagewriter_dpi,85,110,g_imagewriter_output,g_imagewriter_multipage != 0, port); scc_ptr->state = 4; return 4; }