Remove fz_page argument from fz_annot function calls.

3 files changed, 12 insertions, 12 deletions

diff --git a/platform/ios/Classes/MuAnnotation.h b/platform/ios/Classes/MuAnnotation.h
index 32192dc4..a113b93f 100644
--- a/platform/ios/Classes/MuAnnotation.h
+++ b/platform/ios/Classes/MuAnnotation.h
@@ -3,8 +3,8 @@
 #import <Foundation/Foundation.h>
 
 @interface MuAnnotation : NSObject
--(id) initFromAnnot:(fz_annot *)annot forPage:(fz_page *)page;
+-(id) initFromAnnot:(fz_annot *)annot;
 @property(readonly) int type;
 @property(readonly) CGRect rect;
-+(MuAnnotation *) annotFromAnnot:(fz_annot *)annot forPage:(fz_page *)page;
++(MuAnnotation *) annotFromAnnot:(fz_annot *)annot;
 @end
diff --git a/platform/ios/Classes/MuAnnotation.m b/platform/ios/Classes/MuAnnotation.m
index 89cc9d48..f13dedd7 100644
--- a/platform/ios/Classes/MuAnnotation.m
+++ b/platform/ios/Classes/MuAnnotation.m
@@ -8,14 +8,14 @@
 
 @synthesize type, rect;
 
--(id) initFromAnnot:(fz_annot *)annot forPage:(fz_page *)page;
+-(id) initFromAnnot:(fz_annot *)annot;
 {
 	self = [super init];
 	if (self)
 	{
 		fz_rect frect;
 		type = pdf_annot_type(ctx, (pdf_annot *)annot);
-		fz_bound_annot(ctx, page, annot, &frect);
+		fz_bound_annot(ctx, annot, &frect);
 		rect.origin.x = frect.x0;
 		rect.origin.y = frect.y0;
 		rect.size.width = frect.x1 - frect.x0;
@@ -24,8 +24,8 @@
 	return self;
 }
 
-+(MuAnnotation *) annotFromAnnot:(fz_annot *)annot forPage:(fz_page *)page;
++(MuAnnotation *) annotFromAnnot:(fz_annot *)annot;
 {
-	return [[[MuAnnotation alloc] initFromAnnot:annot forPage:page] autorelease];
+	return [[[MuAnnotation alloc] initFromAnnot:annot] autorelease];
 }
 @end
diff --git a/platform/ios/Classes/MuPageViewNormal.m b/platform/ios/Classes/MuPageViewNormal.m
index f82c3413..e84d1767 100644
--- a/platform/ios/Classes/MuPageViewNormal.m
+++ b/platform/ios/Classes/MuPageViewNormal.m
@@ -48,8 +48,8 @@ static NSArray *enumerateAnnotations(fz_document *doc, fz_page *page)
 	fz_annot *annot;
 	NSMutableArray *arr = [NSMutableArray arrayWithCapacity:10];
 
-	for (annot = fz_first_annot(ctx, page); annot; annot = fz_next_annot(ctx, page, annot))
-		[arr addObject:[MuAnnotation annotFromAnnot:annot forPage:page]];
+	for (annot = fz_first_annot(ctx, page); annot; annot = fz_next_annot(ctx, annot))
+		[arr addObject:[MuAnnotation annotFromAnnot:annot]];
 
 	return [arr retain];
 }
@@ -305,7 +305,7 @@ static void deleteAnnotation(fz_document *doc, fz_page *page, int index)
 		int i;
 		fz_annot *annot = fz_first_annot(ctx, page);
 		for (i = 0; i < index && annot; i++)
-			annot = fz_next_annot(ctx, page, annot);
+			annot = fz_next_annot(ctx, annot);
 
 		if (annot)
 			pdf_delete_annot(ctx, idoc, (pdf_page *)page, (pdf_annot *)annot);
@@ -408,8 +408,8 @@ static fz_display_list *create_annot_list(fz_document *doc, fz_page *page)
 			pdf_update_page(ctx, idoc, (pdf_page *)page);
 		list = fz_new_display_list(ctx);
 		dev = fz_new_list_device(ctx, list);
-		for (annot = fz_first_annot(ctx, page); annot; annot = fz_next_annot(ctx, page, annot))
-			fz_run_annot(ctx, page, annot, dev, &fz_identity, NULL);
+		for (annot = fz_first_annot(ctx, page); annot; annot = fz_next_annot(ctx, annot))
+			fz_run_annot(ctx, annot, dev, &fz_identity, NULL);
 	}
 	fz_always(ctx)
 	{
@@ -508,7 +508,7 @@ static rect_list *updatePage(fz_document *doc, fz_page *page)
 			{
 				rect_list *node = fz_malloc_struct(ctx, rect_list);
 
-				fz_bound_annot(ctx, page, annot, &node->rect);
+				fz_bound_annot(ctx, annot, &node->rect);
 				node->next = list;
 				list = node;
 			}