From 0053b9c0157ad7d29079bbb9f0298ceb737cf14d Mon Sep 17 00:00:00 2001 From: Mailson Menezes Date: Fri, 24 Aug 2012 13:31:01 -0300 Subject: [PATCH] Remove unused property from PixmapObject This property was added before the tiles manager was created. --- core/page.cpp | 9 +-------- core/page_p.h | 1 - 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/core/page.cpp b/core/page.cpp index 2f995353d..d02cd2e0d 100644 --- a/core/page.cpp +++ b/core/page.cpp @@ -236,13 +236,7 @@ bool Page::hasPixmap( int id, int width, int height, const NormalizedRect &rect const QPixmap *pixmap = it.value().m_pixmap; - if ( pixmap->width() != width || pixmap->height() != height ) - return false; - - if ( rect.isNull() ) - return true; - - return (rect == it.value().m_rect); + return (pixmap->width() == width && pixmap->height() == height); } bool Page::hasTextPage() const @@ -522,7 +516,6 @@ void Page::setPixmap( int id, QPixmap *pixmap, const NormalizedRect &rect ) it = d->m_pixmaps.insert( id, PagePrivate::PixmapObject() ); } it.value().m_pixmap = pixmap; - it.value().m_rect = rect; it.value().m_rotation = d->m_rotation; } else { RotationJob *job = new RotationJob( pixmap->toImage(), Rotation0, d->m_rotation, id ); diff --git a/core/page_p.h b/core/page_p.h index 31ca9df18..92fc72df9 100644 --- a/core/page_p.h +++ b/core/page_p.h @@ -107,7 +107,6 @@ class PagePrivate { public: QPixmap *m_pixmap; - NormalizedRect m_rect; Rotation m_rotation; }; QMap< int, PixmapObject > m_pixmaps;