Commit 9f50206f authored by Nicolas Burrus's avatar Nicolas Burrus

Index: tools/swilena/ChangeLog

from  Nicolas Burrus  <burrus_n@lrde.epita.fr>

	* src/swilena_types.i: Ajust namespace of data types.

    prcs2git-id: 8.33
parent 162bd6b1
......@@ -164,7 +164,7 @@
(olena/oln/io/pnm_write_common.hxx 3202 1047049040 b/8_pnm_write_ 1.8.1.2)
(integre/ntg/optraits_builtins_bool.hh 1651 1047049040 i/10_optraits_b 1.3.1.2)
(olena/oln/core/dpoint1d.hxx 2557 1042737226 d/26_dpoint1d.h 1.4)
(tools/swilena/src/swilena_types.i 5187 1046525524 o/3_swilena_ty 1.2)
(tools/swilena/src/swilena_types.i 5184 1051185193 o/3_swilena_ty 1.3)
(tools/swilena/src/swilena_dim.i 2053 1046525524 o/22_swilena_di 1.2)
(olena/tests/arith/Makefile.am 330 1047485594 o/43_Makefile.a 1.4)
(integre/ntg/typetraits_builtins_float.hh 2703 1047049040 g/4_typetraits 1.8.1.2)
......@@ -444,7 +444,7 @@
(olena/oln/io/se_neighborhood.hxx 5317 1047049040 i/47_se_neighbo 1.4)
(olena/oln/core/neighborhood1d.hh 3411 1047072898 c/37_neighborho 1.10)
(olena/tests/transforms/dwt.cc 2593 1047049040 i/38_dwt.cc 1.8.1.3)
(tools/swilena/ChangeLog 1312 1047485594 n/37_ChangeLog 1.6)
(tools/swilena/ChangeLog 1422 1051185193 n/37_ChangeLog 1.7)
(olena/oln/core/dpoint2d.hh 2464 1047072898 d/25_dpoint2d.h 1.6)
(integre/ntg/cycle.hh 4167 1047049040 g/28_cycle.hh 1.11.1.3)
(olena/tests/check/data.hh 180 1044806178 f/6_data.hh 1.4)
......
;; -*- Prcs -*-
(Created-By-Prcs-Version 1 3 3)
(Project-Description "Olena")
(Project-Version oln 8 32)
(Parent-Version oln 8 31)
(Version-Log "Index: ChangeLog
(Project-Version oln 8 33)
(Parent-Version oln 8 32)
(Version-Log "Index: tools/swilena/ChangeLog
from Nicolas Burrus <burrus_n@lrde.epita.fr>
* Makefile.am: Generate UPGRADING.
* NEWS: Update.
Index: doc/ChangeLog
from Nicolas Burrus <burrus_n@lrde.epita.fr>
* dev/oln-dev.texi: Include upgrading.texi.
* Makefile.am: Adjust consequently.
* dev/upgrading.texi: New file.
* dev/thanks.texi, dev/srctree.texi: Update.
* ref/ref-types.tex: Fix typos.
* src/swilena_types.i: Ajust namespace of data types.
")
(New-Version-Log "")
(Checkin-Time "Wed, 09 Apr 2003 22:31:55 +0200")
(Checkin-Time "Thu, 24 Apr 2003 13:53:13 +0200")
(Checkin-Login burrus_n)
;; diff-ignore tests/data/.*pbm$
;; diff-ignore img/.*pbm$
......@@ -111,7 +97,7 @@ from Nicolas Burrus <burrus_n@lrde.epita.fr>
(metalic/ChangeLog (oln/q/30_ChangeLog 1.3.1.15 640))
(olena/ChangeLog (oln/o/30_ChangeLog 1.27.1.36 640))
(tools/ChangeLog (oln/o/32_ChangeLog 1.10.1.7 640))
(tools/swilena/ChangeLog (oln/n/37_ChangeLog 1.6 640))
(tools/swilena/ChangeLog (oln/n/37_ChangeLog 1.7 640))
(attic/oln-ChangeLog (oln/6_ChangeLog 1.50.1.98.1.5 640))
(attic/doc-ChangeLog (oln/e/1_ChangeLog 1.31 640))
......@@ -577,7 +563,7 @@ from Nicolas Burrus <burrus_n@lrde.epita.fr>
(tools/swilena/src/swilena_neighborhood.i (oln/o/8_swilena_ne 1.1 640))
(tools/swilena/src/swilena_point.i (oln/o/11_swilena_po 1.1 640))
(tools/swilena/src/swilena_typedefs.i (oln/o/16_swilena_ty 1.1 640))
(tools/swilena/src/swilena_types.i (oln/o/3_swilena_ty 1.2 640))
(tools/swilena/src/swilena_types.i (oln/o/3_swilena_ty 1.3 640))
(tools/swilena/src/swilena_window.i (oln/o/9_swilena_wi 1.1 640))
(tools/swilena/src/swilena_w_window.i (oln/o/6_swilena_w_ 1.1 640))
(tools/swilena/swilena.prj (oln/n/38_swilena.pr 1.1 640))
......@@ -840,6 +826,6 @@ from Nicolas Burrus <burrus_n@lrde.epita.fr>
(doc/dev/upgrading.texi (oln/r/50_upgrading. 1.1 600))
)
(Merge-Parents
(8.31 complete)
(8.32 complete)
)
(New-Merge-Parents)
2003-04-24 Nicolas Burrus <burrus_n@lrde.epita.fr>
* src/swilena_types.i: Ajust namespace of data types.
2003-03-12 Nicolas Burrus <burrus_n@lrde.epita.fr>
* python/Makefile.am: Remove useless flags.
......
......@@ -25,59 +25,59 @@
Name(Interface);
%extend {
Interface value() const { return (*self); }
void value(Interface x) { *self = oln::Name(x); }
void value(Interface x) { *self = ntg::Name(x); }
Name& operator+=(const Name& other)
{ return (*self) += other; }
Name& operator+=(Interface other)
{ return (*self) += oln:: Name(other); }
{ return (*self) += ntg:: Name(other); }
Name operator+(const Name& other) const
{ return (*self) + other; }
Name operator+(Interface other) const
{ return (*self) + oln:: Name(other); }
{ return (*self) + ntg:: Name(other); }
Name add(const Name& other) const
{ return (*self) + other; }
Name add(Interface other) const
{ return (*self) + oln:: Name(other); }
{ return (*self) + ntg:: Name(other); }
Name& operator-=(const Name& other)
{ return (*self) -= other; }
Name& operator-=(Interface other)
{ return (*self) -= oln:: Name(other); }
{ return (*self) -= ntg:: Name(other); }
Name operator-(const Name& other) const
{ return (*self) - other; }
Name operator-(Interface other) const
{ return (*self) - oln:: Name(other); }
{ return (*self) - ntg:: Name(other); }
Name sub(const Name& other) const
{ return (*self) - other; }
Name sub(Interface other) const
{ return (*self) - oln:: Name(other); }
{ return (*self) - ntg:: Name(other); }
Name& operator*=(const Name& other)
{ return (*self) *= other; }
Name& operator*=(Interface other)
{ return (*self) *= oln:: Name(other); }
{ return (*self) *= ntg:: Name(other); }
Name operator*(const Name& other) const
{ return (*self) * other; }
Name operator*(Interface other) const
{ return (*self) * oln:: Name(other); }
{ return (*self) * ntg:: Name(other); }
Name mul(const Name& other) const
{ return (*self) * other; }
Name mul(Interface other) const
{ return (*self) * oln:: Name(other); }
{ return (*self) * ntg:: Name(other); }
Name& operator/=(const Name& other)
{ return (*self) /= other; }
Name& operator/=(Interface other)
{ return (*self) /= oln:: Name(other); }
{ return (*self) /= ntg:: Name(other); }
Name operator/(const Name& other) const
{ return (*self) / other; }
Name operator/(Interface other) const
{ return (*self) / oln:: Name(other); }
{ return (*self) / ntg:: Name(other); }
Name div(const Name& other) const
{ return (*self) / other; }
Name div(Interface other) const
{ return (*self) / oln:: Name(other); }
{ return (*self) / ntg:: Name(other); }
bool operator<=(const Name& other) const
{ return (*self) <= other; }
......@@ -88,24 +88,24 @@
bool operator>(const Name& other) const
{ return (*self) > other; }
bool operator<=(Interface other) const
{ return (*self) <= oln:: Name(other); }
{ return (*self) <= ntg:: Name(other); }
bool operator>=(Interface other) const
{ return (*self) >= oln:: Name(other); }
{ return (*self) >= ntg:: Name(other); }
bool operator<(Interface other) const
{ return (*self) < oln:: Name(other); }
{ return (*self) < ntg:: Name(other); }
bool operator>(Interface other) const
{ return (*self) > oln:: Name(other); }
{ return (*self) > ntg:: Name(other); }
bool operator==(Interface other) const
{ return (*self) == oln:: Name(other); }
{ return (*self) == ntg:: Name(other); }
bool equals(Interface other) const
{ return (*self) == oln:: Name(other); }
{ return (*self) == ntg:: Name(other); }
};
%enddef
%define MakeValue(Name)
namespace oln
namespace ntg
{
struct Name
{
......@@ -117,7 +117,7 @@
%enddef
%define MakeFloatValue(Name)
namespace oln
namespace ntg
{
struct Name
{
......@@ -129,7 +129,7 @@
%enddef
%define MakeRgbValue(Name)
namespace oln
namespace ntg
{
struct Name
{
......@@ -149,7 +149,7 @@
}
%enddef
namespace oln
namespace ntg
{
struct bin
{
......@@ -193,5 +193,3 @@ namespace oln
};
};
}
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment