summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoseph Heenan <joseph@emobix.co.uk>2015-02-25 15:06:37 +0000
committerJoseph Heenan <joseph@emobix.co.uk>2015-02-25 16:06:04 +0000
commit8460689041a2876dd3cfb741e296d0ccf708e500 (patch)
treec50e334adcb573eb8120ec013b211f1f93d62d8f
parent5ac47f792e06091ae96bc30feb7d708ee5e077b1 (diff)
downloadmupdf-8460689041a2876dd3cfb741e296d0ccf708e500.tar.xz
iOS: Fix some warnings in the 64bit build
-rw-r--r--include/mupdf/fitz/stream.h4
-rw-r--r--platform/ios/Classes/MuDocumentController.m2
-rw-r--r--platform/ios/Classes/MuPageViewNormal.m10
-rw-r--r--platform/ios/Classes/MuPrintPageRenderer.m4
4 files changed, 10 insertions, 10 deletions
diff --git a/include/mupdf/fitz/stream.h b/include/mupdf/fitz/stream.h
index 610192c6..fd9dea18 100644
--- a/include/mupdf/fitz/stream.h
+++ b/include/mupdf/fitz/stream.h
@@ -212,9 +212,9 @@ void fz_read_line(fz_context *ctx, fz_stream *stm, char *buf, int max);
if we have hit EOF. The number of bytes returned here need have
no relation to max (could be larger, could be smaller).
*/
-static inline int fz_available(fz_context *ctx, fz_stream *stm, int max)
+static inline size_t fz_available(fz_context *ctx, fz_stream *stm, int max)
{
- int len = stm->wp - stm->rp;
+ size_t len = stm->wp - stm->rp;
int c = EOF;
if (len)
diff --git a/platform/ios/Classes/MuDocumentController.m b/platform/ios/Classes/MuDocumentController.m
index e4cca91d..287b612f 100644
--- a/platform/ios/Classes/MuDocumentController.m
+++ b/platform/ios/Classes/MuDocumentController.m
@@ -226,7 +226,7 @@ static void saveDoc(char *current_path, fz_document *doc)
{
[[NSUserDefaults standardUserDefaults] setObject: key forKey: @"OpenDocumentKey"];
- current = [[NSUserDefaults standardUserDefaults] integerForKey: key];
+ current = (int)[[NSUserDefaults standardUserDefaults] integerForKey: key];
if (current < 0 || current >= fz_count_pages(ctx, doc))
current = 0;
diff --git a/platform/ios/Classes/MuPageViewNormal.m b/platform/ios/Classes/MuPageViewNormal.m
index 9c48ead8..cb008afa 100644
--- a/platform/ios/Classes/MuPageViewNormal.m
+++ b/platform/ios/Classes/MuPageViewNormal.m
@@ -200,7 +200,7 @@ static void addMarkupAnnot(fz_document *doc, fz_page *page, int type, NSArray *r
int i;
pdf_annot *annot;
- quadpts = fz_malloc_array(ctx, rects.count * 4, sizeof(fz_point));
+ quadpts = fz_malloc_array(ctx, (int)rects.count * 4, sizeof(fz_point));
for (i = 0; i < rects.count; i++)
{
CGRect rect = [[rects objectAtIndex:i] CGRectValue];
@@ -219,7 +219,7 @@ static void addMarkupAnnot(fz_document *doc, fz_page *page, int type, NSArray *r
}
annot = pdf_create_annot(ctx, idoc, (pdf_page *)page, type);
- pdf_set_markup_annot_quadpoints(ctx, idoc, annot, quadpts, rects.count*4);
+ pdf_set_markup_annot_quadpoints(ctx, idoc, annot, quadpts, (int)rects.count*4);
pdf_set_markup_appearance(ctx, idoc, annot, color, alpha, line_thickness, line_height);
}
fz_always(ctx)
@@ -251,7 +251,7 @@ static void addInkAnnot(fz_document *doc, fz_page *page, NSArray *curves)
int i, j, k, n;
pdf_annot *annot;
- n = curves.count;
+ n = (int)curves.count;
counts = fz_malloc_array(ctx, n, sizeof(int));
total = 0;
@@ -259,8 +259,8 @@ static void addInkAnnot(fz_document *doc, fz_page *page, NSArray *curves)
for (i = 0; i < n; i++)
{
NSArray *curve = [curves objectAtIndex:i];
- counts[i] = curve.count;
- total += curve.count;
+ counts[i] = (int)curve.count;
+ total += (int)curve.count;
}
pts = fz_malloc_array(ctx, total, sizeof(fz_point));
diff --git a/platform/ios/Classes/MuPrintPageRenderer.m b/platform/ios/Classes/MuPrintPageRenderer.m
index 19b7e62f..a0ec7cf8 100644
--- a/platform/ios/Classes/MuPrintPageRenderer.m
+++ b/platform/ios/Classes/MuPrintPageRenderer.m
@@ -37,14 +37,14 @@ const int MaxStripPixels = 1024*1024;
return npages;
}
-static fz_page *getPage(fz_document *doc, int pageIndex)
+static fz_page *getPage(fz_document *doc, NSInteger pageIndex)
{
__block fz_page *page = NULL;
dispatch_sync(queue, ^{
fz_try(ctx)
{
- page = fz_load_page(ctx, doc, pageIndex);
+ page = fz_load_page(ctx, doc, (int)pageIndex);
}
fz_catch(ctx)
{