update buildroot to 2017.02.11
This commit is contained in:
@@ -0,0 +1,70 @@
|
||||
From 6173a57d39e04d68b139f8c1aa499a24dbe74ba1 Mon Sep 17 00:00:00 2001
|
||||
From: Even Rouault <even.rouault@spatialys.com>
|
||||
Date: Fri, 30 Jun 2017 17:29:44 +0000
|
||||
Subject: [PATCH] * libtiff/tif_dirwrite.c: in
|
||||
TIFFWriteDirectoryTagCheckedXXXX() functions associated with LONG8/SLONG8
|
||||
data type, replace assertion that the file is BigTIFF, by a non-fatal error.
|
||||
Fixes http://bugzilla.maptools.org/show_bug.cgi?id=2712 Reported by team
|
||||
OWL337
|
||||
|
||||
[Peter: drop ChangeLog modification]
|
||||
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
|
||||
---
|
||||
libtiff/tif_dirwrite.c | 20 ++++++++++++++++----
|
||||
1 file changed, 23 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/libtiff/tif_dirwrite.c b/libtiff/tif_dirwrite.c
|
||||
index 2967da58..8d6686ba 100644
|
||||
--- a/libtiff/tif_dirwrite.c
|
||||
+++ b/libtiff/tif_dirwrite.c
|
||||
@@ -2111,7 +2111,10 @@ TIFFWriteDirectoryTagCheckedLong8(TIFF* tif, uint32* ndir, TIFFDirEntry* dir, ui
|
||||
{
|
||||
uint64 m;
|
||||
assert(sizeof(uint64)==8);
|
||||
- assert(tif->tif_flags&TIFF_BIGTIFF);
|
||||
+ if( !(tif->tif_flags&TIFF_BIGTIFF) ) {
|
||||
+ TIFFErrorExt(tif->tif_clientdata,"TIFFWriteDirectoryTagCheckedLong8","LONG8 not allowed for ClassicTIFF");
|
||||
+ return(0);
|
||||
+ }
|
||||
m=value;
|
||||
if (tif->tif_flags&TIFF_SWAB)
|
||||
TIFFSwabLong8(&m);
|
||||
@@ -2124,7 +2127,10 @@ TIFFWriteDirectoryTagCheckedLong8Array(TIFF* tif, uint32* ndir, TIFFDirEntry* di
|
||||
{
|
||||
assert(count<0x20000000);
|
||||
assert(sizeof(uint64)==8);
|
||||
- assert(tif->tif_flags&TIFF_BIGTIFF);
|
||||
+ if( !(tif->tif_flags&TIFF_BIGTIFF) ) {
|
||||
+ TIFFErrorExt(tif->tif_clientdata,"TIFFWriteDirectoryTagCheckedLong8","LONG8 not allowed for ClassicTIFF");
|
||||
+ return(0);
|
||||
+ }
|
||||
if (tif->tif_flags&TIFF_SWAB)
|
||||
TIFFSwabArrayOfLong8(value,count);
|
||||
return(TIFFWriteDirectoryTagData(tif,ndir,dir,tag,TIFF_LONG8,count,count*8,value));
|
||||
@@ -2136,7 +2142,10 @@ TIFFWriteDirectoryTagCheckedSlong8(TIFF* tif, uint32* ndir, TIFFDirEntry* dir, u
|
||||
{
|
||||
int64 m;
|
||||
assert(sizeof(int64)==8);
|
||||
- assert(tif->tif_flags&TIFF_BIGTIFF);
|
||||
+ if( !(tif->tif_flags&TIFF_BIGTIFF) ) {
|
||||
+ TIFFErrorExt(tif->tif_clientdata,"TIFFWriteDirectoryTagCheckedLong8","SLONG8 not allowed for ClassicTIFF");
|
||||
+ return(0);
|
||||
+ }
|
||||
m=value;
|
||||
if (tif->tif_flags&TIFF_SWAB)
|
||||
TIFFSwabLong8((uint64*)(&m));
|
||||
@@ -2149,7 +2158,10 @@ TIFFWriteDirectoryTagCheckedSlong8Array(TIFF* tif, uint32* ndir, TIFFDirEntry* d
|
||||
{
|
||||
assert(count<0x20000000);
|
||||
assert(sizeof(int64)==8);
|
||||
- assert(tif->tif_flags&TIFF_BIGTIFF);
|
||||
+ if( !(tif->tif_flags&TIFF_BIGTIFF) ) {
|
||||
+ TIFFErrorExt(tif->tif_clientdata,"TIFFWriteDirectoryTagCheckedLong8","SLONG8 not allowed for ClassicTIFF");
|
||||
+ return(0);
|
||||
+ }
|
||||
if (tif->tif_flags&TIFF_SWAB)
|
||||
TIFFSwabArrayOfLong8((uint64*)value,count);
|
||||
return(TIFFWriteDirectoryTagData(tif,ndir,dir,tag,TIFF_SLONG8,count,count*8,value));
|
||||
--
|
||||
2.11.0
|
||||
|
||||
70
bsp/buildroot-2017.02.11/package/tiff/Config.in
Normal file
70
bsp/buildroot-2017.02.11/package/tiff/Config.in
Normal file
@@ -0,0 +1,70 @@
|
||||
menuconfig BR2_PACKAGE_TIFF
|
||||
bool "tiff"
|
||||
help
|
||||
Library for handling TIFF (Tag Image File Format) images.
|
||||
|
||||
http://simplesystems.org/libtiff/
|
||||
|
||||
if BR2_PACKAGE_TIFF
|
||||
|
||||
config BR2_PACKAGE_TIFF_CCITT
|
||||
bool "CCITT Group 3 & 4 support"
|
||||
default y
|
||||
|
||||
config BR2_PACKAGE_TIFF_PACKBITS
|
||||
bool "Macintosh PackBits algorithm"
|
||||
default y
|
||||
|
||||
config BR2_PACKAGE_TIFF_LZW
|
||||
bool "LZW algorithm"
|
||||
default y
|
||||
|
||||
config BR2_PACKAGE_TIFF_THUNDER
|
||||
bool "ThunderScan 4-bit RLE algorithm"
|
||||
default y
|
||||
|
||||
config BR2_PACKAGE_TIFF_NEXT
|
||||
bool "NeXT 2-bit RLE algorithm"
|
||||
default y
|
||||
|
||||
config BR2_PACKAGE_TIFF_LOGLUV
|
||||
bool "LogLuv high dynamic range encoding"
|
||||
default y
|
||||
|
||||
config BR2_PACKAGE_TIFF_MDI
|
||||
bool "Microsoft Document Imaging"
|
||||
default y
|
||||
|
||||
config BR2_PACKAGE_TIFF_ZLIB
|
||||
bool "Zlib usage (required for Deflate compression)"
|
||||
select BR2_PACKAGE_ZLIB
|
||||
default y
|
||||
|
||||
config BR2_PACKAGE_TIFF_XZ
|
||||
bool "XZ compression"
|
||||
select BR2_PACKAGE_XZ
|
||||
|
||||
config BR2_PACKAGE_TIFF_PIXARLOG
|
||||
bool "Pixar log-format algorithm (requires Zlib)"
|
||||
select BR2_PACKAGE_TIFF_ZLIB
|
||||
default y
|
||||
|
||||
config BR2_PACKAGE_TIFF_JPEG
|
||||
bool "JPEG compression"
|
||||
select BR2_PACKAGE_JPEG
|
||||
default y
|
||||
|
||||
config BR2_PACKAGE_TIFF_OLD_JPEG
|
||||
bool "Old JPEG decompression"
|
||||
default y
|
||||
|
||||
config BR2_PACKAGE_TIFF_JBIG
|
||||
bool "JBIG compression"
|
||||
default y
|
||||
|
||||
config BR2_PACKAGE_TIFF_UTILITIES
|
||||
bool "tiff utilities"
|
||||
help
|
||||
Install all tiff utilities.
|
||||
|
||||
endif
|
||||
2
bsp/buildroot-2017.02.11/package/tiff/tiff.hash
Normal file
2
bsp/buildroot-2017.02.11/package/tiff/tiff.hash
Normal file
@@ -0,0 +1,2 @@
|
||||
# Locally computed
|
||||
sha256 59d7a5a8ccd92059913f246877db95a2918e6c04fb9d43fd74e5c3390dac2910 tiff-4.0.8.tar.gz
|
||||
92
bsp/buildroot-2017.02.11/package/tiff/tiff.mk
Normal file
92
bsp/buildroot-2017.02.11/package/tiff/tiff.mk
Normal file
@@ -0,0 +1,92 @@
|
||||
################################################################################
|
||||
#
|
||||
# tiff
|
||||
#
|
||||
################################################################################
|
||||
|
||||
TIFF_VERSION = 4.0.8
|
||||
TIFF_SITE = http://download.osgeo.org/libtiff
|
||||
TIFF_LICENSE = tiff license
|
||||
TIFF_LICENSE_FILES = COPYRIGHT
|
||||
TIFF_INSTALL_STAGING = YES
|
||||
TIFF_CONF_OPTS = \
|
||||
--disable-cxx \
|
||||
--without-x \
|
||||
|
||||
TIFF_DEPENDENCIES = host-pkgconf
|
||||
|
||||
HOST_TIFF_CONF_OPTS = \
|
||||
--disable-cxx \
|
||||
--without-x \
|
||||
--disable-zlib \
|
||||
--disable-lzma \
|
||||
--disable-jpeg
|
||||
HOST_TIFF_DEPENDENCIES = host-pkgconf
|
||||
|
||||
ifneq ($(BR2_PACKAGE_TIFF_CCITT),y)
|
||||
TIFF_CONF_OPTS += --disable-ccitt
|
||||
endif
|
||||
|
||||
ifneq ($(BR2_PACKAGE_TIFF_PACKBITS),y)
|
||||
TIFF_CONF_OPTS += --disable-packbits
|
||||
endif
|
||||
|
||||
ifneq ($(BR2_PACKAGE_TIFF_LZW),y)
|
||||
TIFF_CONF_OPTS += --disable-lzw
|
||||
endif
|
||||
|
||||
ifneq ($(BR2_PACKAGE_TIFF_THUNDER),y)
|
||||
TIFF_CONF_OPTS += --disable-thunder
|
||||
endif
|
||||
|
||||
ifneq ($(BR2_PACKAGE_TIFF_NEXT),y)
|
||||
TIFF_CONF_OPTS += --disable-next
|
||||
endif
|
||||
|
||||
ifneq ($(BR2_PACKAGE_TIFF_LOGLUV),y)
|
||||
TIFF_CONF_OPTS += --disable-logluv
|
||||
endif
|
||||
|
||||
ifneq ($(BR2_PACKAGE_TIFF_MDI),y)
|
||||
TIFF_CONF_OPTS += --disable-mdi
|
||||
endif
|
||||
|
||||
ifneq ($(BR2_PACKAGE_TIFF_ZLIB),y)
|
||||
TIFF_CONF_OPTS += --disable-zlib
|
||||
else
|
||||
TIFF_DEPENDENCIES += zlib
|
||||
endif
|
||||
|
||||
ifneq ($(BR2_PACKAGE_TIFF_XZ),y)
|
||||
TIFF_CONF_OPTS += --disable-lzma
|
||||
else
|
||||
TIFF_DEPENDENCIES += xz
|
||||
endif
|
||||
|
||||
ifneq ($(BR2_PACKAGE_TIFF_PIXARLOG),y)
|
||||
TIFF_CONF_OPTS += --disable-pixarlog
|
||||
endif
|
||||
|
||||
ifneq ($(BR2_PACKAGE_TIFF_JPEG),y)
|
||||
TIFF_CONF_OPTS += --disable-jpeg
|
||||
else
|
||||
TIFF_DEPENDENCIES += jpeg
|
||||
endif
|
||||
|
||||
ifneq ($(BR2_PACKAGE_TIFF_OLD_JPEG),y)
|
||||
TIFF_CONF_OPTS += --disable-old-jpeg
|
||||
endif
|
||||
|
||||
ifneq ($(BR2_PACKAGE_TIFF_JBIG),y)
|
||||
TIFF_CONF_OPTS += --disable-jbig
|
||||
endif
|
||||
|
||||
TIFF_SUBDIRS = port libtiff
|
||||
ifeq ($(BR2_PACKAGE_TIFF_UTILITIES),y)
|
||||
TIFF_SUBDIRS += tools
|
||||
endif
|
||||
|
||||
TIFF_MAKE = $(MAKE) SUBDIRS="$(TIFF_SUBDIRS)"
|
||||
|
||||
$(eval $(autotools-package))
|
||||
$(eval $(host-autotools-package))
|
||||
Reference in New Issue
Block a user