kopia lustrzana https://gitlab.com/sane-project/backends
Merge branch '634-llvm-15-on-freebsd-support-for-sane-backends-1-1-1_v2' into 'master'
Resolve "LLVM 15 on FreeBSD support for sane-backends 1.1.1" Closes #634 See merge request sane-project/backends!782666-epsonds-has-issues-with-saned
commit
bd9771939f
|
@ -39,15 +39,7 @@
|
|||
#include <string.h>
|
||||
#include <unistd.h>
|
||||
#include <stdarg.h>
|
||||
|
||||
#ifdef __FreeBSD__
|
||||
#include <libgen.h>
|
||||
#endif
|
||||
|
||||
#if defined (__APPLE__) && defined (__MACH__)
|
||||
#include <libgen.h> // for basename()
|
||||
#endif
|
||||
|
||||
#include <sys/types.h>
|
||||
#include <sys/stat.h>
|
||||
|
||||
|
@ -1260,7 +1252,21 @@ write_png_header (SANE_Frame format, int width, int height, int depth, int dpi,
|
|||
if ((is_gray_profile && color_type == PNG_COLOR_TYPE_GRAY) ||
|
||||
(is_rgb_profile && color_type == PNG_COLOR_TYPE_RGB))
|
||||
{
|
||||
png_set_iCCP(*png_ptr, *info_ptr, basename(icc_profile), PNG_COMPRESSION_TYPE_BASE, icc_buffer, icc_size);
|
||||
char *icc_profile_cp = strdup(icc_profile);
|
||||
if (icc_profile_cp == NULL)
|
||||
{
|
||||
fprintf(stderr, "Memory allocation failure prevented the setting of PNG ICC profile.\n");
|
||||
}
|
||||
else
|
||||
{
|
||||
png_set_iCCP (*png_ptr,
|
||||
*info_ptr,
|
||||
basename (icc_profile_cp),
|
||||
PNG_COMPRESSION_TYPE_BASE,
|
||||
icc_buffer,
|
||||
icc_size);
|
||||
free(icc_profile_cp);
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
|
|
Ładowanie…
Reference in New Issue