modify Page::size()

xiangxw · Jun 30, 2014 · 9dcc2ec · 9dcc2ec
1 parent ea64ffe
commit 9dcc2ec
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 10 deletions.
diff --git a/include/mupdf-page.h b/include/mupdf-page.h
@@ -5,7 +5,7 @@
 
 class QImage;
 class QString;
-class QRect;
+class QSizeF;
 
 namespace MuPDF
 {
@@ -26,7 +26,7 @@ class Page
     ~Page();
     bool isValid() const;
     QImage renderImage() const;
-    QRect size() const;
+    QSizeF size() const;
     void setTransparentRendering(bool enable);
     void setBackgroundColor(int r, int g, int b, int a = 255);
     void setTransform(float scaleX, float scaleY, float rotation = 0.0f);

diff --git a/src/mupdf-page.cpp b/src/mupdf-page.cpp
@@ -8,7 +8,7 @@ extern "C" {
 #include <mupdf/fitz.h>
 }
 #include <QImage>
-#include <QRect>
+#include <QSizeF>
 
 static void clear_bgr_samples_with_value(
         unsigned char *samples, int size,
@@ -201,16 +201,12 @@ QImage Page::renderImage() const
 /**
  * @brief Page size at 72 dpi
  */
-QRect Page::size() const
+QSizeF Page::size() const
 {
-    //fz_rect rect = fz_bound_page(d->document, d->page);
     fz_rect rect;
+
     fz_bound_page(d->document, d->page, &rect);
-    //fz_bbox bbox = fz_round_rect(rect);
-    fz_irect bbox;
-    fz_round_rect(&bbox, &rect);
-    return QRect(bbox.x0, bbox.y0,
-            bbox.x1 - bbox.x0, bbox.y1 - bbox.y0);
+    return QSizeF(rect.x1 - rect.x0, rect.y1 - rect.y0);
 }
 
 /**