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

scanimage: various small corrections and little changes to enhance clarity.

fix-build-obselete-jpeg
Ralph Little 2020-03-01 23:31:23 -08:00
rodzic 2868e9e346
commit 4948130f7c
1 zmienionych plików z 16 dodań i 6 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

22
frontend/scanimage.c
Wyświetl plik

@ -369,13 +369,13 @@ print_option (SANE_Device * device, int opt_num, const SANE_Option_Descriptor *o
} }
/* if both of these are set, option is invalid */ /* if both of these are set, option is invalid */
if(opt->cap & SANE_CAP_SOFT_SELECT && opt->cap & SANE_CAP_HARD_SELECT){ if((opt->cap & SANE_CAP_SOFT_SELECT) && (opt->cap & SANE_CAP_HARD_SELECT)){
fprintf (stderr, "%s: invalid option caps, SS+HS\n", prog_name); fprintf (stderr, "%s: invalid option caps, SS+HS\n", prog_name);
return; return;
} }
/* invalid to select but not detect */ /* invalid to select but not detect */
if(opt->cap & SANE_CAP_SOFT_SELECT && !(opt->cap & SANE_CAP_SOFT_DETECT)){ if((opt->cap & SANE_CAP_SOFT_SELECT) && !(opt->cap & SANE_CAP_SOFT_DETECT)){
fprintf (stderr, "%s: invalid option caps, SS!SD\n", prog_name); fprintf (stderr, "%s: invalid option caps, SS!SD\n", prog_name);
return; return;
} }
@ -609,7 +609,7 @@ print_option (SANE_Device * device, int opt_num, const SANE_Option_Descriptor *o
else if(opt->cap & SANE_CAP_HARD_SELECT) else if(opt->cap & SANE_CAP_HARD_SELECT)
fputs (" [hardware]", stdout); fputs (" [hardware]", stdout);
else if(!(opt->cap & SANE_CAP_SOFT_SELECT) && opt->cap & SANE_CAP_SOFT_DETECT) else if(!(opt->cap & SANE_CAP_SOFT_SELECT) && (opt->cap & SANE_CAP_SOFT_DETECT))
fputs (" [read-only]", stdout); fputs (" [read-only]", stdout);
fputs ("\n ", stdout); fputs ("\n ", stdout);
@ -987,7 +987,15 @@ set_option (SANE_Handle device, int optnum, void *valuep)
SANE_Int info = 0; SANE_Int info = 0;
opt = sane_get_option_descriptor (device, optnum); opt = sane_get_option_descriptor (device, optnum);
if (opt && (!SANE_OPTION_IS_ACTIVE (opt->cap))) if (!opt)
{
if (verbose > 0)
fprintf (stderr, "%s: ignored request to set invalid option %d\n",
prog_name, optnum);
return;
}
if (!SANE_OPTION_IS_ACTIVE (opt->cap))
{ {
if (verbose > 0) if (verbose > 0)
fprintf (stderr, "%s: ignored request to set inactive option %s\n", fprintf (stderr, "%s: ignored request to set inactive option %s\n",
@ -1229,7 +1237,9 @@ write_png_header (SANE_Frame format, int width, int height, int depth, int dpi,
#ifdef HAVE_LIBJPEG #ifdef HAVE_LIBJPEG
static void static void
write_jpeg_header (SANE_Frame format, int width, int height, int dpi, FILE *ofp, struct jpeg_compress_struct *cinfo, struct jpeg_error_mgr *jerr) write_jpeg_header (SANE_Frame format, int width, int height, int dpi, FILE *ofp,
struct jpeg_compress_struct *cinfo,
struct jpeg_error_mgr *jerr)
{ {
cinfo->err = jpeg_std_error(jerr); cinfo->err = jpeg_std_error(jerr);
jpeg_create_compress(cinfo); jpeg_create_compress(cinfo);
@ -2599,7 +2609,7 @@ List of available devices:", prog_name);
ofp = fopen(output_file, "w"); ofp = fopen(output_file, "w");
if (ofp == NULL) if (ofp == NULL)
{ {
fprintf(stderr, "%s: could not open input file '%s', " fprintf(stderr, "%s: could not open output file '%s', "
"exiting\n", prog_name, output_file); "exiting\n", prog_name, output_file);
scanimage_exit(1); scanimage_exit(1);
} }