1 files changed, 39 insertions, 40 deletions

diff --git a/src/pdf/qpdfdocument_p.h b/src/pdf/qpdfdocument_p.h
index b6ee2dfd0..cdb76d16f 100644
--- a/src/pdf/qpdfdocument_p.h
+++ b/src/pdf/qpdfdocument_p.h
@@ -1,38 +1,5 @@
-/****************************************************************************
-**
-** Copyright (C) 2020 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
-**
-** This file is part of the QtPDF module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL3$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPLv3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or later as published by the Free
-** Software Foundation and appearing in the file LICENSE.GPL included in
-** the packaging of this file. Please review the following information to
-** ensure the GNU General Public License version 2.0 requirements will be
-** met: http://www.gnu.org/licenses/gpl-2.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
+// Copyright (C) 2020 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
 
 #ifndef QPDFDOCUMENT_P_H
 #define QPDFDOCUMENT_P_H
@@ -49,6 +16,7 @@
 //
 
 #include "qpdfdocument.h"
+#include "qtpdfexports.h"
 
 #include "third_party/pdfium/public/fpdfview.h"
 #include "third_party/pdfium/public/fpdf_dataavail.h"
@@ -68,13 +36,16 @@ public:
     QPdfMutexLocker();
 };
 
-class Q_PDF_PRIVATE_EXPORT QPdfDocumentPrivate: public FPDF_FILEACCESS, public FX_FILEAVAIL, public FX_DOWNLOADHINTS
+class QPdfPageModel;
+
+class Q_PDF_EXPORT QPdfDocumentPrivate: public FPDF_FILEACCESS, public FX_FILEAVAIL, public FX_DOWNLOADHINTS
 {
 public:
     QPdfDocumentPrivate();
     ~QPdfDocumentPrivate();
 
     QPdfDocument *q;
+    QPdfPageModel *pageModel = nullptr;
 
     FPDF_AVAIL avail;
     FPDF_DOCUMENT doc;
@@ -87,7 +58,7 @@ public:
     QByteArray password;
 
     QPdfDocument::Status status;
-    QPdfDocument::DocumentError lastError;
+    QPdfDocument::Error lastError;
     int pageCount;
 
     void clear();
@@ -107,9 +78,37 @@ public:
     static int fpdf_GetBlock(void* param, unsigned long position, unsigned char* pBuf, unsigned long size);
     static void fpdf_AddSegment(struct _FX_DOWNLOADHINTS* pThis, size_t offset, size_t size);
     void updateLastError();
-    QString getText(FPDF_TEXTPAGE textPage, int startIndex, int count);
-    QPointF getCharPosition(FPDF_TEXTPAGE textPage, double pageHeight, int charIndex);
-    QRectF getCharBox(FPDF_TEXTPAGE textPage, double pageHeight, int charIndex);
+    QString getText(FPDF_TEXTPAGE textPage, int startIndex, int count) const;
+    QPointF getCharPosition(FPDF_PAGE pdfPage, FPDF_TEXTPAGE textPage, int charIndex) const;
+    QRectF getCharBox(FPDF_PAGE pdfPage, FPDF_TEXTPAGE textPage, int charIndex) const;
+    QPointF mapPageToView(FPDF_PAGE pdfPage, double x, double y) const;
+    QRectF mapPageToView(FPDF_PAGE pdfPage, double left, double top, double right, double bottom) const;
+    QPointF mapViewToPage(FPDF_PAGE pdfPage, QPointF position) const;
+
+    // FPDF takes the rotation parameter as an int.
+    // This enum is mapping the int values defined in fpdfview.h:956.
+    // (not using enum class to ensure int convertability)
+    enum QFPDFRotation {
+        Normal = 0,
+        ClockWise90 = 1,
+        ClockWise180 = 2,
+        CounterClockWise90 = 3
+    };
+
+    static constexpr QFPDFRotation toFPDFRotation(QPdfDocumentRenderOptions::Rotation rotation)
+    {
+        switch (rotation) {
+        case QPdfDocumentRenderOptions::Rotation::None:
+            return QFPDFRotation::Normal;
+        case QPdfDocumentRenderOptions::Rotation::Clockwise90:
+            return QFPDFRotation::ClockWise90;
+        case QPdfDocumentRenderOptions::Rotation::Clockwise180:
+            return QFPDFRotation::ClockWise180;
+        case QPdfDocumentRenderOptions::Rotation::Clockwise270:
+            return QFPDFRotation::CounterClockWise90;
+        }
+        Q_UNREACHABLE();
+    }
 
     struct TextPosition {
         QPointF position;