diff options
| author | Shawn Rutledge <shawn.rutledge@qt.io> | 2022-05-30 14:57:17 +0200 |
|---|---|---|
| committer | Shawn Rutledge <shawn.rutledge@qt.io> | 2022-05-31 22:40:29 +0200 |
| commit | e13aa3d6d5ad231afb49c428b4f75e3a62f84eff (patch) | |
| tree | d78e50e6ac7ba38cf9dc24572ff95fc4004075be /src/pdf | |
| parent | 16b529138869b24425cf96c6516b3eb1e63c0b85 (diff) | |
| download | qtwebengine-e13aa3d6d5ad231afb49c428b4f75e3a62f84eff.tar.gz | |
Rename QPdfDocument::pageSize() to QPdfDocument::pagePointSize()
It is in fact the size in points (1/72 of an inch), so we might as well
be consistent about the naming between QML and C++ APIs.
Change-Id: I8f8b05eeecc635a4d105558959834ae0e15add81
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
Diffstat (limited to 'src/pdf')
| -rw-r--r-- | src/pdf/plugins/imageformats/pdf/qpdfiohandler.cpp | 6 | ||||
| -rw-r--r-- | src/pdf/qpdfdocument.cpp | 4 | ||||
| -rw-r--r-- | src/pdf/qpdfdocument.h | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/src/pdf/plugins/imageformats/pdf/qpdfiohandler.cpp b/src/pdf/plugins/imageformats/pdf/qpdfiohandler.cpp index c563bad64..1827ede0f 100644 --- a/src/pdf/plugins/imageformats/pdf/qpdfiohandler.cpp +++ b/src/pdf/plugins/imageformats/pdf/qpdfiohandler.cpp @@ -83,7 +83,7 @@ int QPdfIOHandler::currentImageNumber() const QRect QPdfIOHandler::currentImageRect() const { - return QRect(QPoint(0, 0), m_doc->pageSize(m_page).toSize()); + return QRect(QPoint(0, 0), m_doc->pagePointSize(m_page).toSize()); } int QPdfIOHandler::imageCount() const @@ -103,7 +103,7 @@ bool QPdfIOHandler::read(QImage *image) if (m_page < 0) m_page = 0; const bool xform = (m_clipRect.isValid() || m_scaledSize.isValid() || m_scaledClipRect.isValid()); - QSize pageSize = m_doc->pageSize(m_page).toSize(); + QSize pageSize = m_doc->pagePointSize(m_page).toSize(); QSize finalSize = pageSize; QRectF bounds; if (xform && !finalSize.isEmpty()) { @@ -163,7 +163,7 @@ QVariant QPdfIOHandler::option(ImageOption option) const return QImage::Format_ARGB32_Premultiplied; case Size: const_cast<QPdfIOHandler *>(this)->load(device()); - return m_doc->pageSize(qMax(0, m_page)); + return m_doc->pagePointSize(qMax(0, m_page)); case ClipRect: return m_clipRect; case ScaledSize: diff --git a/src/pdf/qpdfdocument.cpp b/src/pdf/qpdfdocument.cpp index 2b1176583..8e3cea2da 100644 --- a/src/pdf/qpdfdocument.cpp +++ b/src/pdf/qpdfdocument.cpp @@ -718,7 +718,7 @@ int QPdfDocument::pageCount() const /*! Returns the size of page \a page in points (1/72 of an inch). */ -QSizeF QPdfDocument::pageSize(int page) const +QSizeF QPdfDocument::pagePointSize(int page) const { QSizeF result; if (!d->doc || !d->checkPageComplete(page)) @@ -801,7 +801,7 @@ QImage QPdfDocument::render(int page, QSize imageSize, QPdfDocumentRenderOptions float y1 = clipRect.bottom(); float x2 = clipRect.right(); float y2 = clipRect.top(); - QSizeF origSize = pageSize(page); + QSizeF origSize = pagePointSize(page); QVector2D pageScale(1, 1); if (!renderOptions.scaledSize().isNull()) { pageScale = QVector2D(renderOptions.scaledSize().width() / float(origSize.width()), diff --git a/src/pdf/qpdfdocument.h b/src/pdf/qpdfdocument.h index 3a16b396d..02d8294ac 100644 --- a/src/pdf/qpdfdocument.h +++ b/src/pdf/qpdfdocument.h @@ -113,7 +113,7 @@ public: int pageCount() const; - QSizeF pageSize(int page) const; + Q_INVOKABLE QSizeF pagePointSize(int page) const; QImage render(int page, QSize imageSize, QPdfDocumentRenderOptions options = QPdfDocumentRenderOptions()); |