* mln/upscaling/art/scale2x.hh, * mln/upscaling/art/scale3x.hh: New routines. * tests/Makefile.am, * tests/upscaling/Makefile.am, * tests/upscaling/art/Makefile.am, * tests/upscaling/art/scale2x.cc, * tests/upscaling/art/scale3x.cc: New associated tests. --- milena/ChangeLog | 13 ++ milena/mln/upscaling/art/scale2x.hh | 151 ++++++++++++++++++++++ milena/mln/upscaling/art/scale3x.hh | 218 ++++++++++++++++++++++++++++++++ milena/tests/Makefile.am | 1 + milena/tests/upscaling/Makefile.am | 24 ++++ milena/tests/upscaling/art/Makefile.am | 32 +++++ milena/tests/upscaling/art/scale2x.cc | 59 +++++++++ milena/tests/upscaling/art/scale3x.cc | 61 +++++++++ 8 files changed, 559 insertions(+), 0 deletions(-) create mode 100644 milena/mln/upscaling/art/scale2x.hh create mode 100644 milena/mln/upscaling/art/scale3x.hh create mode 100644 milena/tests/upscaling/Makefile.am create mode 100644 milena/tests/upscaling/art/Makefile.am create mode 100644 milena/tests/upscaling/art/scale2x.cc create mode 100644 milena/tests/upscaling/art/scale3x.cc diff --git a/milena/ChangeLog b/milena/ChangeLog index 3100c37..19c3edd 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,18 @@ 2009-09-22 Guillaume Lazzara <lazzara@lrde.epita.fr> + Add new upscaling algorithms. + + * mln/upscaling/art/scale2x.hh, + * mln/upscaling/art/scale3x.hh: New routines. + + * tests/Makefile.am, + * tests/upscaling/Makefile.am, + * tests/upscaling/art/Makefile.am, + * tests/upscaling/art/scale2x.cc, + * tests/upscaling/art/scale3x.cc: New associated tests. + +2009-09-22 Guillaume Lazzara <lazzara@lrde.epita.fr> + * mln/core/alias/dpoint2d.hh: Add new dpoint2d aliases. 2009-09-22 Fabien Freling <fabien.freling@lrde.epita.fr> diff --git a/milena/mln/upscaling/art/scale2x.hh b/milena/mln/upscaling/art/scale2x.hh new file mode 100644 index 0000000..6805943 --- /dev/null +++ b/milena/mln/upscaling/art/scale2x.hh @@ -0,0 +1,151 @@ +// Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE) +// +// This file is part of Olena. +// +// Olena is free software: you can redistribute it and/or modify it under +// the terms of the GNU General Public License as published by the Free +// Software Foundation, version 2 of the License. +// +// Olena 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 Olena. If not, see <http://www.gnu.org/licenses/>. +// +// As a special exception, you may use this file as part of a free +// software project 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_UPSCALING_ART_SCALE2X_HH +# define MLN_UPSCALING_ART_SCALE2X_HH + +/// \file +/// +/// 2X upscaling algorithm for pixel art images. + + +# include <mln/core/concept/box.hh> +# include <mln/core/concept/image.hh> +# include <mln/core/alias/neighb2d.hh> +# include <mln/core/alias/dpoint2d.hh> + +# include <mln/extension/adjust_duplicate.hh> + + +namespace mln +{ + + namespace upscaling + { + + namespace art + { + + /*! \brief 2X upscaling algorithm for pixel art images. + + \param[in] input An image. + + \return An upscaled image. + + + Source: + http://en.wikipedia.org/wiki/Pixel_art_scaling_algorithms + + */ + template <typename I> + mln_concrete(I) + scale2x(const Image<I>& input); + + +# ifndef MLN_INCLUDE_ONLY + + + template <typename I> + mln_concrete(I) + scale2x(const Image<I>& input_) + { + trace::entering("mln::upscaling::art::scale2x"); + + const I& input = exact(input_); + mln_precondition(input.is_valid()); + mlc_is_a(mln_domain(I), Box)::check(); + + extension::adjust_duplicate(input, 1); + + mln_domain(I) ext_domain(input.domain().pmin() * 2, + input.domain().pmax() * 2 + + mln::down_right); + + mln_concrete(I) output(ext_domain); + + mln_piter(I) p(input.domain()); + for_all(p) + { + + // A --\ 1 2 + // C P B --/ 3 4 + // D + mln_site(I) + pA = p + mln::up, + pB = p + mln::right, + pC = p + mln::left, + pD = p + mln::down, + pOut = p * 2; + + // IF C==A AND C!=D AND A!=B => 1=A + if (input(pC) == input(pA) + && input(pC) != input(pD) + && input(pA) != input(pB)) + output(pOut) = input(pA); + else + output(pOut) = input(p); + + // IF A==B AND A!=C AND B!=D => 2=B + if (input(pA) == input(pB) + && input(pA) != input(pC) + && input(pB) != input(pD)) + output(pOut + mln::right) = input(pB); + else + output(pOut + mln::right) = input(p); + + // IF D==C AND D!=B AND C!=A => 3=C + if (input(pD) == input(pC) + && input(pD) != input(pB) + && input(pC) != input(pA)) + output(pOut + mln::down) = input(pC); + else + output(pOut + mln::down) = input(p); + + // IF B==D AND B!=A AND D!=C => 4=D + if (input(pB) == input(pD) + && input(pB) != input(pA) + && input(pD) != input(pC)) + output(pOut + mln::down_right) = input(pD); + else + output(pOut + mln::down_right) = input(p); + + } + + trace::exiting("mln::upscaling::art::scale2x"); + return output; + } + + +# endif // ! MLN_INCLUDE_ONLY + + + } // end of namespace mln::upscaling::art + + } // end of namespace mln::upscaling + +} // end of namespace mln + + +#endif // ! MLN_UPSCALING_ART_SCALE2X_HH diff --git a/milena/mln/upscaling/art/scale3x.hh b/milena/mln/upscaling/art/scale3x.hh new file mode 100644 index 0000000..042dd28 --- /dev/null +++ b/milena/mln/upscaling/art/scale3x.hh @@ -0,0 +1,218 @@ +// Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE) +// +// This file is part of Olena. +// +// Olena is free software: you can redistribute it and/or modify it under +// the terms of the GNU General Public License as published by the Free +// Software Foundation, version 2 of the License. +// +// Olena 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 Olena. If not, see <http://www.gnu.org/licenses/>. +// +// As a special exception, you may use this file as part of a free +// software project 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_UPSCALING_ART_SCALE3X_HH +# define MLN_UPSCALING_ART_SCALE3X_HH + +/// \file +/// +/// 3X upscaling algorithm for pixel art images. + + +# include <mln/core/concept/box.hh> +# include <mln/core/concept/image.hh> +# include <mln/core/alias/neighb2d.hh> +# include <mln/core/alias/dpoint2d.hh> + +# include <mln/extension/adjust_duplicate.hh> + + +namespace mln +{ + + namespace upscaling + { + + namespace art + { + + /*! \brief 3X upscaling algorithm for pixel art images. + + \param[in] input An image. + + \return An upscaled image. + + + Source: + http://en.wikipedia.org/wiki/Pixel_art_scaling_algorithms + + */ + template <typename I> + mln_concrete(I) + scale3x(const Image<I>& input); + + +# ifndef MLN_INCLUDE_ONLY + + + template <typename I> + mln_concrete(I) + scale3x(const Image<I>& input_) + { + trace::entering("mln::upscaling::art::scale3x"); + + const I& input = exact(input_); + mln_precondition(input.is_valid()); + mlc_is_a(mln_domain(I), Box)::check(); + + extension::adjust_duplicate(input, 1); + + mln_domain(I) ext_domain(input.domain().pmin() * 3, + input.domain().pmax() * 3 + + 2 * mln::down_right); + + mln_concrete(I) output(ext_domain); + + + mln_piter(I) p(input.domain()); + for_all(p) + { + + // A B C --\ 1 2 3 + // D E F > 4 5 6 + // G H I --/ 7 8 9 + mln_site(I) + pA = p + mln::up_left, + pB = p + mln::up, + pC = p + mln::up_right, + pD = p + mln::left, + pE = p, + pF = p + mln::right, + pG = p + mln::down_left, + pH = p + mln::down, + pI = p + mln::down_right, + pOut = p * 3 + mln::down_right; + + // IF D==B AND D!=H AND B!=F => 1=D + if (input(pD) == input(pB) + && input(pD) != input(pH) + && input(pB) != input(pF)) + output(pOut + mln::up_left) = input(pD); + else + output(pOut + mln::up_left) = input(p); + + // IF (D==B AND D!=H AND B!=F AND E!=C) OR (B==F AND B!=D + // AND F!=H AND E!=A) 2=B + if ((input(pD) == input(pB) + && input(pD) != input(pH) + && input(pB) != input(pF) + && input(pE) != input(pC)) + || (input(pB) == input(pF) + && input(pB) != input(pD) + && input(pF) != input(pH) + && input(pE) != input(pA))) + output(pOut + mln::up) = input(pB); + else + output(pOut + mln::up) = input(p); + + // IF B==F AND B!=D AND F!=H => 3=F + if (input(pB) == input(pF) + && input(pB) != input(pD) + && input(pF) != input(pH)) + output(pOut + mln::up_right) = input(pF); + else + output(pOut + mln::up_right) = input(p); + + // IF (H==D AND H!=F AND D!=B AND E!=A) OR (D==B AND D!=H + // AND B!=F AND E!=G) 4=D + if ((input(pH) == input(pD) + && input(pH) != input(pF) + && input(pD) != input(pB) + && input(pE) != input(pA)) + || (input(pD) == input(pB) + && input(pD) != input(pH) + && input(pB) != input(pF) + && input(pE) != input(pG))) + output(pOut + mln::left) = input(pD); + else + output(pOut + mln::left) = input(p); + + // 5=E + output(pOut) = input(p); + + // IF (B==F AND B!=D AND F!=H AND E!=I) OR (F==H AND F!=B + // AND H!=D AND E!=C) 6=F + if ((input(pB) == input(pF) + && input(pB) != input(pD) + && input(pF) != input(pH) + && input(pE) != input(pI)) + || (input(pF) == input(pH) + && input(pF) != input(pB) + && input(pH) != input(pD) + && input(pE) != input(pC))) + output(pOut + mln::right) = input(pF); + else + output(pOut + mln::right) = input(p); + + // IF H==D AND H!=F AND D!=B => 7=D + if (input(pH) == input(pD) + && input(pH) != input(pF) + && input(pD) != input(pB)) + output(pOut + mln::down_left) = input(pD); + else + output(pOut + mln::down_left) = input(p); + + + // IF (F==H AND F!=B AND H!=D AND E!=G) OR (H==D AND H!=F + // AND D!=B AND E!=I) 8=H + if ((input(pF) == input(pH) + && input(pF) != input(pB) + && input(pH) != input(pD) + && input(pE) != input(pG)) + || (input(pH) == input(pD) + && input(pH) != input(pF) + && input(pD) != input(pB) + && input(pE) != input(pI))) + output(pOut + mln::down) = input(pH); + else + output(pOut + mln::down) = input(p); + + + // IF F==H AND F!=B AND H!=D => 9=F + if (input(pF) == input(pH) + && input(pF) != input(pB) + && input(pH) != input(pD)) + output(pOut + mln::down_right) = input(pF); + else + output(pOut + mln::down_right) = input(p); + + } + + trace::exiting("mln::upscaling::art::scale3x"); + return output; + } + + +# endif // ! MLN_INCLUDE_ONLY + + + } // end of namespace mln::upscaling::art + + } // end of namespace mln::upscaling + +} // end of namespace mln + + +#endif // ! MLN_UPSCALING_ART_SCALE3X_HH diff --git a/milena/tests/Makefile.am b/milena/tests/Makefile.am index 39987d0..562078e 100644 --- a/milena/tests/Makefile.am +++ b/milena/tests/Makefile.am @@ -59,6 +59,7 @@ SUBDIRS = \ trait \ transform \ unit_test \ + upscaling \ util \ value \ win \ diff --git a/milena/tests/upscaling/Makefile.am b/milena/tests/upscaling/Makefile.am new file mode 100644 index 0000000..dbe5a89 --- /dev/null +++ b/milena/tests/upscaling/Makefile.am @@ -0,0 +1,24 @@ +# Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE). +# +# This file is part of Olena. +# +# Olena is free software: you can redistribute it and/or modify it under +# the terms of the GNU General Public License as published by the Free +# Software Foundation, version 2 of the License. +# +# Olena 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 Olena. If not, see <http://www.gnu.org/licenses/>. +# + +## Process this file through Automake to create Makefile.in. + +include $(top_srcdir)/milena/tests/tests.mk + +SUBDIRS = \ + art + diff --git a/milena/tests/upscaling/art/Makefile.am b/milena/tests/upscaling/art/Makefile.am new file mode 100644 index 0000000..e001aaa --- /dev/null +++ b/milena/tests/upscaling/art/Makefile.am @@ -0,0 +1,32 @@ +# Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE). +# +# This file is part of Olena. +# +# Olena is free software: you can redistribute it and/or modify it under +# the terms of the GNU General Public License as published by the Free +# Software Foundation, version 2 of the License. +# +# Olena 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 Olena. If not, see <http://www.gnu.org/licenses/>. +# + +## Process this file through Automake to create Makefile.in. + +include $(top_srcdir)/milena/tests/tests.mk + + +check_PROGRAMS = \ + scale2x \ + scale3x + + +scale2x_SOURCES = scale2x.cc +scale3x_SOURCES = scale3x.cc + + +TESTS = $(check_PROGRAMS) diff --git a/milena/tests/upscaling/art/scale2x.cc b/milena/tests/upscaling/art/scale2x.cc new file mode 100644 index 0000000..1db0298 --- /dev/null +++ b/milena/tests/upscaling/art/scale2x.cc @@ -0,0 +1,59 @@ +// Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE) +// +// This file is part of Olena. +// +// Olena is free software: you can redistribute it and/or modify it under +// the terms of the GNU General Public License as published by the Free +// Software Foundation, version 2 of the License. +// +// Olena 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 Olena. If not, see <http://www.gnu.org/licenses/>. +// +// As a special exception, you may use this file as part of a free +// software project 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 +/// +/// \brief Test of the upscaling::art::scale2x routine. + +#include <mln/core/image/image2d.hh> +#include <mln/data/compare.hh> + +#include <mln/upscaling/art/scale2x.hh> + +int main() +{ + using namespace mln; + + bool rvals[4][8] = { + {0, 0, 0, 0, 0, 0, 1, 1}, + {0, 0, 0, 0, 0, 0, 1, 1}, + {1, 1, 1, 0, 0, 0, 1, 1}, + {1, 1, 1, 1, 0, 0, 1, 1}, + }; + + + bool vals[2][4] = { + {0, 0, 0, 1}, + {1, 1, 0, 1} + }; + + image2d<bool> ref = make::image(rvals); + image2d<bool> input = make::image(vals); + + + input = upscaling::art::scale2x(input); + + mln_assertion(input == ref); +} diff --git a/milena/tests/upscaling/art/scale3x.cc b/milena/tests/upscaling/art/scale3x.cc new file mode 100644 index 0000000..dbcde5c --- /dev/null +++ b/milena/tests/upscaling/art/scale3x.cc @@ -0,0 +1,61 @@ +// Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE) +// +// This file is part of Olena. +// +// Olena is free software: you can redistribute it and/or modify it under +// the terms of the GNU General Public License as published by the Free +// Software Foundation, version 2 of the License. +// +// Olena 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 Olena. If not, see <http://www.gnu.org/licenses/>. +// +// As a special exception, you may use this file as part of a free +// software project 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 +/// +/// \brief Test of the upscaling::art::scale3x routine. + +#include <mln/core/image/image2d.hh> +#include <mln/data/compare.hh> + +#include <mln/upscaling/art/scale3x.hh> + +int main() +{ + using namespace mln; + + + bool rvals[6][12] = { + {0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1}, + {0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1}, + {0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1}, + {1, 1, 1, 1, 0, 0, 0, 0, 0, 1, 1, 1}, + {1, 1, 1, 1, 1, 0, 0, 0, 0, 1, 1, 1}, + {1, 1, 1, 1, 1, 1, 0, 0, 0, 1, 1, 1} + }; + + + bool vals[2][4] = { + {0, 0, 0, 1}, + {1, 1, 0, 1} + }; + + image2d<bool> ref = make::image(rvals); + image2d<bool> input = make::image(vals); + + input = upscaling::art::scale3x(input); + + mln_assertion(input == ref); +} -- 1.5.6.5