Fresco/Berlin/include/Berlin RefCountVar.hh,1.8,1.9 RegionImpl.hh,1.23,1.24
Tobias Hunger <[email protected]> Tue, 18 May 2004 09:16:34 +0000
| Newsgroups | gmane.comp.video.fresco.cvs |
|---|---|
| Message-ID | <[email protected]> |
Update of /cvs/fresco/Fresco/Berlin/include/Berlin
In directory frida:/tmp/cvs-serv7509/Berlin/include/Berlin
Modified Files:
RefCountVar.hh RegionImpl.hh
Log Message:
Patch from Bernhard Fischer (cow):
* use anonymous namespace instead of RCManager_internals
* fix typo
* remove duplicate public declaration
Index: RefCountVar.hh
===================================================================
RCS file: /cvs/fresco/Fresco/Berlin/include/Berlin/RefCountVar.hh,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- RefCountVar.hh 29 Dec 2003 08:42:51 -0000 1.8
+++ RefCountVar.hh 18 May 2004 09:16:31 -0000 1.9
@@ -38,7 +38,7 @@
//. reference is transferred to the smart pointer. Programmatically this
//. is accomplished by not increasing the reference count. This is in
//. contrast to passing another smart pointer, in which case the
- //. reference count will be incremented to the objectrepresenting a
+ //. reference count will be incremented to the object representing a
//. duplicated reference to the object.
//.
//. Whenever the smart pointer loses or removes its reference to an
Index: RegionImpl.hh
===================================================================
RCS file: /cvs/fresco/Fresco/Berlin/include/Berlin/RegionImpl.hh,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- RegionImpl.hh 29 Dec 2003 08:42:51 -0000 1.23
+++ RegionImpl.hh 18 May 2004 09:16:31 -0000 1.24
@@ -66,9 +66,9 @@
virtual void origin(Fresco::Vertex &);
virtual void span(Fresco::Axis, Fresco::Region::Allotment &);
virtual void outline(Fresco::Path_out);
-
+
void clear();
-
+
Fresco::Region_ptr _this ()
{
if (!my_this_valid)
@@ -78,8 +78,7 @@
}
return Fresco::Region::_duplicate (my_this);
}
-
- public:
+
void normalize(Fresco::Vertex &);
void normalize(Fresco::Transform_ptr);
bool valid;
@@ -98,12 +97,12 @@
bool my_this_valid;
Fresco::Region_var my_this;
};
-
+
template <> struct Initializer<RegionImpl>
{
static void initialize(RegionImpl *r) { r->clear();}
};
-
+
inline Fresco::Coord RegionImpl::span_origin(Fresco::Coord lower,
Fresco::Coord upper,
Fresco::Coord align)
@@ -131,7 +130,7 @@
v0.y = Math::min(v0.y, v.y);
v0.z = Math::min(v0.z, v.z);
}
-
+
inline void RegionImpl::merge_max(Fresco::Vertex &v0,
const Fresco::Vertex &v)
{
@@ -139,7 +138,7 @@
v0.y = Math::max(v0.y, v.y);
v0.z = Math::max(v0.z, v.z);
}
-
+
inline void RegionImpl::normalize(Fresco::Vertex &o)
{
o.x = span_origin(lower.x, upper.x, xalign);
@@ -148,7 +147,7 @@
lower -= o;
upper -= o;
}
-
+
inline void RegionImpl::normalize(Fresco::Transform_ptr t)
{
Fresco::Vertex o;