head	1.1;
access;
symbols
	pkgsrc-2026Q1:1.1.0.48
	pkgsrc-2026Q1-base:1.1
	pkgsrc-2025Q4:1.1.0.46
	pkgsrc-2025Q4-base:1.1
	pkgsrc-2025Q3:1.1.0.44
	pkgsrc-2025Q3-base:1.1
	pkgsrc-2025Q2:1.1.0.42
	pkgsrc-2025Q2-base:1.1
	pkgsrc-2025Q1:1.1.0.40
	pkgsrc-2025Q1-base:1.1
	pkgsrc-2024Q4:1.1.0.38
	pkgsrc-2024Q4-base:1.1
	pkgsrc-2024Q3:1.1.0.36
	pkgsrc-2024Q3-base:1.1
	pkgsrc-2024Q2:1.1.0.34
	pkgsrc-2024Q2-base:1.1
	pkgsrc-2024Q1:1.1.0.32
	pkgsrc-2024Q1-base:1.1
	pkgsrc-2023Q4:1.1.0.30
	pkgsrc-2023Q4-base:1.1
	pkgsrc-2023Q3:1.1.0.28
	pkgsrc-2023Q3-base:1.1
	pkgsrc-2023Q2:1.1.0.26
	pkgsrc-2023Q2-base:1.1
	pkgsrc-2023Q1:1.1.0.24
	pkgsrc-2023Q1-base:1.1
	pkgsrc-2022Q4:1.1.0.22
	pkgsrc-2022Q4-base:1.1
	pkgsrc-2022Q3:1.1.0.20
	pkgsrc-2022Q3-base:1.1
	pkgsrc-2022Q2:1.1.0.18
	pkgsrc-2022Q2-base:1.1
	pkgsrc-2022Q1:1.1.0.16
	pkgsrc-2022Q1-base:1.1
	pkgsrc-2021Q4:1.1.0.14
	pkgsrc-2021Q4-base:1.1
	pkgsrc-2021Q3:1.1.0.12
	pkgsrc-2021Q3-base:1.1
	pkgsrc-2021Q2:1.1.0.10
	pkgsrc-2021Q2-base:1.1
	pkgsrc-2021Q1:1.1.0.8
	pkgsrc-2021Q1-base:1.1
	pkgsrc-2020Q4:1.1.0.6
	pkgsrc-2020Q4-base:1.1
	pkgsrc-2020Q3:1.1.0.4
	pkgsrc-2020Q3-base:1.1
	pkgsrc-2020Q2:1.1.0.2
	pkgsrc-2020Q2-base:1.1;
locks; strict;
comment	@// @;


1.1
date	2020.05.14.16.42.14;	author nia;	state Exp;
branches;
next	;
commitid	3Tph3M06xg54ee8C;


desc
@@


1.1
log
@freeimage: Force use of unbundled libraries.

Most Linux distributions have been forcing this for a while, because
the reference image libraries are often full of bugs and slow to do
releases, so everyone (including us) is carrying lots of local patches
for security fixes.

Bump PKGREVISION
@
text
@$NetBSD$

Unbundle image libraries.

--- Source/FreeImage/PSDParser.cpp.orig	2016-02-11 04:18:02.000000000 +0000
+++ Source/FreeImage/PSDParser.cpp
@@@@ -133,8 +133,8 @@@@ public:
 template <>
 class PSDGetValue<8> {
 public:
-	static inline UINT64 get(const BYTE * iprBuffer) {
-		UINT64 v = ((const UINT64*)iprBuffer)[0];
+	static inline uint64_t get(const BYTE * iprBuffer) {
+		uint64_t v = ((const uint64_t*)iprBuffer)[0];
 #ifndef FREEIMAGE_BIGENDIAN
 		SwapInt64(&v);
 #endif
@@@@ -147,7 +147,7 @@@@ public:
 
 // --------------------------------------------------------------------------
 
-static UINT64
+static uint64_t
 psdReadSize(FreeImageIO *io, fi_handle handle, const psdHeaderInfo& header) {
 	if(header._Version == 1) {
 		BYTE Length[4];
@@@@ -199,11 +199,11 @@@@ public:
 template <>
 class PSDSetValue<8> {
 public:
-	static inline void set(const BYTE * iprBuffer, UINT64 v) {
+	static inline void set(const BYTE * iprBuffer, uint64_t v) {
 #ifndef FREEIMAGE_BIGENDIAN
 		SwapInt64(&v);
 #endif
-		((UINT64*)iprBuffer)[0] = v;
+		((uint64_t*)iprBuffer)[0] = v;
 	}
 };
 
@@@@ -213,7 +213,7 @@@@ public:
 // --------------------------------------------------------------------------
 
 static inline bool
-psdWriteSize(FreeImageIO *io, fi_handle handle, const psdHeaderInfo& header, UINT64 v) {
+psdWriteSize(FreeImageIO *io, fi_handle handle, const psdHeaderInfo& header, uint64_t v) {
 	if(header._Version == 1) {
 		BYTE Length[4];
 		psdSetLongValue(Length, sizeof(Length), (DWORD)v);
@@@@ -1063,10 +1063,10 @@@@ unsigned psdParser::GetChannelOffset(FIB
 bool psdParser::ReadLayerAndMaskInfoSection(FreeImageIO *io, fi_handle handle)	{
 	bool bSuccess = true;
 
-	UINT64 nTotalBytes = psdReadSize(io, handle, _headerInfo);
+	uint64_t nTotalBytes = psdReadSize(io, handle, _headerInfo);
 
 	// Hack to handle large PSB files without using fseeko().
-	if (sizeof(long) < sizeof(UINT64)) {
+	if (sizeof(long) < sizeof(uint64_t)) {
 		const long offset = 0x10000000;
 		while (nTotalBytes > offset) {
 			if (io->seek_proc(handle, offset, SEEK_CUR) != 0) {
@@@@ -1672,7 +1672,7 @@@@ bool psdParser::WriteLayerAndMaskInfoSec
 	// Short section with no layers.
 	BYTE IntValue[4];
 
-	UINT64 size;
+	uint64_t size;
 	if(_headerInfo._Version == 1) {
 		size = 8;
 	} else {
@