diff options
author | Miklos Vajna <vmiklos@collabora.co.uk> | 2017-02-22 09:49:58 +0100 |
---|---|---|
committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2017-03-14 12:36:27 +0100 |
commit | 16b131ec09ef8b6fa166ec14941858b694060116 (patch) | |
tree | 992eea48d02e595d002a5f4daac86e97ba8652dc /vcl | |
parent | 26a4b6dcc7d04e8c0748cd7408afe8535b6df0e3 (diff) |
vcl: use auto when initializing with a cast in pdfread
Change-Id: Ic785ef3f767cf529dc51e4d49234145fc8d14f97
Reviewed-on: https://gerrit.libreoffice.org/34535
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Jenkins <ci@libreoffice.org>
(cherry picked from commit af8c0696e56395d48f8d8d75a37ced1c58a5be17)
Diffstat (limited to 'vcl')
-rw-r--r-- | vcl/source/filter/ipdf/pdfread.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/vcl/source/filter/ipdf/pdfread.cxx b/vcl/source/filter/ipdf/pdfread.cxx index d7de71ea37dc..12d41afc4da1 100644 --- a/vcl/source/filter/ipdf/pdfread.cxx +++ b/vcl/source/filter/ipdf/pdfread.cxx @@ -62,8 +62,8 @@ bool generatePreview(SvStream& rStream, Graphic& rGraphic) return false; // Returned unit is points, convert that to pixel. - int nPageWidth = pointToPixel(FPDF_GetPageWidth(pPdfPage)); - int nPageHeight = pointToPixel(FPDF_GetPageHeight(pPdfPage)); + size_t nPageWidth = pointToPixel(FPDF_GetPageWidth(pPdfPage)); + size_t nPageHeight = pointToPixel(FPDF_GetPageHeight(pPdfPage)); FPDF_BITMAP pPdfBitmap = FPDFBitmap_Create(nPageWidth, nPageHeight, /*alpha=*/1); if (!pPdfBitmap) return false; @@ -76,17 +76,17 @@ bool generatePreview(SvStream& rStream, Graphic& rGraphic) Bitmap aBitmap(Size(nPageWidth, nPageHeight), 32); { Bitmap::ScopedWriteAccess pWriteAccess(aBitmap); - const char* pPdfBuffer = static_cast<const char*>(FPDFBitmap_GetBuffer(pPdfBitmap)); + auto pPdfBuffer = static_cast<const char*>(FPDFBitmap_GetBuffer(pPdfBitmap)); #ifndef MACOSX std::memcpy(pWriteAccess->GetBuffer(), pPdfBuffer, nPageWidth * nPageHeight * 4); #else // ARGB -> BGRA - for (int nRow = 0; nRow < nPageHeight; ++nRow) + for (size_t nRow = 0; nRow < nPageHeight; ++nRow) { int nStride = FPDFBitmap_GetStride(pPdfBitmap); const char* pPdfLine = pPdfBuffer + (nStride * nRow); Scanline pRow = pWriteAccess->GetBuffer() + (nPageWidth * nRow * 4); - for (int nCol = 0; nCol < nPageWidth; ++nCol) + for (size_t nCol = 0; nCol < nPageWidth; ++nCol) { pRow[nCol * 4] = pPdfLine[(nCol * 4) + 3]; pRow[(nCol * 4) + 1] = pPdfLine[(nCol * 4) + 2]; |