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

List:       kde-commits
Subject:    koffice/krita/ui/canvas
From:       Dmitry Kazakov <dimula73 () gmail ! com>
Date:       2010-05-22 21:42:05
Message-ID: 20100522214205.171E1AC8BD () svn ! kde ! org
[Download RAW message or body]

SVN commit 1129581 by dkazakov:

Changes for KisCanvas2 suggested on a reviewboard



 M  +4 -0      kis_canvas2.cpp  
 M  +2 -1      kis_canvas2.h  
 A             kis_update_info.cpp   [License: UNKNOWN]


--- trunk/koffice/krita/ui/canvas/kis_canvas2.cpp #1129580:1129581
@@ -291,6 +291,10 @@
         createQPainterCanvas();
 #endif
     } else {
+#ifdef HAVE_OPENGL
+        // Free shared pointer
+        m_d->openGLImageTextures = 0;
+#endif
         createQPainterCanvas();
     }
 }
--- trunk/koffice/krita/ui/canvas/kis_canvas2.h #1129580:1129581
@@ -66,7 +66,6 @@
      *                       window and document coordinates.
      */
     KisCanvas2(KoViewConverter * viewConverter, KisView2 * view, KoShapeControllerBase * sc);
-    KisCanvas2(const KisCanvas2&);
 
     virtual ~KisCanvas2();
 
@@ -207,6 +206,8 @@
     bool handlePopupPaletteIsVisible(KoPointerEvent *);
 
 private:
+    Q_DISABLE_COPY(KisCanvas2);
+
     void createCanvas(bool useOpenGL);
     void createQPainterCanvas();
     void createOpenGLCanvas();
[prev in list] [next in list] [prev in thread] [next in thread]