[Olena-patches] olena-2.0-35-g9e4ce85 Rename Trimesh reimplementations in apps/mesh-segm-skel/.

* apps/mesh-segm-skel/trimesh/misc.hh: Move... * apps/mesh-segm-skel/misc.hh: ...here. Update comments. * apps/mesh-segm-skel/mesh-complex-max-curv-segm.cc, * apps/mesh-segm-skel/mesh-complex-max-curv.cc: Adjust. * apps/mesh-segm-skel/trimesh/README: Remove. * apps/mesh-segm-skel/Makefile.am (noinst_HEADERS, EXTRA_DIST): Adjust. --- milena/ChangeLog | 14 ++++++++++++++ milena/apps/mesh-segm-skel/Makefile.am | 4 +--- .../mesh-segm-skel/mesh-complex-max-curv-segm.cc | 2 +- .../apps/mesh-segm-skel/mesh-complex-max-curv.cc | 2 +- milena/apps/mesh-segm-skel/{trimesh => }/misc.hh | 3 ++- milena/apps/mesh-segm-skel/trimesh/README | 4 ---- 6 files changed, 19 insertions(+), 10 deletions(-) rename milena/apps/mesh-segm-skel/{trimesh => }/misc.hh (99%) delete mode 100644 milena/apps/mesh-segm-skel/trimesh/README diff --git a/milena/ChangeLog b/milena/ChangeLog index bb0f61c..266f7d4 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,19 @@ 2012-10-05 Roland Levillain &lt;roland(a)lrde.epita.fr&gt; + Rename Trimesh reimplementations in apps/mesh-segm-skel/. + + * apps/mesh-segm-skel/trimesh/misc.hh: Move... + * apps/mesh-segm-skel/misc.hh: ...here. + Update comments. + * apps/mesh-segm-skel/mesh-complex-max-curv-segm.cc, + * apps/mesh-segm-skel/mesh-complex-max-curv.cc: + Adjust. + * apps/mesh-segm-skel/trimesh/README: Remove. + * apps/mesh-segm-skel/Makefile.am (noinst_HEADERS, EXTRA_DIST): + Adjust. + +2012-10-05 Roland Levillain &lt;roland(a)lrde.epita.fr&gt; + Remove anything depending on the Trimesh library. * apps/mesh-segm-skel/io.hh, diff --git a/milena/apps/mesh-segm-skel/Makefile.am b/milena/apps/mesh-segm-skel/Makefile.am index 55ef805..37e6b6a 100644 --- a/milena/apps/mesh-segm-skel/Makefile.am +++ b/milena/apps/mesh-segm-skel/Makefile.am @@ -34,9 +34,7 @@ MOSTLYCLEANFILES = # A Milena re-implementation of some features from Trimesh. This code # is completely independent from the Trimesh library. -# FIXME: Change the name of this directory, as it is confusing. -noinst_HEADERS = trimesh/misc.hh -EXTRA_DIST = trimesh/README +noinst_HEADERS = misc.hh ## Segmentation. ## ------------ diff --git a/milena/apps/mesh-segm-skel/mesh-complex-max-curv-segm.cc b/milena/apps/mesh-segm-skel/mesh-complex-max-curv-segm.cc index 15ea4fb..f766005 100644 --- a/milena/apps/mesh-segm-skel/mesh-complex-max-curv-segm.cc +++ b/milena/apps/mesh-segm-skel/mesh-complex-max-curv-segm.cc @@ -48,7 +48,7 @@ #include <mln/io/off/load.hh> #include <mln/io/off/save.hh> -#include "trimesh/misc.hh" +#include "misc.hh" // Doesn't C++ have a better way to express Pi? diff --git a/milena/apps/mesh-segm-skel/mesh-complex-max-curv.cc b/milena/apps/mesh-segm-skel/mesh-complex-max-curv.cc index 6fe5032..85a0adc 100644 --- a/milena/apps/mesh-segm-skel/mesh-complex-max-curv.cc +++ b/milena/apps/mesh-segm-skel/mesh-complex-max-curv.cc @@ -51,7 +51,7 @@ #include <mln/io/off/load.hh> #include <mln/io/off/save.hh> -#include "trimesh/misc.hh" +#include "misc.hh" // Doesn't C++ have a better way to express Pi? diff --git a/milena/apps/mesh-segm-skel/trimesh/misc.hh b/milena/apps/mesh-segm-skel/misc.hh similarity index 99% rename from milena/apps/mesh-segm-skel/trimesh/misc.hh rename to milena/apps/mesh-segm-skel/misc.hh index 58fef6b..60c009e 100644 --- a/milena/apps/mesh-segm-skel/trimesh/misc.hh +++ b/milena/apps/mesh-segm-skel/misc.hh @@ -24,7 +24,8 @@ // exception does not however invalidate any other reasons why the // executable file might be covered by the GNU General Public License. -// FIXME: Split this file. +// FIXME: Split this file and eventually move its content into the +// library. // FIXME: Address license-related issues? #ifndef MILENA_APPS_MESH_SEGM_SKEL_MISC_HH diff --git a/milena/apps/mesh-segm-skel/trimesh/README b/milena/apps/mesh-segm-skel/trimesh/README deleted file mode 100644 index 20fe1e7..0000000 --- a/milena/apps/mesh-segm-skel/trimesh/README +++ /dev/null @@ -1,4 +0,0 @@ -Files from this directory are adaptation of some Trimesh code into -Milena. We might want to push them into Milena someday. - -Don't forget to add authors / copyright owners where necessary. -- 1.7.2.5