Группа :: Система/Настройка/Оборудование
Пакет: epson-inkjet-printer-escpr
Главная Изменения Спек Патчи Sources Загрузить Gear Bugs and FR Repocop
Патч: bug_x86_64.patch
Скачать
Скачать
diff --git a/epson-inkjet-printer-escpr/src/filter.c b/epson-inkjet-printer-escpr/src/filter.c
index f3e41ff..2fb0cfd 100644
--- a/epson-inkjet-printer-escpr/src/filter.c
+++ b/epson-inkjet-printer-escpr/src/filter.c
@@ -33,6 +33,8 @@
#include "epson-protocol.h"
#include "epson-escpr-api.h"
#include "epson-escpr-mem.h"
+#include "epson-escpr-services.h"
+#include "epson-escpage.h"
#include "err.h"
#include "mem.h"
@@ -41,6 +43,11 @@
#include "libprtX.h"
#include "optBase.h"
#include "linux_cmn.h"
+#include "xfifo.h"
+
+extern EPS_ERR_CODE SetupJobAttrib (const EPS_JOB_ATTRIB*);
+extern EPS_ERR_CODE SendStartJob ();
+extern EPS_ERR_CODE PrintBand (const EPS_UINT8*, EPS_UINT32, EPS_UINT32*);
#define WIDTH_BYTES(bits) (((bits) + 31) / 32 * 4)
@@ -378,10 +385,10 @@ main (int argc, char *argv[])
}else{
debug_msg("pageStartJob() success");
}
-
+
printJob.jobStatus = EPS_STATUS_ESTABLISHED;
- int printHeight = 0;
-///////////////////////////////////////////////////////////////////////////////////////////////////////////
+ EPS_UINT32 printHeight = 0;
+///////////////////////////////////////////////////////////////////////////////////////////////////////////
print_area_x = printJob.printableAreaWidth;
print_area_y = printJob.printableAreaHeight;
@@ -533,7 +540,7 @@ main (int argc, char *argv[])
memcpy(rever_buf + k*3, startpage + pos + (bandBmp.widthBytes - 6) - k*3, 3);
}
}
- PrintBand (rever_buf, bandBmp.widthBytes, &printHeight);
+ PrintBand ((const EPS_UINT8 *)rever_buf, bandBmp.widthBytes, &printHeight);
pos -= bandBmp.widthBytes;
}
@@ -640,17 +647,17 @@ main (int argc, char *argv[])
}
}
}
-
+
band_line_count ++;
-
+
if (band_line_count >= band_line)
{
printHeight = band_line_count;
PrintBand (bandBmp.bits, bandBmp.widthBytes, &printHeight);
#if (HAVE_PPM)
fp = fopen(ppmfilename, "a+");
- int i=0;
- for(i=0; i<bytes_per_line/byte_par_pixel*3; i++){
+ int i=0;
+ for(i=0; i<bytes_per_line/byte_par_pixel*3; i++){
fprintf(fp, "%u ", (unsigned char)bandBmp.Bits[i]);
}
fprintf(fp, "\n");
@@ -829,7 +836,7 @@ set_pips_parameter (filter_option_t *filter_opt_p, EPS_OPT *printOpt)
/* Get number of pages */
char page_num;
- read (STDIN_FILENO, &page_num, 1);
+ (void)read (STDIN_FILENO, &page_num, 1);
/* Others */
jobAttr.apfAutoCorrect = EPS_APF_ACT_STANDARD;
diff --git a/epson-inkjet-printer-escpr/src/mem.c b/epson-inkjet-printer-escpr/src/mem.c
index f53f2bc..d6c945a 100644
--- a/epson-inkjet-printer-escpr/src/mem.c
+++ b/epson-inkjet-printer-escpr/src/mem.c
@@ -23,6 +23,7 @@
#include <stdlib.h>
#include "mem.h"
+#include "err.h"
void *
mem_malloc (unsigned int size, bool_t crit)