Olena-patches

olena-patches@lrde.epita.fr

9625 discussions

branch exp/TL updated: olena-2.0-510-g67a45da

by git＠lrde.epita.fr

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Olena, a generic and efficient image processing platform". The branch exp/TL has been updated via 67a45dad80adf097fd6b02e78b0f96e1009dce38 (commit) via a4f4e391858589f054ef08009bf0cf1f42a61bf0 (commit) from 31f6b360a0a9fb84b6eb1957941d78e68f67e508 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- 67a45da mln/core/image/image2d_ffmpeg.hh: Fix compilation issues. a4f4e39 mln/core/image/image2d_ffmpeg.hh: Enable fastest access. ----------------------------------------------------------------------- Summary of changes: milena/ChangeLog | 8 + milena/mln/core/image/image2d_ffmpeg.hh | 317 +++++++++++++++---------------- 2 files changed, 161 insertions(+), 164 deletions(-) hooks/post-receive -- Olena, a generic and efficient image processing platform

11 years, 8 months

branch exp/image2d-ffmpeg updated: olena-2.0-507-gfc57252

by git＠lrde.epita.fr

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Olena, a generic and efficient image processing platform". The branch exp/image2d-ffmpeg has been updated via fc5725233277b23ea1f1d5f9bfcf7aad4e286784 (commit) via 15df2972abb572db54e3ca12773dfe323433a245 (commit) from dde4cb2c284feeb3c489de6dcd939efd716fc5b9 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- fc57252 mln/core/image/image2d_ffmpeg.hh: Fix compilation issues. 15df297 mln/core/image/image2d_ffmpeg.hh: Enable fastest access. ----------------------------------------------------------------------- Summary of changes: milena/ChangeLog | 8 + milena/mln/core/image/image2d_ffmpeg.hh | 317 +++++++++++++++---------------- 2 files changed, 161 insertions(+), 164 deletions(-) hooks/post-receive -- Olena, a generic and efficient image processing platform

11 years, 8 months

olena-2.0-507-gfc57252 mln/core/image/image2d_ffmpeg.hh: Fix compilation issues.

by Guillaume Lazzara

