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

List:       kde-commits
Subject:    [digikam/gsoc2013-editorcanvas] utilities/imageeditor/widgets: polish
From:       Gilles Caulier <caulier.gilles () gmail ! com>
Date:       2014-01-26 11:01:47
Message-ID: E1W7NTH-0005KR-2o () scm ! kde ! org
[Download RAW message or body]

Git commit 6ca927928cd54d8e64d5c332e2b5abee0f5edb8e by Gilles Caulier.
Committed on 26/01/2014 at 11:01.
Pushed by cgilles into branch 'gsoc2013-editorcanvas'.

polish

M  +4    -2    utilities/imageeditor/widgets/imageregionitem.cpp
M  +0    -3    utilities/imageeditor/widgets/imageregionitem.h
M  +0    -1    utilities/imageeditor/widgets/imageregionwidget.h

http://commits.kde.org/digikam/6ca927928cd54d8e64d5c332e2b5abee0f5edb8e

diff --git a/utilities/imageeditor/widgets/imageregionitem.cpp \
b/utilities/imageeditor/widgets/imageregionitem.cpp index de06df8..06e2b28 100644
--- a/utilities/imageeditor/widgets/imageregionitem.cpp
+++ b/utilities/imageeditor/widgets/imageregionitem.cpp
@@ -42,6 +42,7 @@
 #include "icctransform.h"
 #include "exposurecontainer.h"
 #include "editortool.h"
+#include "imageiface.h"
 
 namespace Digikam
 {
@@ -106,14 +107,15 @@ void ImageRegionItem::paint(QPainter* painter, const \
QStyleOptionGraphicsItem* o  {
     Q_D(GraphicsDImgItem);
 
-    d_ptr->drawRect     = \
option->exposedRect.intersected(boundingRect()).toAlignedRect(); +    d_ptr->drawRect \
= option->exposedRect.intersected(boundingRect()).toAlignedRect();  QRect   \
pixSourceRect;  QPixmap pix;
     QSize   completeSize = boundingRect().size().toSize();
 
     // scale "as if" scaling to whole image, but clip output to our exposed region
     DImg scaledImage     = d->image.smoothScaleClipped(completeSize.width(), \
                completeSize.height(),
-                                                       d_ptr->drawRect.x(), \
d_ptr->drawRect.y(), d_ptr->drawRect.width(), d_ptr->drawRect.height()); +            \
d_ptr->drawRect.x(), d_ptr->drawRect.y(),  +                                          \
d_ptr->drawRect.width(), d_ptr->drawRect.height());  
     if (d->cachedPixmaps.find(d_ptr->drawRect, &pix, &pixSourceRect))
     {
diff --git a/utilities/imageeditor/widgets/imageregionitem.h \
b/utilities/imageeditor/widgets/imageregionitem.h index 2b848fb..dcc30f4 100644
--- a/utilities/imageeditor/widgets/imageregionitem.h
+++ b/utilities/imageeditor/widgets/imageregionitem.h
@@ -33,15 +33,12 @@
 #include "graphicsdimgitem.h"
 #include "digikam_export.h"
 #include "dimg.h"
-#include "imagepreviewitem.h"
-#include "imageiface.h"
 #include "imageregionwidget.h"
 
 namespace Digikam
 {
 
 class DImg;
-class ImageIface;
 
 class DIGIKAM_EXPORT ImageRegionItem : public GraphicsDImgItem
 {
diff --git a/utilities/imageeditor/widgets/imageregionwidget.h \
b/utilities/imageeditor/widgets/imageregionwidget.h index f45553a..ea9319d 100644
--- a/utilities/imageeditor/widgets/imageregionwidget.h
+++ b/utilities/imageeditor/widgets/imageregionwidget.h
@@ -46,7 +46,6 @@
 namespace Digikam
 {
 
-class ImageZoomSettings;
 class GraphicsDImgViewPrivate;
 
 class DIGIKAM_EXPORT ImageRegionWidget : public GraphicsDImgView


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