URL:
https://svn.lrde.epita.fr/svn/oln/trunk/milena
ChangeLog:
2007-10-30 Matthieu Garrigues <garrigues(a)lrde.epita.fr>
Add make::image2d.
* mln/core/image2d.hh: Include make/image2d.hh at the end of the file.
* mln/make/image2d.hh: New, Add routine to make a image2d with a 2d
array
* tests/make_image2d.cc: New, tests on make::image2d.
---
mln/core/image2d.hh | 1
mln/make/image2d.hh | 75 ++++++++++++++++++++++++++++++++++++++++++++++++++
tests/make_image2d.cc | 50 +++++++++++++++++++++++++++++++++
3 files changed, 126 insertions(+)
Index: trunk/milena/tests/make_image2d.cc
===================================================================
--- trunk/milena/tests/make_image2d.cc (revision 0)
+++ trunk/milena/tests/make_image2d.cc (revision 1408)
@@ -0,0 +1,50 @@
+// Copyright (C) 2007 EPITA Research and Development Laboratory
+//
+// This file is part of the Olena Library. This library is free
+// software; you can redistribute it and/or modify it under the terms
+// of the GNU General Public License version 2 as published by the
+// Free Software Foundation.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this library; see the file COPYING. If not, write to
+// the Free Software Foundation, 51 Franklin Street, Fifth Floor,
+// Boston, MA 02111-1307, USA.
+//
+// As a special exception, you may use this file as part of a free
+// software library without restriction. Specifically, if other files
+// instantiate templates or use macros or inline functions from this
+// file, or you compile this file and link it with other files to
+// produce an executable, this file does not by itself cause the
+// resulting executable to be covered by the GNU General Public
+// License. This exception does not however invalidate any other
+// reasons why the executable file might be covered by the GNU General
+// Public License.
+
+/*! \file tests/make_image2d.cc
+ *
+ * \brief Tests on mln::make::image2d.
+ */
+
+
+# include <mln/core/image2d.hh>
+# include <mln/debug/println.hh>
+
+int main()
+{
+ using namespace mln;
+
+ int vs[3][3] = { {-1, 0, 1},
+ {-2, 0, 2},
+ {-1, 0, 1} };
+
+ debug::println(make::image2d(vs));
+
+ int vs2[1][1] = { {-1} };
+
+ debug::println(make::image2d(vs2));
+}
Index: trunk/milena/mln/core/image2d.hh
===================================================================
--- trunk/milena/mln/core/image2d.hh (revision 1407)
+++ trunk/milena/mln/core/image2d.hh (revision 1408)
@@ -580,5 +580,6 @@
} // end of namespace mln
+# include <mln/make/image2d.hh>
#endif // ! MLN_CORE_IMAGE2D_B_HH
Index: trunk/milena/mln/make/image2d.hh
===================================================================
--- trunk/milena/mln/make/image2d.hh (revision 0)
+++ trunk/milena/mln/make/image2d.hh (revision 1408)
@@ -0,0 +1,75 @@
+// Copyright (C) 2007 EPITA Research and Development Laboratory
+//
+// This file is part of the Olena Library. This library is free
+// software; you can redistribute it and/or modify it under the terms
+// of the GNU General Public License version 2 as published by the
+// Free Software Foundation.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this library; see the file COPYING. If not, write to
+// the Free Software Foundation, 51 Franklin Street, Fifth Floor,
+// Boston, MA 02111-1307, USA.
+//
+// As a special exception, you may use this file as part of a free
+// software library without restriction. Specifically, if other files
+// instantiate templates or use macros or inline functions from this
+// file, or you compile this file and link it with other files to
+// produce an executable, this file does not by itself cause the
+// resulting executable to be covered by the GNU General Public
+// License. This exception does not however invalidate any other
+// reasons why the executable file might be covered by the GNU General
+// Public License.
+
+#ifndef MLN_MAKE_IMAGE2D_HH
+# define MLN_MAKE_IMAGE2D_HH
+
+/*! \file mln/make/image2d.hh
+ *
+ * \brief Routine to create an mln::image2d in the 2D case.
+ */
+
+# include <mln/core/image2d.hh>
+
+
+namespace mln
+{
+
+ namespace make
+ {
+
+ /*! \brief Create an image2d from an 2d array of values.
+ *
+ * \param[in] 2d array.
+ *
+ * \return A 2D image.
+ */
+ template <typename V, unsigned R, unsigned C>
+ mln::image2d<V> image2d(V (&values)[R][C]);
+
+
+# ifndef MLN_INCLUDE_ONLY
+
+ template <typename V, unsigned R, unsigned C>
+ mln::image2d<V>
+ image2d(V (&values)[R][C])
+ {
+ mln::image2d<V> tmp(R, C);
+ for (unsigned row = 0; row <= R; ++row)
+ for (unsigned col = 0; col <= C; ++col)
+ tmp(make::point2d(row, col)) = values[row][col];
+ return tmp;
+ }
+
+# endif // ! MLN_INCLUDE_ONLY
+
+ } // end of namespace mln::make
+
+} // end of namespace mln
+
+
+#endif // ! MLN_MAKE_IMAGE2D_HH