From 9b5a184aa3455bf214dcb4eef2be7113e0cabe5d Mon Sep 17 00:00:00 2001 From: Pino Toscano Date: Sat, 28 Oct 2006 16:08:08 +0000 Subject: [PATCH] delete the old rotation code and make this generator working again svn path=/trunk/playground/graphics/okular/; revision=599791 --- generators/kimgio/generator_kimgio.cpp | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/generators/kimgio/generator_kimgio.cpp b/generators/kimgio/generator_kimgio.cpp index f4cb28aa7..8fa085f66 100644 --- a/generators/kimgio/generator_kimgio.cpp +++ b/generators/kimgio/generator_kimgio.cpp @@ -8,9 +8,7 @@ ***************************************************************************/ #include -#include #include -#include #include #include "core/page.h" @@ -54,13 +52,12 @@ bool KIMGIOGenerator::canGeneratePixmap( bool /* async */ ) const void KIMGIOGenerator::generatePixmap( Okular::PixmapRequest * request ) { // perform a smooth scaled generation - QImage smoothImage = m_pix->toImage().scaled( request->width(), request->height(), Qt::IgnoreAspectRatio, Qt::SmoothTransformation ); - // rotate, if necessary - int rotation = request->page()->rotation(); - QImage finalImage = rotation > 0 - ? KImageEffect::rotate( smoothImage, (KImageEffect::RotateDirection)( rotation - 1 ) ) - : smoothImage; - request->page()->setImage(request->id(), finalImage); + int width = request->width(); + int height = request->height(); + if ( request->page()->rotation() % 2 == 1 ) + qSwap( width, height ); + QImage image = m_pix->toImage().scaled( width, height, Qt::IgnoreAspectRatio, Qt::SmoothTransformation ); + request->page()->setImage( request->id(), image ); // signal that the request has been accomplished signalRequestDone(request);