Many small improvements, bug fixes, and build system fixes for newer systems that have both qt4 and qt5.

This commit is contained in:
Jonathan Thomas
2013-09-08 16:08:56 -05:00
parent 12ca79ce0b
commit a42e257521
11 changed files with 175 additions and 67 deletions

View File

@@ -214,8 +214,14 @@ tr1::shared_ptr<Frame> ChunkReader::GetFrame(int requested_frame) throw(ReaderCl
previous_location = location;
}
// Return the frame (from the current reader)
return local_reader->GetFrame(location.frame);
// Get the frame (from the current reader)
last_frame = local_reader->GetFrame(location.frame);
// Update the frame number property
last_frame->number = requested_frame;
// Return the frame
return last_frame;
}