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

List:       kde-commits
Subject:    [calligra/krita-infinite_canvas2-shrikrishna] /: Merge conflict resolution
From:       Shrikrishna Holla <shrikrishna.holla () gmail ! com>
Date:       2012-10-29 8:57:33
Message-ID: 20121029085733.6F7B1A6078 () git ! kde ! org
[Download RAW message or body]

Git commit 4312e29e4477e47a7a36c74ed8982a33fb350218 by Shrikrishna Holla.
Committed on 29/10/2012 at 09:56.
Pushed by holla into branch 'krita-infinite_canvas2-shrikrishna'.

Merge conflict resolution

M  +37   -14   CMakeLists.txt
M  +1    -0    krita/image/kis_image.cc
M  +0    -6    krita/image/tests/CMakeLists.txt
M  +1    -1    krita/plugins/extensions/imagesize/dlg_canvassize.cc
M  +3    -0    krita/plugins/tools/defaulttools/kis_tool_fill.cc
M  +2    -18   krita/ui/canvas/kis_canvas2.cpp
M  +11   -15   krita/ui/canvas/kis_canvas2.h
M  +2    -2    krita/ui/canvas/kis_coordinates_converter.cpp
M  +5    -22   krita/ui/kis_view2.cpp
M  +9    -5    krita/ui/kis_zoom_manager.cc
M  +98   -22   krita/ui/kra/kis_kra_loader.cpp
M  +3    -3    krita/ui/tests/kis_kra_loader_test.cpp
M  +3    -4    krita/ui/tests/kis_kra_saver_test.cpp

http://commits.kde.org/calligra/4312e29e4477e47a7a36c74ed8982a33fb350218

diff --cc krita/ui/canvas/kis_canvas2.cpp
index 8a78a75,1d93dec..ea3045b
--- a/krita/ui/canvas/kis_canvas2.cpp
+++ b/krita/ui/canvas/kis_canvas2.cpp
@@@ -663,21 -639,6 +657,11 @@@ void KisCanvas2::documentOffsetMoved(co
      updateCanvas();
  }
  
- bool KisCanvas2::usingHDRExposureProgram()
- {
- #ifdef HAVE_OPENGL
-     if (m_d->currentCanvasIsOpenGL) {
-         return m_d->openGLImageTextures->usingHDRExposureProgram();
-     }
- #endif
-     return false;
- }
- 
 +bool KisCanvas2::isCanvasInfinite()
 +{
 +    return image()->isCanvasInfinite();
 +}
 +
  void KisCanvas2::slotConfigChanged()
  {
      KisConfig cfg;
diff --cc krita/ui/canvas/kis_canvas2.h
index 06bf430,e509064..f5b3a53
--- a/krita/ui/canvas/kis_canvas2.h
+++ b/krita/ui/canvas/kis_canvas2.h
@@@ -143,10 -143,7 +143,9 @@@ public: // KisCanvas2 method
      KisImageWSP image();
      KisView2* view();
  
-     bool usingHDRExposureProgram();
      /// @return true if the canvas image should be displayed in vertically mirrored mode
 +    bool isCanvasInfinite();
 +    /// @return true if the image in question has infinite canvas enabled
      void addDecoration(KisCanvasDecoration* deco);
      KisCanvasDecoration* decoration(const QString& id);
  
diff --cc krita/ui/tests/kis_kra_saver_test.cpp
index ae866b5,009d483..57bda3f
--- a/krita/ui/tests/kis_kra_saver_test.cpp
+++ b/krita/ui/tests/kis_kra_saver_test.cpp
@@@ -60,12 -59,12 +60,11 @@@ void KisKraSaverTest::testRoundTrip(
  
      delete doc;
  
- 
-     KisPart2 *p = new KisPart2();
-     KisDoc2 doc2(p);
-     p->setDocument(&doc2);
+     KisPart2 part;
+     KisDoc2 doc2(&part);
+     part.setDocument(&doc2);
  
      doc2.loadNativeFormat("roundtriptest.kra");
 -
      KisCountVisitor cv2(list, KoProperties());
      doc2.image()->rootLayer()->accept(cv2);
      QCOMPARE(cv1.count(), cv2.count());
[prev in list] [next in list] [prev in thread] [next in thread]