From d03382e1ffd8b9094b03044daaca99336740c3c4 Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Mon, 25 Nov 2013 08:36:16 +0000
Subject: Add FILE * constructor for FrameInfo.

---
 src/picture_asset_writer.cc | 14 ++++++++++++++
 src/picture_asset_writer.h  |  1 +
 2 files changed, 15 insertions(+)

(limited to 'src')

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;
-- 
cgit v1.2.3