diff --git a/freeimage.spec b/freeimage.spec index 8b1e225..49a1359 100644 --- a/freeimage.spec +++ b/freeimage.spec @@ -5,7 +5,7 @@ Name: freeimage Version: 3.18.0 -Release: 5 +Release: 6 Summary: FreeImage is a library project for developers who would like to support popular graphics image formats (PNG, JPEG, TIFF, BMP and others) License: GPLv2 or GPLv3 and FIPL URL: https://freeimage.sourceforge.io/ @@ -105,6 +105,9 @@ ldconfig -n %{buildroot}%{_libdir} %changelog +* Tue Feb 09 2021 Jiachen Fan -3.18.0-6 +- correct the substream.patch: correct the line + * Wed Dec 16 2020 Senlin -3.18.0-5 - correct the substream.patch: add an empty line at end of file diff --git a/substream.patch b/substream.patch index 4f55d82..63f044a 100644 --- a/substream.patch +++ b/substream.patch @@ -1,43 +1,50 @@ ---- a/Source/FreeImage/PluginRAW.cpp~ 2020-05-08 08:27:31.000000000 -0500 -+++ a/Source/FreeImage/PluginRAW.cpp 2020-05-08 08:47:09.011816310 -0500 -@@ -63,17 +63,17 @@ - } - - int read(void *buffer, size_t size, size_t count) { - return _io->read_proc(buffer, (unsigned)size, (unsigned)count, _handle); - } - - int seek(INT64 offset, int origin) { - return _io->seek_proc(_handle, (long)offset, origin); - } - - INT64 tell() { - return _io->tell_proc(_handle); - } - -@@ -83,13 +83,13 @@ - - int get_char() { - int c = 0; - if(!_io->read_proc(&c, 1, 1, _handle)) return -1; - return c; - } - - char* gets(char *buffer, int length) { - memset(buffer, 0, length); - for(int i = 0; i < length; i++) { - if(!_io->read_proc(&buffer[i], 1, 1, _handle)) -@@ -104,7 +104,7 @@ - std::string buffer; - char element = 0; - bool bDone = false; - do { - if(_io->read_proc(&element, 1, 1, _handle) == 1) { - switch(element) { -@@ -127,7 +127,7 @@ - } - - int eof() { - return (_io->tell_proc(_handle) >= _eof); - } - +--- a/Source/FreeImage/PluginRAW.cpp~ 2020-05-08 08:27:31.000000000 -0500 ++++ b/Source/FreeImage/PluginRAW.cpp 2020-05-08 08:47:09.011816310 -0500 +@@ -63,17 +63,14 @@ + } + + 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 @@ + + 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 @@ + 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 @@ + } + + int eof() { +- if(substream) return substream->eof(); + return (_io->tell_proc(_handle) >= _eof); + } +