Fresco/Berlin/modules/Drawing/PostScript DrawingKit.cc,1.27,1.28 DrawingKit.hh,1.15,1.16
Stefan Seefeld <[email protected]>
| Newsgroups | gmane.comp.video.fresco.cvs |
|---|---|
| Message-ID | <[email protected]> |
Update of /cvs/fresco/Fresco/Berlin/modules/Drawing/PostScript
In directory purcel:/tmp/cvs-serv31700/Berlin/modules/Drawing/PostScript
Modified Files:
DrawingKit.cc DrawingKit.hh
Log Message:
a somewhat lengthy fix for http://issues.fresco.org/bug92
Index: DrawingKit.cc
===================================================================
RCS file: /cvs/fresco/Fresco/Berlin/modules/Drawing/PostScript/DrawingKit.cc,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- DrawingKit.cc 5 Jan 2003 16:21:30 -0000 1.27
+++ DrawingKit.cc 18 Feb 2003 07:26:26 -0000 1.28
@@ -40,8 +40,10 @@
using namespace Berlin::DrawingKit;
-PostScript::DrawingKit::DrawingKit(const std::string &id, const Fresco::Kit::PropertySeq &p)
- : KitImpl(id, p),
+PostScript::DrawingKit::DrawingKit(const std::string &id,
+ const Fresco::Kit::PropertySeq &p,
+ ServerContextImpl *c)
+ : KitImpl(id, p, c),
_os(new std::filebuf())
{
_os.precision(5);
@@ -54,11 +56,11 @@
{
}
-KitImpl *PostScript::DrawingKit::clone(const Fresco::Kit::PropertySeq &p)
+KitImpl *PostScript::DrawingKit::clone(const Fresco::Kit::PropertySeq &p,
+ ServerContextImpl *c)
{
- DrawingKit *kit = new DrawingKit(repo_id(), p);
+ DrawingKit *kit = new DrawingKit(repo_id(), p, c);
kit->init();
- kit->increment(); // XXX covering up a bug elsewhere.
return kit;
}
@@ -384,5 +386,5 @@
extern "C" KitImpl *load()
{
static std::string properties[] = {"implementation", "PSDrawingKit"};
- return create_kit<PostScript::DrawingKit> ("IDL:fresco.org/Fresco/DrawingKit:1.0", properties, 2);
+ return create_prototype<PostScript::DrawingKit>("IDL:fresco.org/Fresco/DrawingKit:1.0", properties, 2);
}
Index: DrawingKit.hh
===================================================================
RCS file: /cvs/fresco/Fresco/Berlin/modules/Drawing/PostScript/DrawingKit.hh,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- DrawingKit.hh 5 Jan 2003 16:21:30 -0000 1.15
+++ DrawingKit.hh 18 Feb 2003 07:26:27 -0000 1.16
@@ -27,20 +27,25 @@
#include <Fresco/Raster.hh>
#include <Fresco/Unicode.hh>
#include <Berlin/KitImpl.hh>
-#include "Berlin/DrawingKitBase.hh"
+#include <Berlin/DrawingKitBase.hh>
#include <string>
#include <iostream>
-namespace Berlin {
-namespace DrawingKit {
-namespace PostScript {
+namespace Berlin
+{
+namespace DrawingKit
+{
+namespace PostScript
+{
class DrawingKit : public DrawingKitBase, public KitImpl
{
public:
- DrawingKit(const std::string &, const Fresco::Kit::PropertySeq &);
+ DrawingKit(const std::string &,
+ const Fresco::Kit::PropertySeq &,
+ ServerContextImpl *);
virtual ~DrawingKit();
- virtual KitImpl *clone(const Fresco::Kit::PropertySeq &);
+ virtual KitImpl *clone(const Fresco::Kit::PropertySeq &, ServerContextImpl *);
virtual void transformation(Fresco::Transform_ptr t) { DrawingKitBase::transformation(t);}
virtual Fresco::Transform_ptr transformation() { return Fresco::Transform::_duplicate(_tr);}