Mercurial > mxe-octave
view src/devil-1-png.patch @ 5571:b19fb3ed330c
use cmake command line to set build shared/static options (bug #59373)
* Makefile.in (CMAKE_BUILD_SHARED_OR_STATIC): New variable.
(build-cmake-toolchain-file): Don't define BUILD_SHARED_LIBS or
BUILD_STATIC_LIBS in the toolchain file.
* armadillo.mk, cgal.mk, cmake.mk, cminpack.mk, double-conversion.mk,
eigen.mk, gdcm.mk, gl2ps.mk, hdf5.mk, lapack.mk, libical.mk,
libproxy.mk, of-dicom.mk, openal.mk, opencv.mk, openexr.mk,
openscenegraph.mk, physfs.mk, qhull.mk, qjson.mk, rapidjson.mk,
suitesparse.mk, sundials-ida.mk, taglib.mk, vigra.mk, vmime.mk,
vtk.mk, wt.mk: Use $(CMAKE_BUILD_SHARED_OR_STATIC) on the cmake
command line.
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Fri, 30 Oct 2020 10:06:00 -0400 |
| parents | 99516e73b368 |
| children |
line wrap: on
line source
This file is part of MXE. See index.html for further information. diff -urN devil-1.7.8.orig/src-IL/src/il_icon.c devil-1.7.8/src-IL/src/il_icon.c --- devil-1.7.8.orig/src-IL/src/il_icon.c 2009-03-08 08:10:09.000000000 +0100 +++ devil-1.7.8/src-IL/src/il_icon.c 2010-02-01 16:01:37.000000000 +0100 @@ -525,7 +525,7 @@ // Expand low-bit-depth grayscale images to 8 bits if (ico_color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8) { - png_set_gray_1_2_4_to_8(ico_png_ptr); + png_set_expand_gray_1_2_4_to_8(ico_png_ptr); } // Expand RGB images with transparency to full alpha channels diff -urN devil-1.7.8.orig/src-IL/src/il_png.c devil-1.7.8/src-IL/src/il_png.c --- devil-1.7.8.orig/src-IL/src/il_png.c 2009-03-08 08:10:09.000000000 +0100 +++ devil-1.7.8/src-IL/src/il_png.c 2010-02-01 15:58:41.000000000 +0100 @@ -105,7 +105,7 @@ Read = iread(Signature, 1, 8); iseek(-Read, IL_SEEK_CUR); - return png_check_sig(Signature, 8); + return !png_sig_cmp(Signature, 0, 8); } @@ -278,7 +278,7 @@ // Expand low-bit-depth grayscale images to 8 bits if (png_color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8) { - png_set_gray_1_2_4_to_8(png_ptr); + png_set_expand_gray_1_2_4_to_8(png_ptr); } // Expand RGB images with transparency to full alpha channels