mirror
/
sane-project-backends
kopia lustrzana https://gitlab.com/sane-project/backends
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

Revert "pixma_mp150.c: scan param 0x26-0x29 should contain localtime HHMM, also for MB5000 series" 

This reverts commit eb712c6bd8.
merge-requests/1/head
Louis Lagendijk 2017-01-06 23:28:56 +01:00
rodzic 6c439bce79
commit 9bc734042f
1 zmienionych plików z 5 dodań i 8 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

13
backend/pixma_mp150.c
Wyświetl plik

@ -58,7 +58,6 @@
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <sys/time.h>
#include <time.h> /* localtime(C90) */ #include <time.h> /* localtime(C90) */
#include "pixma_rename.h" #include "pixma_rename.h"
@ -708,8 +707,6 @@ send_scan_param (pixma_t * s)
{ {
mp150_t *mp = (mp150_t *) s->subdriver; mp150_t *mp = (mp150_t *) s->subdriver;
uint8_t *data; uint8_t *data;
struct timeval tv;
struct tm *ptm;
unsigned raw_width = calc_raw_width (mp, s->param); unsigned raw_width = calc_raw_width (mp, s->param);
unsigned h = MIN (s->param->h + calc_shifting (s), unsigned h = MIN (s->param->h + calc_shifting (s),
s->cfg->height * s->param->ydpi / 75); s->cfg->height * s->param->ydpi / 75);
@ -787,11 +784,11 @@ send_scan_param (pixma_t * s)
switch (s->cfg->pid) switch (s->cfg->pid)
{ {
case MG5300_PID: case MG5300_PID:
case MB5000_PID: /* unknown values (perhaps counter) for MG5300 series---values must be 0x30-0x39: decimal 0-9 */
/* localtime (HHMM) */ data[0x26] = 0x32; /* using example values from a real scan here */
gettimeofday(&tv, NULL); data[0x27] = 0x31;
ptm = localtime(&tv.tv_sec); data[0x28] = 0x34;
strftime( (char *)(data +0x26), 5, "%H%M", ptm); data[0x29] = 0x35;
break; break;
default: default: