diff options
| author | Carl Hetherington <cth@carlh.net> | 2013-11-25 08:36:16 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2013-11-25 08:36:16 +0000 |
| commit | d03382e1ffd8b9094b03044daaca99336740c3c4 (patch) | |
| tree | 84b4ad592e885b743f60704b1bfa0cf094f60053 /src | |
| parent | 24ce9ff6ecb266ba357d948067223891b190b07c (diff) | |
Add FILE * constructor for FrameInfo.
Diffstat (limited to 'src')
| -rw-r--r-- | src/picture_asset_writer.cc | 14 | ||||
| -rw-r--r-- | src/picture_asset_writer.h | 1 |
2 files changed, 15 insertions, 0 deletions
diff --git a/src/picture_asset_writer.cc b/src/picture_asset_writer.cc index 3ce721fd..51d77019 100644 --- a/src/picture_asset_writer.cc +++ b/src/picture_asset_writer.cc @@ -47,6 +47,20 @@ FrameInfo::FrameInfo (istream& s) s >> hash; } +FrameInfo::FrameInfo (FILE* f) +{ + fscanf (f, "%" PRId64, &offset); + fscanf (f, "%" PRId64, &size); + + if (ferror (f)) { + offset = size = 0; + } + + char hash_buffer[128]; + fscanf (f, "%s", hash_buffer); + hash = hash_buffer; +} + void FrameInfo::write (ostream& s) const { diff --git a/src/picture_asset_writer.h b/src/picture_asset_writer.h index 35ba4d8c..68ba086b 100644 --- a/src/picture_asset_writer.h +++ b/src/picture_asset_writer.h @@ -38,6 +38,7 @@ struct FrameInfo {} FrameInfo (std::istream& s); + FrameInfo (FILE *); void write (std::ostream& s) const; void write (FILE *) const; |
