gre-ilya/fltk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Clarify return values and fix a minor issue (#271)

Browse Source 
Fix: Fl_Image_Reader::seek() would not clear the error flag when
reading from memory.
This commit is contained in:
Albrecht Schlosser 2021-09-25 20:19:51 +02:00
parent bc0d18c1bb
commit 4075a14715
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/Fl_Image_Reader.cxx
View File

@ -124,14 +124,15 @@ unsigned int Fl_Image_Reader::read_dword() {
// Move the current read position to a byte offset from the beginning
// of the file or the original start address in memory.
// This clears the error flag if the position is valid.
// This method clears the error flag if the position is valid.
// If reading from memory and (pStart + n) overflows, then the result is undefined.
void Fl_Image_Reader::seek(unsigned int n) {
pError = 0;
if (pIsFile) {
int ret = fseek(pFile, n , SEEK_SET);
if (ret < 0)
pError = 2; // read / position error
else
pError = 0;
return;
} else if (pIsData) {
if (pStart + n <= pEnd)
@ -144,9 +145,12 @@ void Fl_Image_Reader::seek(unsigned int n) {
pError = 3;
}
// Get the current read position as a byte offset from the
// beginning of the file or the original start address in memory
// beginning of the file or the original start address in memory.
// This method does neither affect the error flag nor is it affected
// by the current error status. If reading from a file, this may
// return -1 or any error code from ftell().
long Fl_Image_Reader::tell() const {
if (pIsFile) {
return ftell(pFile);