[freeimage] 35/47: Imported Debian patch 3.15.1-2

[Ghislain Vaillant]

This is an automated email from the git hooks/post-receive script.

ghisvail-guest pushed a commit to branch master
in repository freeimage.

commit 0423e923b7c5d5fdcb212a14e933336ac642b8b2
Author: Luca Falavigna <dktrkranz at debian.org>
Date:   Thu Jul 11 11:22:37 2013 +0200

    Imported Debian patch 3.15.1-2
---
 debian/changelog                   |  8 ++++
 debian/patches/document-mode.patch | 77 ++++++++++++++++++++++++++++++++++++++
 debian/patches/series              |  1 +
 3 files changed, 86 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 836588b..5498d21 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+freeimage (3.15.1-2) unstable; urgency=low
+
+  * QA upload.
+  * debian/patches/document-mode.patch:
+    - Fix FTBFS with LibRaw 0.15 (Closes: #710133).
+
+ -- Luca Falavigna <dktrkranz at debian.org>  Thu, 11 Jul 2013 11:22:37 +0200
+
 freeimage (3.15.1-1) unstable; urgency=low
 
   [ Evan Broder ]
diff --git a/debian/patches/document-mode.patch b/debian/patches/document-mode.patch
new file mode 100644
index 0000000..32bf149
--- /dev/null
+++ b/debian/patches/document-mode.patch
@@ -0,0 +1,77 @@
+Index: freeimage-3.15.1/Source/FreeImage/PluginRAW.cpp
+===================================================================
+--- freeimage-3.15.1.orig/Source/FreeImage/PluginRAW.cpp	2013-07-11 11:25:09.000000000 +0200
++++ freeimage-3.15.1/Source/FreeImage/PluginRAW.cpp	2013-07-11 11:29:33.695264554 +0200
+@@ -44,42 +44,47 @@
+ 	FreeImageIO *_io;
+ 	fi_handle _handle;
+ 	long _eof;
++	INT64 _fsize;
+ 
+ public:
+ 	LibRaw_freeimage_datastream(FreeImageIO *io, fi_handle handle) : _io(io), _handle(handle) {
+ 		long start_pos = io->tell_proc(handle);
+ 		io->seek_proc(handle, 0, SEEK_END);
+ 		_eof = io->tell_proc(handle);
++		_fsize = _eof - start_pos;
+ 		io->seek_proc(handle, start_pos, SEEK_SET);
+ 	}
+ 	~LibRaw_freeimage_datastream() {
+ 	}
+-    virtual int valid() { 
++    int valid() { 
+ 		return (_io && _handle);
+ 	}
+-    virtual int read(void *buffer, size_t size, size_t count) { 
++    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);
+ 	}	
+-    virtual int eof() { 
++    int eof() { 
+         if(substream) return substream->eof();
+         return (_io->tell_proc(_handle) >= _eof);
+     }
+-    virtual int seek(INT64 offset, int origin) { 
++    int seek(INT64 offset, int origin) { 
+         if(substream) return substream->seek(offset, origin);
+ 		return _io->seek_proc(_handle, (long)offset, origin);
+ 	} 
+-    virtual INT64 tell() { 
++    INT64 tell() { 
+ 		if(substream) return substream->tell();
+         return _io->tell_proc(_handle);
+     }
+-    virtual int get_char() { 
++    INT64 size() {
++	return _fsize;
++    }
++    int get_char() { 
+ 		int c = 0;
+ 		if(substream) return substream->get_char();
+ 		if(!_io->read_proc(&c, 1, 1, _handle)) return -1;
+ 		return c;
+    }
+-	virtual char* gets(char *buffer, int length) { 
++	char* gets(char *buffer, int length) { 
+ 		if (substream) return substream->gets(buffer, length);
+ 		memset(buffer, 0, length);
+ 		for(int i = 0; i < length; i++) {
+@@ -90,7 +95,7 @@
+ 		}
+ 		return buffer;
+ 	}
+-	virtual int scanf_one(const char *fmt, void* val) {
++	int scanf_one(const char *fmt, void* val) {
+ 		std::string buffer;
+ 		char element = 0;
+ 		bool bDone = false;
+@@ -115,7 +120,7 @@
+ 
+ 		return sscanf(buffer.c_str(), fmt, val);
+ 	}
+-	virtual void* make_jas_stream() {
++	void* make_jas_stream() {
+ 		/* not implemented */
+ 		return NULL;
+ 	}
diff --git a/debian/patches/series b/debian/patches/series
index c08a501..b939270 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 disable_embedded_libraries.patch
 fix_ftbfs_amd64.patch
 makefile_modifications.patch
+document-mode.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/freeimage.git