summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Jamfile19
-rw-r--r--apps/macosx/macpdf.c2
2 files changed, 12 insertions, 9 deletions
diff --git a/Jamfile b/Jamfile
index 17ef4a30..882b9056 100644
--- a/Jamfile
+++ b/Jamfile
@@ -326,14 +326,17 @@ if $(HAVE_X11) = yes
LINKLIBS on ghostpdf$(SUFEXE) = $(LINKLIBS) -lX11 -lXext ;
}
-# if $(OS) = MACOSX
-# {
-# SubDir TOP apps macosx ;
-# MACPDF = macpdf.app/Contents/MacOS/macpdf ;
-# Main $(MACPDF) : apps/macpdf.c ;
-# LinkLibraries $(MACPDF) : libmupdf libfitz ;
-# LINKLIBS on $(MACPDF) = $(LINKLIBS) -framework Carbon ;
-# }
+if $(OS) = MACOSX
+{
+ SubDir TOP apps macosx ;
+ MACBUNDLE = macpdf.app ;
+ MACPDF = $(MACBUNDLE)/Contents/MacOS/macpdf ;
+ File $(MACBUNDLE) : $(MACBUNDLE) ;
+ LOCATE on $(MACBUNDLE) = $(LOCATE_SOURCE) ;
+ Main $(MACPDF) : macpdf.c ;
+ LinkLibraries $(MACPDF) : $(FITZLIBS) ;
+ LINKLIBS on $(MACPDF) = $(LINKLIBS) -framework Carbon ;
+}
# --------------------------------------------------------------------------
#
diff --git a/apps/macosx/macpdf.c b/apps/macosx/macpdf.c
index 5e48a4ea..fbd3308e 100644
--- a/apps/macosx/macpdf.c
+++ b/apps/macosx/macpdf.c
@@ -519,7 +519,7 @@ OSStatus view_showpage(HIViewRef view)
Lskipload:
ctm = fz_identity();
- ctm = fz_concat(ctm, fz_translate(0, -ctx->page->mediabox.max.y));
+ ctm = fz_concat(ctm, fz_translate(0, -ctx->page->mediabox.y1));
ctm = fz_concat(ctm, fz_scale(ctx->zoom, -ctx->zoom));
ctm = fz_concat(ctm, fz_rotate(ctx->rotate + ctx->page->rotate));