head	1.3;
access;
symbols
	pkgsrc-2026Q1:1.3.0.26
	pkgsrc-2026Q1-base:1.3
	pkgsrc-2025Q4:1.3.0.24
	pkgsrc-2025Q4-base:1.3
	pkgsrc-2025Q3:1.3.0.22
	pkgsrc-2025Q3-base:1.3
	pkgsrc-2025Q2:1.3.0.20
	pkgsrc-2025Q2-base:1.3
	pkgsrc-2025Q1:1.3.0.18
	pkgsrc-2025Q1-base:1.3
	pkgsrc-2024Q4:1.3.0.16
	pkgsrc-2024Q4-base:1.3
	pkgsrc-2024Q3:1.3.0.14
	pkgsrc-2024Q3-base:1.3
	pkgsrc-2024Q2:1.3.0.12
	pkgsrc-2024Q2-base:1.3
	pkgsrc-2024Q1:1.3.0.10
	pkgsrc-2024Q1-base:1.3
	pkgsrc-2023Q4:1.3.0.8
	pkgsrc-2023Q4-base:1.3
	pkgsrc-2023Q3:1.3.0.6
	pkgsrc-2023Q3-base:1.3
	pkgsrc-2023Q2:1.3.0.4
	pkgsrc-2023Q2-base:1.3
	pkgsrc-2023Q1:1.3.0.2
	pkgsrc-2023Q1-base:1.3
	pkgsrc-2022Q4:1.2.0.10
	pkgsrc-2022Q4-base:1.2
	pkgsrc-2022Q3:1.2.0.8
	pkgsrc-2022Q3-base:1.2
	pkgsrc-2022Q2:1.2.0.6
	pkgsrc-2022Q2-base:1.2
	pkgsrc-2022Q1:1.2.0.4
	pkgsrc-2022Q1-base:1.2
	pkgsrc-2021Q4:1.2.0.2
	pkgsrc-2021Q4-base:1.2
	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.3
date	2023.03.18.05.42.34;	author wiz;	state Exp;
branches;
next	1.2;
commitid	KQQR0zmdDAotdzhE;

1.2
date	2021.10.06.14.48.29;	author nia;	state Exp;
branches;
next	1.1;
commitid	lpVlz8Peunw0dLbD;

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


desc
@@


1.3
log
@freeimage: fix build with libraw-0.21
@
text
@$NetBSD: patch-Source_FreeImage_PluginRAW.cpp,v 1.2 2021/10/06 14:48:29 nia Exp $

- Unbundle image libraries.
- Fix building with libraw-0.20.
- Fix building with libraw-0.21.

--- Source/FreeImage/PluginRAW.cpp.orig	2015-03-10 11:12:04.000000000 +0000
+++ Source/FreeImage/PluginRAW.cpp
@@@@ -19,7 +19,7 @@@@
 // Use at your own risk!
 // ==========================================================
 
-#include "../LibRawLite/libraw/libraw.h"
+#include <libraw/libraw.h>
 
 #include "FreeImage.h"
 #include "Utilities.h"
@@@@ -63,17 +63,14 @@@@ public:
 	}
 
     int read(void *buffer, size_t size, size_t count) { 
-		if(substream) return substream->read(buffer, size, count);
 		return _io->read_proc(buffer, (unsigned)size, (unsigned)count, _handle);
 	}
 
     int seek(INT64 offset, int origin) { 
-        if(substream) return substream->seek(offset, origin);
 		return _io->seek_proc(_handle, (long)offset, origin);
 	}
 
     INT64 tell() { 
-		if(substream) return substream->tell();
         return _io->tell_proc(_handle);
     }
 	
@@@@ -83,13 +80,11 @@@@ public:
 
     int get_char() { 
 		int c = 0;
-		if(substream) return substream->get_char();
 		if(!_io->read_proc(&c, 1, 1, _handle)) return -1;
 		return c;
    }
 	
 	char* gets(char *buffer, int length) { 
-		if (substream) return substream->gets(buffer, length);
 		memset(buffer, 0, length);
 		for(int i = 0; i < length; i++) {
 			if(!_io->read_proc(&buffer[i], 1, 1, _handle))
@@@@ -104,7 +99,6 @@@@ public:
 		std::string buffer;
 		char element = 0;
 		bool bDone = false;
-		if(substream) return substream->scanf_one(fmt,val);				
 		do {
 			if(_io->read_proc(&element, 1, 1, _handle) == 1) {
 				switch(element) {
@@@@ -127,7 +121,6 @@@@ public:
 	}
 
 	int eof() { 
-		if(substream) return substream->eof();
         return (_io->tell_proc(_handle) >= _eof);
     }
 
@@@@ -694,7 +687,11 @@@@ Load(FreeImageIO *io, fi_handle handle, 
 		// --------------------------------------------
 
 		// (-s [0..N-1]) Select one raw image from input file
+#if LIBRAW_COMPILE_CHECK_VERSION_NOTLESS(0, 21)
+		RawProcessor->imgdata.rawparams.shot_select = 0;
+#else
 		RawProcessor->imgdata.params.shot_select = 0;
+#endif
 		// (-w) Use camera white balance, if possible (otherwise, fallback to auto_wb)
 		RawProcessor->imgdata.params.use_camera_wb = 1;
 		// (-M) Use any color matrix from the camera metadata. This option only affects Olympus, Leaf, and Phase One cameras.
@


1.2
log
@freeimage: Fix building with latest libraw.
@
text
@d1 1
a1 1
$NetBSD: patch-Source_FreeImage_PluginRAW.cpp,v 1.1 2020/05/14 16:42:14 nia Exp $
d5 1
d7 1
a7 1
--- Source/FreeImage/PluginRAW.cpp.orig	2015-03-10 10:12:04.000000000 +0000
d66 12
@


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
@d1 1
a1 1
$NetBSD$
d3 2
a4 1
Unbundle image libraries.
d6 1
a6 1
--- Source/FreeImage/PluginRAW.cpp.orig	2015-03-10 11:12:04.000000000 +0000
d17 48
@