Open document file in fz_open_document().

This relieves all document formats from reimplementing opening a
fz_stream unless the format wants to do something more than just
opening the raw file.

3 files changed, 3 insertions, 57 deletions

diff --git a/source/cbz/mucbz.c b/source/cbz/mucbz.c
index 29527a0c..8e281c64 100644
--- a/source/cbz/mucbz.c
+++ b/source/cbz/mucbz.c
@@ -220,24 +220,6 @@ cbz_open_document_with_stream(fz_context *ctx, fz_stream *file)
 	return doc;
 }
 
-static cbz_document *
-cbz_open_document(fz_context *ctx, const char *filename)
-{
-	fz_stream *file;
-	cbz_document *doc;
-
-	file = fz_open_file(ctx, filename);
-
-	fz_try(ctx)
-		doc = cbz_open_document_with_stream(ctx, file);
-	fz_always(ctx)
-		fz_drop_stream(ctx, file);
-	fz_catch(ctx)
-		fz_rethrow(ctx);
-
-	return doc;
-}
-
 static int
 cbz_recognize(fz_context *ctx, const char *magic)
 {
@@ -260,6 +242,6 @@ cbz_recognize(fz_context *ctx, const char *magic)
 fz_document_handler cbz_document_handler =
 {
 	(fz_document_recognize_fn *)&cbz_recognize,
-	(fz_document_open_fn *)&cbz_open_document,
+	(fz_document_open_fn *)NULL,
 	(fz_document_open_with_stream_fn *)&cbz_open_document_with_stream
 };
diff --git a/source/cbz/muimg.c b/source/cbz/muimg.c
index 5292c365..1f181cab 100644
--- a/source/cbz/muimg.c
+++ b/source/cbz/muimg.c
@@ -131,24 +131,6 @@ img_open_document_with_stream(fz_context *ctx, fz_stream *stm)
 	return doc;
 }
 
-static img_document *
-img_open_document(fz_context *ctx, const char *filename)
-{
-	fz_stream *stm;
-	img_document *doc;
-
-	stm = fz_open_file(ctx, filename);
-
-	fz_try(ctx)
-		doc = img_open_document_with_stream(ctx, stm);
-	fz_always(ctx)
-		fz_drop_stream(ctx, stm);
-	fz_catch(ctx)
-		fz_rethrow(ctx);
-
-	return doc;
-}
-
 static int
 img_recognize(fz_context *doc, const char *magic)
 {
@@ -192,6 +174,6 @@ img_recognize(fz_context *doc, const char *magic)
 fz_document_handler img_document_handler =
 {
 	(fz_document_recognize_fn *)&img_recognize,
-	(fz_document_open_fn *)&img_open_document,
+	(fz_document_open_fn *)NULL,
 	(fz_document_open_with_stream_fn *)&img_open_document_with_stream
 };
diff --git a/source/cbz/mutiff.c b/source/cbz/mutiff.c
index 64da4c5a..7423c3c1 100644
--- a/source/cbz/mutiff.c
+++ b/source/cbz/mutiff.c
@@ -140,24 +140,6 @@ tiff_open_document_with_stream(fz_context *ctx, fz_stream *file)
 	return doc;
 }
 
-static tiff_document *
-tiff_open_document(fz_context *ctx, const char *filename)
-{
-	fz_stream *file;
-	tiff_document *doc;
-
-	file = fz_open_file(ctx, filename);
-
-	fz_try(ctx)
-		doc = tiff_open_document_with_stream(ctx, file);
-	fz_always(ctx)
-		fz_drop_stream(ctx, file);
-	fz_catch(ctx)
-		fz_rethrow(ctx);
-
-	return doc;
-}
-
 static int
 tiff_recognize(fz_context *doc, const char *magic)
 {
@@ -178,6 +160,6 @@ tiff_recognize(fz_context *doc, const char *magic)
 fz_document_handler tiff_document_handler =
 {
 	(fz_document_recognize_fn *)&tiff_recognize,
-	(fz_document_open_fn *)&tiff_open_document,
+	(fz_document_open_fn *)NULL,
 	(fz_document_open_with_stream_fn *)&tiff_open_document_with_stream
 };