kopia lustrzana https://gitlab.com/sane-project/backends
Fix style.
rodzic
6a9a0beee8
commit
c3adeed4c4
|
@ -437,7 +437,7 @@ EXTRA_DIST += dmc.conf.in
|
|||
if have_libavahi
|
||||
if have_libcurl
|
||||
if have_libxml2
|
||||
libescl_la_SOURCES = escl/escl.c escl/escl_capabilities.c escl/escl_devices.c escl/escl.h escl/escl_newjob.c escl/escl_reset.c escl/escl_scan.c escl/escl_status.c escl/escl_jpeg.c escl/escl_png.c escl/escl_tiff.c escl/escl_crop.c
|
||||
libescl_la_SOURCES = escl/escl.c escl/escl_capabilities.c escl/escl_devices.c escl/escl.h escl/escl_newjob.c escl/escl_reset.c escl/escl_scan.c escl/escl_status.c escl/escl_jpeg.c escl/escl_png.c escl/escl_tiff.c escl/escl_crop.c
|
||||
libescl_la_CPPFLAGS = $(AM_CPPFLAGS) $(JPEG_CFLAGS) $(PNG_CFLAGS) $(TIFF_CFLAGS) $(XML_CFLAGS) $(libcurl_CFLAGS) $(AVAHI_CFLAGS) -DBACKEND_NAME=escl
|
||||
|
||||
nodist_libsane_escl_la_SOURCES = escl-s.c
|
||||
|
|
|
@ -87,4 +87,3 @@ escl_crop_surface(capabilities_t *scanner,
|
|||
finish:
|
||||
return surface;
|
||||
}
|
||||
|
||||
|
|
|
@ -165,15 +165,15 @@ get_PNG_data(capabilities_t *scanner, int *width, int *height, int *bps)
|
|||
}
|
||||
// read pixel data using row pointers
|
||||
png_read_image (png_ptr, row_pointers);
|
||||
|
||||
// If necessary, trim the image.
|
||||
|
||||
// If necessary, trim the image.
|
||||
surface = escl_crop_surface(scanner, surface, w, h, components, width, height);
|
||||
if (!surface) {
|
||||
DBG( 1, "Escl Png : Surface Memory allocation problem\n");
|
||||
status = SANE_STATUS_NO_MEM;
|
||||
goto close_file;
|
||||
}
|
||||
|
||||
|
||||
free (row_pointers);
|
||||
|
||||
close_file:
|
||||
|
|
|
@ -83,20 +83,20 @@ get_TIFF_data(capabilities_t *scanner, int *width, int *height, int *bps)
|
|||
{
|
||||
DBG( 1, "Escl Tiff : Problem reading image data.\n");
|
||||
status = SANE_STATUS_INVAL;
|
||||
free(surface);
|
||||
free(surface);
|
||||
goto close_tiff;
|
||||
}
|
||||
|
||||
*bps = components;
|
||||
|
||||
// If necessary, trim the image.
|
||||
|
||||
// If necessary, trim the image.
|
||||
surface = escl_crop_surface(scanner, surface, w, h, components, width, height);
|
||||
if (!surface) {
|
||||
DBG( 1, "Escl Tiff : Surface Memory allocation problem\n");
|
||||
status = SANE_STATUS_INVAL;
|
||||
}
|
||||
|
||||
close_tiff:
|
||||
close_tiff:
|
||||
TIFFClose(tif);
|
||||
close_file:
|
||||
if (scanner->tmp)
|
||||
|
|
Ładowanie…
Reference in New Issue