From 58912f68c2489bcee787599837447e0d64dfd61a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Wed, 24 May 2017 21:03:56 +0200 Subject: New upstream version 1.0.27 --- backend/dc240.c | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) (limited to 'backend/dc240.c') diff --git a/backend/dc240.c b/backend/dc240.c index 001a937..74ab2e0 100644 --- a/backend/dc240.c +++ b/backend/dc240.c @@ -810,7 +810,7 @@ change_res (SANE_Int fd, SANE_Byte res) } SANE_Status -sane_init (SANE_Int * version_code, SANE_Auth_Callback UNUSEDARG authorize) +sane_init (SANE_Int * version_code, SANE_Auth_Callback __sane_unused__ authorize) { SANE_Char f[] = "sane_init"; @@ -962,7 +962,7 @@ static const SANE_Device *devlist[] = { SANE_Status sane_get_devices (const SANE_Device *** device_list, SANE_Bool - UNUSEDARG local_only) + __sane_unused__ local_only) { DBG (127, "sane_get_devices called\n"); @@ -1290,7 +1290,7 @@ my_source_mgr; typedef my_source_mgr *my_src_ptr; METHODDEF (void) -jpeg_init_source (j_decompress_ptr UNUSEDARG cinfo) +jpeg_init_source (j_decompress_ptr __sane_unused__ cinfo) { /* nothing to do */ } @@ -1336,7 +1336,7 @@ static SANE_Int linebuffer_index = 0; METHODDEF (void) -jpeg_term_source (j_decompress_ptr UNUSEDARG cinfo) +jpeg_term_source (j_decompress_ptr __sane_unused__ cinfo) { /* no work necessary here */ } @@ -1417,7 +1417,7 @@ sane_start (SANE_Handle handle) my_src_ptr src; struct jpeg_error_mgr jerr; - SANE_Int row_stride, n; + SANE_Int n; SANE_Char f[] = "sane_start"; SANE_Char path[256]; struct cam_dirlist *e; @@ -1476,7 +1476,6 @@ sane_start (SANE_Handle handle) (void) jpeg_read_header (&cinfo, TRUE); dest_mgr = sanei_jpeg_jinit_write_ppm (&cinfo); (void) jpeg_start_decompress (&cinfo); - row_stride = cinfo.output_width * cinfo.output_components; linebuffer_size = 0; linebuffer_index = 0; @@ -1488,7 +1487,7 @@ sane_start (SANE_Handle handle) } SANE_Status -sane_read (SANE_Handle UNUSEDARG handle, SANE_Byte * data, +sane_read (SANE_Handle __sane_unused__ handle, SANE_Byte * data, SANE_Int max_length, SANE_Int * length) { SANE_Int lines = 0; @@ -1582,7 +1581,7 @@ sane_read (SANE_Handle UNUSEDARG handle, SANE_Byte * data, } void -sane_cancel (SANE_Handle UNUSEDARG handle) +sane_cancel (SANE_Handle __sane_unused__ handle) { unsigned char cancel_byte[] = { 0xe4 }; @@ -1621,8 +1620,8 @@ sane_cancel (SANE_Handle UNUSEDARG handle) } SANE_Status -sane_set_io_mode (SANE_Handle UNUSEDARG handle, SANE_Bool - UNUSEDARG non_blocking) +sane_set_io_mode (SANE_Handle __sane_unused__ handle, SANE_Bool + __sane_unused__ non_blocking) { /* sane_set_io_mode() is only valid during a scan */ if (Camera.scanning) @@ -1644,7 +1643,7 @@ sane_set_io_mode (SANE_Handle UNUSEDARG handle, SANE_Bool } SANE_Status -sane_get_select_fd (SANE_Handle UNUSEDARG handle, SANE_Int * UNUSEDARG fd) +sane_get_select_fd (SANE_Handle __sane_unused__ handle, SANE_Int __sane_unused__ * fd) { return SANE_STATUS_UNSUPPORTED; } -- cgit v1.2.3 From 1687222e1b9e74c89cafbb5910e72d8ec7bfd40f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Wed, 31 Jul 2019 16:59:49 +0200 Subject: New upstream version 1.0.28 --- backend/dc240.c | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) (limited to 'backend/dc240.c') diff --git a/backend/dc240.c b/backend/dc240.c index 74ab2e0..0a53405 100644 --- a/backend/dc240.c +++ b/backend/dc240.c @@ -1,13 +1,13 @@ /*************************************************************************** * _S_A_N_E - Scanner Access Now Easy. - dc240.c + dc240.c 03/12/01 - Peter Fales Based on the dc210 driver, (C) 1998 Brian J. Murrell (which is based on dc25 driver (C) 1998 by Peter Fales) - + This file (C) 2001 by Peter Fales This file is part of the SANE package. @@ -46,12 +46,12 @@ If you write modifications of your own for SANE, it is your choice whether to permit this exception to apply to your modifications. - If you do not wish that, delete this exception notice. + If you do not wish that, delete this exception notice. *************************************************************************** This file implements a SANE backend for the Kodak DC-240 - digital camera. THIS IS EXTREMELY ALPHA CODE! USE AT YOUR OWN RISK!! + digital camera. THIS IS EXTREMELY ALPHA CODE! USE AT YOUR OWN RISK!! (feedback to: dc240-devel@fales-lorenz.net) @@ -440,7 +440,7 @@ init_dc240 (DC240 * camera) } /* send a break to get it back to a known state */ - /* Used to supply a non-zero argument to tcsendbreak(), TCSBRK, + /* Used to supply a non-zero argument to tcsendbreak(), TCSBRK, * and TCSBRKP, but that is system dependent. e.g. on irix a non-zero * value does a drain instead of a break. A zero value is universally * used to send a break. @@ -465,7 +465,7 @@ init_dc240 (DC240 * camera) sleep (1); #endif - /* We seem to get some garbage following the break, so + /* We seem to get some garbage following the break, so * read anything pending */ n = read (camera->fd, buf, 5); @@ -476,8 +476,8 @@ init_dc240 (DC240 * camera) if (send_pck (camera->fd, init_pck) == -1) { /* - * The camera always powers up at 9600, so we try - * that first. However, it may be already set to + * The camera always powers up at 9600, so we try + * that first. However, it may be already set to * a different speed. Try the entries in the table: */ @@ -491,7 +491,7 @@ init_dc240 (DC240 * camera) buf[1], buf[2], buf[3], buf[4]); /* - Set speed to requested speed. + Set speed to requested speed. */ cfsetospeed (&tty_new, Camera.baud); cfsetispeed (&tty_new, Camera.baud); @@ -597,7 +597,7 @@ get_info (DC240 * camera) n = read_dir ("\\PCCARD\\DCIM\\*.*"); /* If we've already got a folder_list, free it up before starting - * the new one + * the new one */ if (folder_list != NULL) { @@ -1083,8 +1083,8 @@ sane_control_option (SANE_Handle handle, SANE_Int option, myinfo |= SANE_INFO_RELOAD_PARAMS; - /* get the image's resolution, unless the camera has no - * pictures yet + /* get the image's resolution, unless the camera has no + * pictures yet */ if (Camera.pic_taken != 0) { @@ -1367,7 +1367,7 @@ sane_start (SANE_Handle handle) if (dc240_opt_snap) { /* - * Don't allow picture unless there is room in the + * Don't allow picture unless there is room in the * camera. */ if (Camera.pic_left == 0) @@ -1719,7 +1719,7 @@ get_picture_info (PictureInfo * pic, SANE_Int p) read_info (e->name); - /* Validate picture info + /* Validate picture info * byte 0 - 1 == picture info * byte 1 - 5 == DC240 Camera * byte 2 - 3 == JFIF file @@ -1736,7 +1736,7 @@ get_picture_info (PictureInfo * pic, SANE_Int p) pic->low_res = info_buf[3] == 0 ? SANE_TRUE : SANE_FALSE; - /* + /* * byte 12 - Year MSB * byte 13 - Year LSB * byte 14 - Month @@ -1991,8 +1991,8 @@ read_info (SANE_String fname) /* - * send_data - Send a data block - assumes all data blocks to camera - * are 60 bytes long + * send_data - Send a data block - assumes all data blocks to camera + * are 60 bytes long */ static SANE_Int @@ -2090,7 +2090,7 @@ dir_insert (struct cam_dirent *entry) } /* - * dir_delete - Delete a directory entry from the linked list of file + * dir_delete - Delete a directory entry from the linked list of file * names */ static SANE_Int @@ -2123,7 +2123,7 @@ dir_delete (SANE_String fname) } /* - * set_res - set picture size depending on resolution settings + * set_res - set picture size depending on resolution settings */ static void set_res (SANE_Int lowres) -- cgit v1.2.3