Attachment #57224 for bug #90442





#include "../include/sane/config.h"

#define BUILD 67
#define MAX_DEBUG
#define WARMUP_TIME 60
#define CALIBRATION_HEIGHT 2.5


  RIE (gt68xx_device_get_id (dev));

  if (!(dev->model->flags & GT68XX_FLAG_NO_STOP))
    RIE (gt68xx_device_stop_scan (dev));

  RIE (gt68xx_device_get_power_status (dev, &power_ok));

    }

  s->calib = s->val[OPT_QUALITY_CAL].w;
  if (!(s->dev->model->flags & GT68XX_FLAG_NO_STOP))
    RIE (gt68xx_device_stop_scan (s->dev));

  RIE (gt68xx_device_carriage_home (s->dev));

Lines 1074-1081 Link Here

(-)sane-backends-1.0.15.org/backend/gt68xx_devices.c (-3 / +2 lines)
1074	SANE_FALSE, /* Is this a CIS scanner? */	1074	SANE_FALSE, /* Is this a CIS scanner? */
1075	GT68XX_FLAG_OFFSET_INV \| GT68XX_FLAG_NO_POWER_STATUS\| GT68XX_FLAG_NO_LINEMODE	1075	GT68XX_FLAG_OFFSET_INV \| GT68XX_FLAG_NO_POWER_STATUS\| GT68XX_FLAG_NO_LINEMODE
1076	/* Which flags are needed for this scanner? */	1076	/* Which flags are needed for this scanner? */
1077	/* Untested but as this scanner seems to be very similar to Plustelk U16B it	1077	/* This scanner seems to be very similar to Plustelk U16B and is reported to work. */
1078	should work. */
1079	};	1078	};
1080		1079
1081		1080
Lines 1126-1132 Link Here
1126		1125
1127	SANE_FALSE, /* Is this a CIS scanner? */	1126	SANE_FALSE, /* Is this a CIS scanner? */
1128	GT68XX_FLAG_OFFSET_INV /* Which flags are needed for this scanner? */	1127	GT68XX_FLAG_OFFSET_INV /* Which flags are needed for this scanner? */
1129	/* Tested zo some degree, based on the Plustek OpticPro 1248U*/	1128	/* Tested to some degree, based on the Plustek OpticPro 1248U*/
1130	};	1129	};
1131		1130
1132	static GT68xx_Model genius_vivid4x_model = {	1131	static GT68xx_Model genius_vivid4x_model = {

Lines 553-559 Link Here

(-)sane-backends-1.0.15.org/backend/gt68xx_gt6801.c (-1 / +1 lines)
553	GT68xx_Packet req;	553	GT68xx_Packet req;
554	SANE_Byte motor_mode_1, motor_mode_2;	554	SANE_Byte motor_mode_1, motor_mode_2;
555		555
556	if ((dev->model->flags & GT68XX_FLAG_NO_LINEMODE) && line_mode)	556	if ((dev->model->flags & GT68XX_FLAG_NO_LINEMODE) && line_mode && color)
557	{	557	{
558	DBG (0, "gt6801_setup_scan: the scanner's memory is too small for "	558	DBG (0, "gt6801_setup_scan: the scanner's memory is too small for "
559	"that combination of resolution, dpi and width\n");	559	"that combination of resolution, dpi and width\n");

Lines 534-540 Link Here

(-)sane-backends-1.0.15.org/backend/gt68xx_gt6816.c (-1 / +1 lines)
534	return SANE_STATUS_NO_MEM;	534	return SANE_STATUS_NO_MEM;
535	}	535	}
536		536
537	if ((dev->model->flags & GT68XX_FLAG_NO_LINEMODE) && line_mode)	537	if ((dev->model->flags & GT68XX_FLAG_NO_LINEMODE) && line_mode && color)
538	{	538	{
539	DBG (0, "gt6816_setup_scan: the scanner's memory is too small for "	539	DBG (0, "gt6816_setup_scan: the scanner's memory is too small for "
540	"that combination of resolution, dpi and width\n");	540	"that combination of resolution, dpi and width\n");




#include "sane/sanei_backend.h"

/* Now define the wrappers (we could use aliases here, but go for
   robustness for now...: */

SANE_Status
sane_init (SANE_Int *vc, SANE_Auth_Callback cb)
{
  return ENTRY(init) (vc, cb);
}

SANE_Status
sane_get_devices (const SANE_Device ***dl, SANE_Bool local)
{
  return ENTRY(get_devices) (dl, local);
}

SANE_Status
sane_open (SANE_String_Const name, SANE_Handle *h)
{
  return ENTRY(open) (name, h);
}

const SANE_Option_Descriptor *
sane_get_option_descriptor (SANE_Handle h, SANE_Int opt)
{
  return ENTRY(get_option_descriptor) (h, opt);
}

SANE_Status
sane_control_option (SANE_Handle h, SANE_Int opt, SANE_Action act,
		     void *val, SANE_Word *info)
{
  return ENTRY(control_option) (h, opt, act, val, info);
}

SANE_Status
sane_get_parameters (SANE_Handle h, SANE_Parameters *parms)
{
  return ENTRY(get_parameters) (h, parms);
}

SANE_Status
sane_start (SANE_Handle h)
{
  return ENTRY(start) (h);
}

SANE_Status
sane_read (SANE_Handle h, SANE_Byte *buf, SANE_Int maxlen, SANE_Int *lenp)
{
  return ENTRY(read) (h, buf, maxlen, lenp);
}

SANE_Status
sane_set_io_mode (SANE_Handle h, SANE_Bool non_blocking)
{
  return ENTRY(set_io_mode) (h, non_blocking);
}

SANE_Status
sane_get_select_fd (SANE_Handle h, SANE_Int *fdp)
{
  return ENTRY(get_select_fd) (h, fdp);
}

void
sane_cancel (SANE_Handle h)
{
  ENTRY(cancel) (h);
}

void
sane_close (SANE_Handle h)
{
  ENTRY(close) (h);
}

void
sane_exit (void)
{
  ENTRY(exit) ();
}

Lines 1-5 Link Here

(-)sane-backends-1.0.15.org/doc/gt68xx/gt68xx.CHANGES (+6 lines)
1	gt68xx.CHANGES --text--	1	gt68xx.CHANGES --text--
2		2
		3	V 1.0.67 (2004-11-14)
		4
		5	* Fixed test to move home sensor at the start of scan.
		6	* Fixed gray mode linemode test. That stopped e.g. the Plustek OpticPro U 16 B
		7	from working in gray mode.
		8
3	V 1.0.66 (2004-10-31)	9	V 1.0.66 (2004-10-31)
4		10
5	* Removed unused gain and offset options.	11	* Removed unused gain and offset options.

Return to bug 90442

Lines 48-54 Link Here

(-)sane-backends-1.0.15.org/backend/gt68xx.c (-3 / +3 lines)
48		48
49	#include "../include/sane/config.h"	49	#include "../include/sane/config.h"
50		50
51	#define BUILD 66	51	#define BUILD 67
52	#define MAX_DEBUG	52	#define MAX_DEBUG
53	#define WARMUP_TIME 60	53	#define WARMUP_TIME 60
54	#define CALIBRATION_HEIGHT 2.5	54	#define CALIBRATION_HEIGHT 2.5
Lines 1342-1348 Link Here
1342		1342
1343	RIE (gt68xx_device_get_id (dev));	1343	RIE (gt68xx_device_get_id (dev));
1344		1344
1345	if (!(dev->model->flags \| GT68XX_FLAG_NO_STOP))	1345	if (!(dev->model->flags & GT68XX_FLAG_NO_STOP))
1346	RIE (gt68xx_device_stop_scan (dev));	1346	RIE (gt68xx_device_stop_scan (dev));
1347		1347
1348	RIE (gt68xx_device_get_power_status (dev, &power_ok));	1348	RIE (gt68xx_device_get_power_status (dev, &power_ok));
Lines 1736-1742 Link Here
1736	}	1736	}
1737		1737
1738	s->calib = s->val[OPT_QUALITY_CAL].w;	1738	s->calib = s->val[OPT_QUALITY_CAL].w;
1739	if (!(s->dev->model->flags \| GT68XX_FLAG_NO_STOP))	1739	if (!(s->dev->model->flags & GT68XX_FLAG_NO_STOP))
1740	RIE (gt68xx_device_stop_scan (s->dev));	1740	RIE (gt68xx_device_stop_scan (s->dev));
1741		1741
1742	RIE (gt68xx_device_carriage_home (s->dev));	1742	RIE (gt68xx_device_carriage_home (s->dev));

Line 0 Link Here

(-)sane-backends-1.0.15.org/backend/gt68xx-s.c (+83 lines)
		1	#include "sane/sanei_backend.h"
		2
		3	/* Now define the wrappers (we could use aliases here, but go for
		4	robustness for now...: */
		5
		6	SANE_Status
		7	sane_init (SANE_Int *vc, SANE_Auth_Callback cb)
		8	{
		9	return ENTRY(init) (vc, cb);
		10	}
		11
		12	SANE_Status
		13	sane_get_devices (const SANE_Device ***dl, SANE_Bool local)
		14	{
		15	return ENTRY(get_devices) (dl, local);
		16	}
		17
		18	SANE_Status
		19	sane_open (SANE_String_Const name, SANE_Handle *h)
		20	{
		21	return ENTRY(open) (name, h);
		22	}
		23
		24	const SANE_Option_Descriptor *
		25	sane_get_option_descriptor (SANE_Handle h, SANE_Int opt)
		26	{
		27	return ENTRY(get_option_descriptor) (h, opt);
		28	}
		29
		30	SANE_Status
		31	sane_control_option (SANE_Handle h, SANE_Int opt, SANE_Action act,
		32	void val, SANE_Word info)
		33	{
		34	return ENTRY(control_option) (h, opt, act, val, info);
		35	}
		36
		37	SANE_Status
		38	sane_get_parameters (SANE_Handle h, SANE_Parameters *parms)
		39	{
		40	return ENTRY(get_parameters) (h, parms);
		41	}
		42
		43	SANE_Status
		44	sane_start (SANE_Handle h)
		45	{
		46	return ENTRY(start) (h);
		47	}
		48
		49	SANE_Status
		50	sane_read (SANE_Handle h, SANE_Byte buf, SANE_Int maxlen, SANE_Int lenp)
		51	{
		52	return ENTRY(read) (h, buf, maxlen, lenp);
		53	}
		54
		55	SANE_Status
		56	sane_set_io_mode (SANE_Handle h, SANE_Bool non_blocking)
		57	{
		58	return ENTRY(set_io_mode) (h, non_blocking);
		59	}
		60
		61	SANE_Status
		62	sane_get_select_fd (SANE_Handle h, SANE_Int *fdp)
		63	{
		64	return ENTRY(get_select_fd) (h, fdp);
65	}
66
67	void
68	sane_cancel (SANE_Handle h)
69	{
70	ENTRY(cancel) (h);
71	}
72
73	void
74	sane_close (SANE_Handle h)
75	{
76	ENTRY(close) (h);
77	}
78
79	void
80	sane_exit (void)
81	{
82	ENTRY(exit) ();
83	}