--Boundary-00=_/+pN+364rEqfG9n
Content-Type: text/plain;
  charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

Hi,

 The attached patches fix compilation of Krita on SuSE 8.0, using gcc 2.95.3. 
Please commit, or if there are no objections I may also commit. (I known, the 
kis_view patch looks more like a hack...)

Andras
-- 
Quanta Plus developer - http://quanta.sourceforge.net
K Desktop Environment - http://www.kde.org

--Boundary-00=_/+pN+364rEqfG9n
Content-Type: text/x-diff;
  charset="us-ascii";
  name="kis_doc.cc.diff"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment; filename="kis_doc.cc.diff"

--- kis_doc.cc.orig	Tue Jan 28 13:23:53 2003
+++ kis_doc.cc	Tue Jan 28 17:06:41 2003
@@ -540,7 +540,7 @@
 						KisLayerSP layer = loadLayer(child.toElement(), img);
 
 						if (!layer)
-							return false;
+							return 0;
 
 						img -> add(layer, -1);
 					}
@@ -549,7 +549,7 @@
 						KisChannelSP channel = loadChannel(child.toElement(), img);
 
 						if (!channel)
-							return false;
+							return 0;
 
 						img -> add(channel, -1);
 					}

--Boundary-00=_/+pN+364rEqfG9n
Content-Type: text/x-diff;
  charset="us-ascii";
  name="kis_view.cc.diff"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment; filename="kis_view.cc.diff"

--- kis_view.cc.orig	Tue Jan 28 17:13:40 2003
+++ kis_view.cc	Tue Jan 28 17:17:33 2003
@@ -66,11 +66,11 @@
 #include "kis_itemchooser.h"
 #include "kis_factory.h"
 #include "kis_guide.h"
+#include "kis_paint_device.h"	//must be before kis_painter.h 
 #include "kis_painter.h"
 #include "kis_layer.h"
 #include "kis_listbox.h"
 #include "kis_dlg_paint_properties.h"
-#include "kis_paint_device.h"
 #include "kis_resource_mediator.h"
 #include "kis_resourceserver.h"
 #include "kis_ruler.h"
@@ -2329,7 +2329,11 @@
 
 	if (img) {
 		KisSelectionSP selection = img -> selection();
-		KisLayerSP layer = selection ? selection.data() : img -> activeLayer();
+		KisLayerSP layer;
+		if (selection)
+		    layer = selection.data();
+		else
+		    layer = img -> activeLayer();
 
 		if (layer) {
 			KisImageSP dupedImg = new KisImage(m_doc, layer -> width(), layer -> height(), img -> nativeImgType(), m_doc -> nextImageName());

--Boundary-00=_/+pN+364rEqfG9n--

_______________________________________________
koffice-devel mailing list
koffice-devel@mail.kde.org
http://mail.kde.org/mailman/listinfo/koffice-devel