[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    koffice/krita/ui
From:       Boudewijn Rempt <boud () valdyas ! org>
Date:       2010-11-11 12:03:01
Message-ID: 20101111120301.C4EB1AC89E () svn ! kde ! org
[Download RAW message or body]

SVN commit 1195518 by rempt:

really remove qimagblitz dependency, it wasn't used but still referenced

 M  +0 -29     canvas/kis_image_patch.cpp  
 M  +0 -7      canvas/kis_image_patch.h  
 M  +0 -3      canvas/kis_prescaled_projection.cpp  
 M  +2 -2      canvas/kis_prescaled_projection.h  
 M  +0 -1      kis_config.h  


--- trunk/koffice/krita/ui/canvas/kis_image_patch.cpp #1195517:1195518
@@ -22,7 +22,6 @@
 #include "kis_debug.h"
 
 #include <math.h>
-#include <qimageblitz.h>
 
 /****** Some helper functions *******/
 
@@ -116,31 +115,3 @@
     dbgRender << ppVar(dstRect);
     dbgRender << "## EODM #############################";
 }
-
-#define ceiledSize(sz) QSize(ceil((sz).width()), ceil((sz).height()))
-
-void KisImagePatch::prescaleWithBlitz(QRectF dstRect)
-{
-    qreal scaleX = dstRect.width() / m_interestRect.width();
-    qreal scaleY = dstRect.height() / m_interestRect.height();
-
-    QSize newImageSize = QSize(ceil(m_image.width() * scaleX),
-                               ceil(m_image.height() * scaleY));
-
-    // Calculating new _aligned_ scale
-    scaleX = qreal(newImageSize.width()) / m_image.width();
-    scaleY = qreal(newImageSize.height()) / m_image.height();
-
-    m_scaleX *= scaleX;
-    m_scaleY *= scaleY;
-    scaleRect(m_interestRect, scaleX, scaleY);
-
-    m_image = Blitz::smoothScale(m_image,
-                                 newImageSize,
-                                 Qt::IgnoreAspectRatio);
-
-    dbgRender << "## PATCH.PRESCALEBLITZ ############";
-    dbgRender << ppVar(scaleX) << ppVar(scaleY);
-    dbgRender << ppVar(newImageSize);
-    dbgRender << "## EOB ############################";
-}
--- trunk/koffice/krita/ui/canvas/kis_image_patch.h #1195517:1195518
@@ -67,13 +67,6 @@
                 QPainter::RenderHints renderHints);
 
     /**
-     * Prescales an interestRect a bit with Blitz
-     * It's usefulness is dispulable and should be
-     * tested, so - FIXME
-     */
-    void prescaleWithBlitz(QRectF dstRect);
-
-    /**
      * Checks whether the patch can be used for drawing the image
      */
     bool isValid();
--- trunk/koffice/krita/ui/canvas/kis_prescaled_projection.cpp #1195517:1195518
@@ -388,7 +388,6 @@
 {
     QPainter gc(&m_d->prescaledQImage);
     gc.setCompositionMode(QPainter::CompositionMode_Source);
-//    gc.fillRect(viewRectFromImagePixels(info->dirtyImageRect).toAlignedRect(), \
QColor(255, 0, 0, 255));  drawUsingBackend(gc, info);
 }
 
@@ -400,8 +399,6 @@
         m_d->projectionBackend->drawFromOriginalImage(gc, info);
     } else /* if info->transfer == KisPPUpdateInformation::PATCH */ {
         KisImagePatch patch = m_d->projectionBackend->getNearestPatch(info);
-
-        //patch.prescaleWithBlitz(viewportRect);
         patch.drawMe(gc, info->viewportRect, info->renderHints);
     }
 }
--- trunk/koffice/krita/ui/canvas/kis_prescaled_projection.h #1195517:1195518
@@ -55,8 +55,8 @@
  *
  * <ul>
  *   <li>Qt's smooth scaling
- *   <li>Our own smooth scaling (similar to Blitz, port to using Blitz)
- *   <li>Our own sampling (similar to Blitz, port to using Blitz)
+ *   <li>Our own smooth scaling 
+ *   <li>Our own sampling 
  *   <li>nearest-neighbour sampling on KisImage directly (doesn't need
  *       a QImage of the visible area)
  * </ul>
--- trunk/koffice/krita/ui/kis_config.h #1195517:1195518
@@ -197,7 +197,6 @@
     bool useNearestNeighbour();
     void setUseNearestNeighbour(bool useNearestNeigbour);
 
-    // Use Blitz sampling on a QImage
     bool useSampling();
     void setSampling(bool sampling);
 


[prev in list] [next in list] [prev in thread] [next in thread]