packages/freeimage
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!19 修复补丁文件substrem.patch

Browse Source 
From: @small_leek
Reviewed-by: @love_hangzhou
Signed-off-by: @love_hangzhou
This commit is contained in:
openeuler-ci-bot 2020-12-17 11:21:48 +08:00 committed by Gitee
commit cf6be3cdfa
2 changed files with 7 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
freeimage.spec
View File

@ -5,7 +5,7 @@
Name: freeimage Name: freeimage
Version: 3.18.0 Version: 3.18.0
Release: 4 Release: 5
Summary: FreeImage is a library project for developers who would like to support popular graphics image formats (PNG, JPEG, TIFF, BMP and others) 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 License: GPLv2 or GPLv3 and FIPL
URL: https://freeimage.sourceforge.io/ URL: https://freeimage.sourceforge.io/
@ -105,6 +105,9 @@ ldconfig -n %{buildroot}%{_libdir}
%changelog %changelog
* Wed Dec 16 2020 Senlin <xiasenlin1@huawei.com> -3.18.0-5
- correct the substream.patch: add an empty line at end of file
* Tue Dec 15 2020 Senlin <xiasenlin1@huawei.com> -3.18.0-4 * Tue Dec 15 2020 Senlin <xiasenlin1@huawei.com> -3.18.0-4
- Rebuild for new LibRaw - Rebuild for new LibRaw

19
substream.patch
View File

@ -4,20 +4,14 @@
} }
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);
+ //if(substream) return substream->read(buffer, size, count);
return _io->read_proc(buffer, (unsigned)size, (unsigned)count, _handle); return _io->read_proc(buffer, (unsigned)size, (unsigned)count, _handle);
} }
int seek(INT64 offset, int origin) { int seek(INT64 offset, int origin) {
- if(substream) return substream->seek(offset, origin);
+ //if(substream) return substream->seek(offset, origin);
return _io->seek_proc(_handle, (long)offset, origin); return _io->seek_proc(_handle, (long)offset, origin);
} }
INT64 tell() { INT64 tell() {
- if(substream) return substream->tell();
+ //if(substream) return substream->tell();
return _io->tell_proc(_handle); return _io->tell_proc(_handle);
} }
@ -25,24 +19,18 @@
int get_char() { int get_char() {
int c = 0; int c = 0;
- if(substream) return substream->get_char();
+ //if(substream) return substream->get_char();
if(!_io->read_proc(&c, 1, 1, _handle)) return -1; if(!_io->read_proc(&c, 1, 1, _handle)) return -1;
return c; return c;
} }
char* gets(char *buffer, int length) { char* gets(char *buffer, int length) {
- if (substream) return substream->gets(buffer, length);
+ //if (substream) return substream->gets(buffer, length);
memset(buffer, 0, length); memset(buffer, 0, length);
for(int i = 0; i < length; i++) { for(int i = 0; i < length; i++) {
if(!_io->read_proc(&buffer[i], 1, 1, _handle)) if(!_io->read_proc(&buffer[i], 1, 1, _handle))
@@ -104,7 +104,7 @@ @@ -104,7 +104,7 @@
std::string buffer; std::string buffer;
char element = 0; char element = 0;
bool bDone = false; bool bDone = false;
- if(substream) return substream->scanf_one(fmt,val);
+ //if(substream) return substream->scanf_one(fmt,val);
do { do {
if(_io->read_proc(&element, 1, 1, _handle) == 1) { if(_io->read_proc(&element, 1, 1, _handle) == 1) {
switch(element) { switch(element) {
@ -50,7 +38,6 @@
} }
int eof() { int eof() {
- if(substream) return substream->eof();
+ //if(substream) return substream->eof();
return (_io->tell_proc(_handle) >= _eof); return (_io->tell_proc(_handle) >= _eof);
} }