fixed seek/tell bug in openbuffer files

6 files changed, 11 insertions, 9 deletions

diff --git a/Jamfile b/Jamfile
index c2243b94..5ee8a604 100644
--- a/Jamfile
+++ b/Jamfile
@@ -134,28 +134,30 @@ Library libstream :
 	obj_print.c
 	obj_simple.c
 
+	stm_buffer.c
+	stm_filec.c
+	stm_filer.c
+	stm_filew.c
+
+	filt_process.c
+	filt_pipeline.c
+
 	filt_a85d.c
 	filt_a85e.c
 	filt_ahxd.c
 	filt_ahxe.c
 	filt_arc4.c
-	filt_buffer.c
 	filt_dctd.c
 	filt_dcte.c
 	filt_faxd.c
 	filt_faxdtab.c
 	filt_faxe.c
 	filt_faxetab.c
-	filt_filec.c
-	filt_filer.c
-	filt_filew.c
 	filt_flate.c
 	filt_lzwd.c
 	filt_lzwe.c
 	filt_null.c
-	filt_pipeline.c
 	filt_predict.c
-	filt_process.c
 	filt_rld.c
 	filt_rle.c
 
diff --git a/apps/unix/x11pdf.c b/apps/unix/x11pdf.c
index f12d27f1..eecb70dd 100644
--- a/apps/unix/x11pdf.c
+++ b/apps/unix/x11pdf.c
@@ -408,7 +408,7 @@ int main(int argc, char **argv)
 	double zoom = 1.0;
 	int pageno = 1;
 
-	while ((c = getopt(argc, argv, "dzp:")) != -1)
+	while ((c = getopt(argc, argv, "d:z:p:")) != -1)
 	{
 		switch (c)
 		{
diff --git a/stream/filt_buffer.c b/stream/stm_buffer.c
index 206137a6..206137a6 100644
--- a/stream/filt_buffer.c
+++ b/stream/stm_buffer.c
diff --git a/stream/filt_filec.c b/stream/stm_filec.c
index 05813185..93f9ce5a 100644
--- a/stream/filt_filec.c
+++ b/stream/stm_filec.c
@@ -287,14 +287,14 @@ fz_seek(fz_file *f, int ofs, int whence)
 		if (whence == 0)
 		{
 			if (f->mode == FZ_READ)
-				f->out->rp = CLAMP(f->out->bp + ofs, f->out->bp, f->in->ep);
+				f->out->rp = CLAMP(f->out->bp + ofs, f->out->bp, f->out->ep);
 			else
 				f->in->wp = CLAMP(f->in->bp + ofs, f->in->bp, f->in->ep);
 		}
 		else
 		{
 			if (f->mode == FZ_READ)
-				f->out->rp = CLAMP(f->out->ep + ofs, f->out->bp, f->in->ep);
+				f->out->rp = CLAMP(f->out->ep + ofs, f->out->bp, f->out->ep);
 			else
 				f->in->wp = CLAMP(f->in->ep + ofs, f->in->bp, f->in->ep);
 		}
diff --git a/stream/filt_filer.c b/stream/stm_filer.c
index a63a7dd2..a63a7dd2 100644
--- a/stream/filt_filer.c
+++ b/stream/stm_filer.c
diff --git a/stream/filt_filew.c b/stream/stm_filew.c
index f83399a2..f83399a2 100644
--- a/stream/filt_filew.c
+++ b/stream/stm_filew.c