--- milena/ChangeLog | 4 + milena/mln/core/image/image2d_ffmpeg.hh | 251 ++++++++++++++++--------------- 2 files changed, 130 insertions(+), 125 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index c8bdff7..2f20d83 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,7 @@ +2013-04-19 Guillaume Lazzara <z(a)lrde.epita.fr> + + * mln/core/image/image2d_ffmpeg.hh: Fix compilation issues. + 2013-04-18 Guillaume Lazzara <z(a)lrde.epita.fr> * mln/core/image/image2d_ffmpeg.hh: Enable fastest access. diff --git a/milena/mln/core/image/image2d_ffmpeg.hh b/milena/mln/core/image/image2d_ffmpeg.hh index fb33722..2b727bb 100644 --- a/milena/mln/core/image/image2d_ffmpeg.hh +++ b/milena/mln/core/image/image2d_ffmpeg.hh @@ -46,25 +46,25 @@ namespace mln { // Forward declaration. - template <typename T> class image2d_ffmpeg; + template <typename V> class image2d_ffmpeg; namespace internal { /*! - \brief Data structure for \c mln::image2d_ffmpeg<T>. + \brief Data structure for \c mln::image2d_ffmpeg<V>. */ - template <typename T> - struct data< image2d_ffmpeg<T> > + template <typename V> + struct data< image2d_ffmpeg<V> > { data(AVFrame *frame); ~data(); - AVFrame *frame; + AVFrame *frame_; - T* buffer_; - T** array_; + V* buffer_; + V** array_; box2d b_; // theoretical box @@ -77,8 +77,8 @@ namespace mln namespace trait { - template <typename T> - struct image_< image2d_ffmpeg<T> > : default_image_< T, image2d_ffmpeg<T> > + template <typename V> + struct image_< image2d_ffmpeg<V> > : default_image_< V, image2d_ffmpeg<V> > { // misc typedef trait::image::category::primary category; @@ -113,29 +113,29 @@ namespace mln /// Basic 2D image class. /// - /// The parameter \c T is the type of pixel values. This image class + /// The parameter \c V is the type of pixel values. This image class /// stores data in memory and has a virtual border with constant /// thickness around data. /// /// \ingroup modimageconcrete // - template <typename T> - class image2d_ffmpeg : public internal::image_primary< T, mln::box2d, image2d_ffmpeg<T> > + template <typename V> + class image2d_ffmpeg : public internal::image_primary< V, mln::box2d, image2d_ffmpeg<V> > { - typedef internal::image_primary< T, mln::box2d, image2d_ffmpeg<T> > super_; + typedef internal::image_primary< V, mln::box2d, image2d_ffmpeg<V> > super_; public: /// Value associated type. - typedef T value; + typedef V value; /// Return type of read-only access. - typedef const T& rvalue; + typedef const V& rvalue; /// Return type of read-write access. - typedef T& lvalue; + typedef V& lvalue; /// Skeleton. - typedef image2d_ffmpeg< tag::value_<T> > skeleton; + typedef image2d_ffmpeg< tag::value_<V> > skeleton; /// Constructor without argument. @@ -165,19 +165,19 @@ namespace mln const box2d& vbbox() const; /// Read-only access to the image value located at point \p p. - const T& operator()(const point2d& p) const; + const V& operator()(const point2d& p) const; /// Read-write access to the image value located at point \p p. - T& operator()(const point2d& p); + V& operator()(const point2d& p); // Specific methods: // ----------------- /// \cond INTERNAL_API /// Read-only access to the image value located at (\p row, \p col). - const T& at_(mln::def::coord row, mln::def::coord col) const; + const V& at_(mln::def::coord row, mln::def::coord col) const; /// Read-write access to the image value located at (\p row, \p col). - T& at_(mln::def::coord row, mln::def::coord col); + V& at_(mln::def::coord row, mln::def::coord col); /// \endcond @@ -201,10 +201,10 @@ namespace mln unsigned nelements() const; /// Read-only access to the image value located at offset \p i. - const T& element(unsigned i) const; + const V& element(unsigned i) const; /// Read-write access to the image value located at offset \p i. - T& element(unsigned i); + V& element(unsigned i); /// Give the delta-offset corresponding to the delta-point \p dp. int delta_offset(const dpoint2d& dp) const; @@ -213,10 +213,10 @@ namespace mln point2d point_at_offset(unsigned i) const; /// Give a hook to the value buffer. - const T* buffer() const; + const V* buffer() const; /// Give a hook to the value buffer. - T* buffer(); + V* buffer(); }; @@ -226,8 +226,8 @@ namespace mln /// \cond INTERNAL_API - template <typename T, typename J> - void init_(tag::image_t, mln::image2d_ffmpeg<T>& target, const J& model); + template <typename V, typename J> + void init_(tag::image_t, mln::image2d_ffmpeg<V>& target, const J& model); /// \endcond @@ -236,9 +236,9 @@ namespace mln // init_ - template <typename T, typename J> + template <typename V, typename J> inline - void init_(tag::image_t, image2d_ffmpeg<T>& target, const J& model) + void init_(tag::image_t, image2d_ffmpeg<V>& target, const J& model) { box2d b; init_(tag::bbox, b, model); @@ -246,13 +246,13 @@ namespace mln } - // internal::data< image2d_ffmpeg<T> > + // internal::data< image2d_ffmpeg<V> > namespace internal { - template <typename T> + template <typename V> inline - data< image2d_ffmpeg<T> >::data(AVFrame *frame) + data< image2d_ffmpeg<V> >::data(AVFrame *frame) : frame_(frame) { b_ = make::box2d(frame->height, frame->linesize); // frame->width ? @@ -260,9 +260,9 @@ namespace mln unsigned nr = frame->height, nc = frame->width; - array_ = new T*[nr]; - buf_ = frame->data[0]; - T* buf = frame->data[0]; + array_ = new V*[nr]; + buffer_ = static_cast<V*>((void *)frame->data[0]); + V* buf = static_cast<V*>((void *)frame->data[0]); for (unsigned i = 0; i < nr; ++i) { array_[i] = buf; @@ -270,18 +270,18 @@ namespace mln } } - template <typename T> + template <typename V> inline - data< image2d_ffmpeg<T> >::~data() + data< image2d_ffmpeg<V> >::~data() { deallocate_(); // AVFrame must be deleted by the user! } - template <typename T> + template <typename V> inline void - data< image2d_ffmpeg<T> >::deallocate_() + data< image2d_ffmpeg<V> >::deallocate_() { if (array_) { @@ -294,70 +294,70 @@ namespace mln } // end of namespace mln::internal - // image2d_ffmpeg<T> + // image2d_ffmpeg<V> - template <typename T> + template <typename V> inline - image2d_ffmpeg<T>::image2d_ffmpeg() + image2d_ffmpeg<V>::image2d_ffmpeg() { } - template <typename T> + template <typename V> inline - image2d_ffmpeg<T>::image2d_ffmpeg(AVFrame *frame) + image2d_ffmpeg<V>::image2d_ffmpeg(AVFrame *frame) { - this->data_ = new internal::data< image2d_ffmpeg<T> >(frame); + this->data_ = new internal::data< image2d_ffmpeg<V> >(frame); } - template <typename T> + template <typename V> inline const box2d& - image2d_ffmpeg<T>::domain() const + image2d_ffmpeg<V>::domain() const { mln_precondition(this->is_valid()); return this->data_->b_; } - template <typename T> + template <typename V> inline const box2d& - image2d_ffmpeg<T>::bbox() const + image2d_ffmpeg<V>::bbox() const { mln_precondition(this->is_valid()); return this->data_->b_; } - template <typename T> + template <typename V> inline const box2d& - image2d_ffmpeg<T>::vbbox() const + image2d_ffmpeg<V>::vbbox() const { mln_precondition(this->is_valid()); return this->data_->b_; } - template <typename T> + template <typename V> inline bool - image2d_ffmpeg<T>::has(const point2d& p) const + image2d_ffmpeg<V>::has(const point2d& p) const { mln_precondition(this->is_valid()); return this->data_->b_.has(p); } - template <typename T> + template <typename V> inline - const T& - image2d_ffmpeg<T>::operator()(const point2d& p) const + const V& + image2d_ffmpeg<V>::operator()(const point2d& p) const { mln_precondition(this->has(p)); return this->data_->array_[p.row()][p.col()]; } - template <typename T> + template <typename V> inline - T& - image2d_ffmpeg<T>::operator()(const point2d& p) + V& + image2d_ffmpeg<V>::operator()(const point2d& p) { mln_precondition(this->has(p)); return this->data_->array_[p.row()][p.col()]; @@ -366,37 +366,37 @@ namespace mln // Specific methods: - template <typename T> + template <typename V> inline - const T& - image2d_ffmpeg<T>::at_(mln::def::coord row, mln::def::coord col) const + const V& + image2d_ffmpeg<V>::at_(mln::def::coord row, mln::def::coord col) const { mln_precondition(this->has(point2d(row, col))); return this->data_->array_[row][col]; } - template <typename T> + template <typename V> inline - T& - image2d_ffmpeg<T>::at_(mln::def::coord row, mln::def::coord col) + V& + image2d_ffmpeg<V>::at_(mln::def::coord row, mln::def::coord col) { mln_precondition(this->has(point2d(row, col))); return this->data_->array_[row][col]; } - template <typename T> + template <typename V> inline unsigned - image2d_ffmpeg<T>::nrows() const + image2d_ffmpeg<V>::nrows() const { mln_precondition(this->is_valid()); return this->data_->b_.len(0); } - template <typename T> + template <typename V> inline unsigned - image2d_ffmpeg<T>::ncols() const + image2d_ffmpeg<V>::ncols() const { mln_precondition(this->is_valid()); return this->data_->b_.len(1); @@ -405,74 +405,74 @@ namespace mln // As a fastest image: - template <typename T> + template <typename V> inline unsigned - image2d_ffmpeg<T>::border() const + image2d_ffmpeg<V>::border() const { mln_precondition(this->is_valid()); return 0; } - template <typename T> + template <typename V> inline unsigned - image2d_ffmpeg<T>::nelements() const + image2d_ffmpeg<V>::nelements() const { mln_precondition(this->is_valid()); return this->data_->b_.nsites(); } - template <typename T> + template <typename V> inline - const T& - image2d_ffmpeg<T>::element(unsigned i) const + const V& + image2d_ffmpeg<V>::element(unsigned i) const { mln_precondition(i < nelements()); return *(this->data_->buffer_ + i); } - template <typename T> + template <typename V> inline - T& - image2d_ffmpeg<T>::element(unsigned i) + V& + image2d_ffmpeg<V>::element(unsigned i) { mln_precondition(i < nelements()); return *(this->data_->buffer_ + i); } - template <typename T> + template <typename V> inline - const T* - image2d_ffmpeg<T>::buffer() const + const V* + image2d_ffmpeg<V>::buffer() const { mln_precondition(this->is_valid()); return this->data_->buffer_; } - template <typename T> + template <typename V> inline - T* - image2d_ffmpeg<T>::buffer() + V* + image2d_ffmpeg<V>::buffer() { mln_precondition(this->is_valid()); return this->data_->buffer_; } - template <typename T> + template <typename V> inline int - image2d_ffmpeg<T>::delta_offset(const dpoint2d& dp) const + image2d_ffmpeg<V>::delta_offset(const dpoint2d& dp) const { mln_precondition(this->is_valid()); int o = dp[0] * this->data_->frame->linesize + dp[1]; return o; } - template <typename T> + template <typename V> inline point2d - image2d_ffmpeg<T>::point_at_offset(unsigned i) const + image2d_ffmpeg<V>::point_at_offset(unsigned i) const { mln_precondition(i < nelements()); def::coord @@ -484,6 +484,7 @@ namespace mln } + # endif // ! MLN_INCLUDE_ONLY } // end of namespace mln @@ -504,80 +505,80 @@ namespace mln // pixter - template <typename T> - struct fwd_pixter< image2d_ffmpeg<T> > + template <typename V> + struct fwd_pixter< image2d_ffmpeg<V> > { - typedef fwd_pixter2d< image2d_ffmpeg<T> > ret; + typedef fwd_pixter2d< image2d_ffmpeg<V> > ret; }; - template <typename T> - struct fwd_pixter< const image2d_ffmpeg<T> > + template <typename V> + struct fwd_pixter< const image2d_ffmpeg<V> > { - typedef fwd_pixter2d< const image2d_ffmpeg<T> > ret; + typedef fwd_pixter2d< const image2d_ffmpeg<V> > ret; }; - template <typename T> - struct bkd_pixter< image2d_ffmpeg<T> > + template <typename V> + struct bkd_pixter< image2d_ffmpeg<V> > { - typedef bkd_pixter2d< image2d_ffmpeg<T> > ret; + typedef bkd_pixter2d< image2d_ffmpeg<V> > ret; }; - template <typename T> - struct bkd_pixter< const image2d_ffmpeg<T> > + template <typename V> + struct bkd_pixter< const image2d_ffmpeg<V> > { - typedef bkd_pixter2d< const image2d_ffmpeg<T> > ret; + typedef bkd_pixter2d< const image2d_ffmpeg<V> > ret; }; // qixter - template <typename T, typename W> - struct fwd_qixter< image2d_ffmpeg<T>, W > + template <typename V, typename W> + struct fwd_qixter< image2d_ffmpeg<V>, W > { - typedef dpoints_fwd_pixter< image2d_ffmpeg<T> > ret; + typedef dpoints_fwd_pixter< image2d_ffmpeg<V> > ret; }; - template <typename T, typename W> - struct fwd_qixter< const image2d_ffmpeg<T>, W > + template <typename V, typename W> + struct fwd_qixter< const image2d_ffmpeg<V>, W > { - typedef dpoints_fwd_pixter< const image2d_ffmpeg<T> > ret; + typedef dpoints_fwd_pixter< const image2d_ffmpeg<V> > ret; }; - template <typename T, typename W> - struct bkd_qixter< image2d_ffmpeg<T>, W > + template <typename V, typename W> + struct bkd_qixter< image2d_ffmpeg<V>, W > { - typedef dpoints_bkd_pixter< image2d_ffmpeg<T> > ret; + typedef dpoints_bkd_pixter< image2d_ffmpeg<V> > ret; }; - template <typename T, typename W> - struct bkd_qixter< const image2d_ffmpeg<T>, W > + template <typename V, typename W> + struct bkd_qixter< const image2d_ffmpeg<V>, W > { - typedef dpoints_bkd_pixter< const image2d_ffmpeg<T> > ret; + typedef dpoints_bkd_pixter< const image2d_ffmpeg<V> > ret; }; // nixter - template <typename T, typename N> - struct fwd_nixter< image2d_ffmpeg<T>, N > + template <typename V, typename N> + struct fwd_nixter< image2d_ffmpeg<V>, N > { - typedef dpoints_fwd_pixter< image2d_ffmpeg<T> > ret; + typedef dpoints_fwd_pixter< image2d_ffmpeg<V> > ret; }; - template <typename T, typename N> - struct fwd_nixter< const image2d_ffmpeg<T>, N > + template <typename V, typename N> + struct fwd_nixter< const image2d_ffmpeg<V>, N > { - typedef dpoints_fwd_pixter< const image2d_ffmpeg<T> > ret; + typedef dpoints_fwd_pixter< const image2d_ffmpeg<V> > ret; }; - template <typename T, typename N> - struct bkd_nixter< image2d_ffmpeg<T>, N > + template <typename V, typename N> + struct bkd_nixter< image2d_ffmpeg<V>, N > { - typedef dpoints_bkd_pixter< image2d_ffmpeg<T> > ret; + typedef dpoints_bkd_pixter< image2d_ffmpeg<V> > ret; }; - template <typename T, typename N> - struct bkd_nixter< const image2d_ffmpeg<T>, N > + template <typename V, typename N> + struct bkd_nixter< const image2d_ffmpeg<V>, N > { - typedef dpoints_bkd_pixter< const image2d_ffmpeg<T> > ret; + typedef dpoints_bkd_pixter< const image2d_ffmpeg<V> > ret; }; } // end of namespace mln::trait -- 1.7.2.5

11 years, 8 months

olena-2.0-510-g67a45da mln/core/image/image2d_ffmpeg.hh: Fix compilation issues.

by Guillaume Lazzara

11 years, 8 months

branch exp/TL updated: olena-2.0-508-g31f6b36

by git＠lrde.epita.fr

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Olena, a generic and efficient image processing platform". The branch exp/TL has been updated via 31f6b360a0a9fb84b6eb1957941d78e68f67e508 (commit) via c532ff7b18ba0d349f1264b494343cf5ac8b1458 (commit) via dc1f54f779ecc6955603ee0f8a4570d62e82370d (commit) from dde4cb2c284feeb3c489de6dcd939efd716fc5b9 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- 31f6b36 Merge branch 'exp/stretch_inplace' into exp/TL c532ff7 mln/data/stretch_inplace.hh: Fix variable name. ----------------------------------------------------------------------- Summary of changes: milena/mln/data/stretch_inplace.hh | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) hooks/post-receive -- Olena, a generic and efficient image processing platform

11 years, 8 months

olena-2.0-508-g31f6b36 Merge branch 'exp/stretch_inplace' into exp/TL

by Jonathan Fabrizio

This is a merge commit message of the following branches: Merge: c532ff7 dc1f54f hooks/post-receive -- Olena, a generic and efficient image processing platform

11 years, 8 months

branch exp/stretch_inplace updated: olena-2.0-502-gdc1f54f

by git＠lrde.epita.fr

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Olena, a generic and efficient image processing platform". The branch exp/stretch_inplace has been updated via dc1f54f779ecc6955603ee0f8a4570d62e82370d (commit) from afa987bad716e6ff5afcb1e1a23a04af6d269cdc (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- dc1f54f mln/data/stretch_inplace.hh: Fix variable name. ----------------------------------------------------------------------- Summary of changes: milena/mln/data/stretch_inplace.hh | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) hooks/post-receive -- Olena, a generic and efficient image processing platform

11 years, 8 months

olena: olena-2.0-565-g099072a mln/data/stretch_inplace.hh: Fix variable name.

by Jonathan Fabrizio

--- milena/mln/data/stretch_inplace.hh | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/milena/mln/data/stretch_inplace.hh b/milena/mln/data/stretch_inplace.hh index 618f43d..a4579f1 100644 --- a/milena/mln/data/stretch_inplace.hh +++ b/milena/mln/data/stretch_inplace.hh @@ -105,7 +105,7 @@ namespace mln a = (M - m) / (max - min), b = (m * max - M * min) / (max - min); fun::v2v::linear_sat<V, double, V> f(a, b); - data::transform_inplace(input, f); + data::transform_inplace(ima, f); stretched = true; } else -- 1.7.2.5

11 years, 8 months

olena-2.0-502-gdc1f54f mln/data/stretch_inplace.hh: Fix variable name.

by Jonathan Fabrizio

11 years, 8 months

olena-2.0-506-gc532ff7 mln/data/stretch_inplace.hh: Fix variable name.

by Jonathan Fabrizio

11 years, 8 months

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Olena-patches