diff -r 270593ab83b2 -r 949591651fc7 floatimageobj.cpp
--- a/floatimageobj.cpp	Mon May 30 05:39:10 2005 +0000
+++ b/floatimageobj.cpp	Fri Jul 08 07:24:43 2005 +0000
@@ -66,9 +66,22 @@
 
 int FloatImageObj::z ()
 {
+<<<<<<< floatimageobj.cpp
 	return qRound (icon->z());
 }
 
+void FloatImageObj::load (const QPixmap &pixmap)
+{
+  icon->load(pixmap);
+  bbox.setSize (QSize(icon->size().width()+8, icon->size().height()+8));
+  positionBBox();
+  filetype="PNG";
+  filename="noname.png";
+=======
+	return qRound (icon->z());
+>>>>>>> 1.2
+}
+
 bool FloatImageObj::load (const QString &fn)
 {	
 	if( icon->load (fn))