- Olena-patches

last-svn-commit-425-g5ba2874 Replace deduced type 'point' by 'site'.
by Guillaume Lazzara 04 Aug '10

04 Aug '10

* mln/geom/max_col.hh, * mln/geom/max_row.hh, * mln/geom/min_col.hh, * mln/geom/min_row.hh: Replace deduced type 'point' by 'site'. --- milena/ChangeLog | 9 +++++++++ milena/mln/geom/max_col.hh | 8 ++++---- milena/mln/geom/max_row.hh | 8 ++++---- milena/mln/geom/min_col.hh | 8 ++++---- milena/mln/geom/min_row.hh | 8 ++++---- 5 files changed, 25 insertions(+), 16 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 877da7c..710cfc9 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,12 @@ +2010-08-04 Guillaume Lazzara <z(a)lrde.epita.fr> + + Replace deduced type 'point' by 'site'. + + * mln/geom/max_col.hh, + * mln/geom/max_row.hh, + * mln/geom/min_col.hh, + * mln/geom/min_row.hh: Replace deduced type 'point' by 'site'. + 2010-07-06 Guillaume Lazzara <z(a)lrde.epita.fr> Small fixes in milena. diff --git a/milena/mln/geom/max_col.hh b/milena/mln/geom/max_col.hh index 36eb213..ba88090 100644 --- a/milena/mln/geom/max_col.hh +++ b/milena/mln/geom/max_col.hh @@ -1,4 +1,4 @@ -// Copyright (C) 2007, 2008, 2009 EPITA Research and Development +// Copyright (C) 2007, 2008, 2009, 2010 EPITA Research and Development // Laboratory (LRDE) // // This file is part of Olena. @@ -47,7 +47,7 @@ namespace mln /// Give the maximum col of an box 2d or 3d. template <typename B> - mln_deduce(B, point, coord) max_col(const Box& b); + mln_deduce(B, site, coord) max_col(const Box& b); # ifndef MLN_INCLUDE_ONLY @@ -64,10 +64,10 @@ namespace mln template <typename B> inline - mln_deduce(B, point, coord) max_col(const Box& b) + mln_deduce(B, site, coord) max_col(const Box& b) { metal::not_<metal::equal<metal::int_<B::dim>, metal::int_<1> > >::check(); - mln_deduce(B, point, coord) maxcol = exact(b).pmax().col(); + mln_deduce(B, site, coord) maxcol = exact(b).pmax().col(); return maxcol; } diff --git a/milena/mln/geom/max_row.hh b/milena/mln/geom/max_row.hh index 6519906..cd79e94 100644 --- a/milena/mln/geom/max_row.hh +++ b/milena/mln/geom/max_row.hh @@ -1,4 +1,4 @@ -// Copyright (C) 2007, 2008, 2009 EPITA Research and Development +// Copyright (C) 2007, 2008, 2009, 2010 EPITA Research and Development // Laboratory (LRDE) // // This file is part of Olena. @@ -48,7 +48,7 @@ namespace mln /// Give the maximum row of an box 2d or 3d. template <typename B> - mln_deduce(B, point, coord) max_row(const Box& b); + mln_deduce(B, site, coord) max_row(const Box& b); # ifndef MLN_INCLUDE_ONLY @@ -65,10 +65,10 @@ namespace mln template <typename B> inline - mln_deduce(B, point, coord) max_row(const Box& b) + mln_deduce(B, site, coord) max_row(const Box& b) { metal::not_<metal::equal<metal::int_<B::dim>, metal::int_<1> > >::check(); - mln_deduce(B, point, coord) maxrow = exact(b).pmax().row(); + mln_deduce(B, site, coord) maxrow = exact(b).pmax().row(); return maxrow; } diff --git a/milena/mln/geom/min_col.hh b/milena/mln/geom/min_col.hh index 373237e..ddf43b4 100644 --- a/milena/mln/geom/min_col.hh +++ b/milena/mln/geom/min_col.hh @@ -1,4 +1,4 @@ -// Copyright (C) 2007, 2008, 2009 EPITA Research and Development +// Copyright (C) 2007, 2008, 2009, 2010 EPITA Research and Development // Laboratory (LRDE) // // This file is part of Olena. @@ -47,7 +47,7 @@ namespace mln /// Give the minimum column of an box 2d or 3d. template <typename B> - mln_deduce(B, point, coord) min_col(const Box& b); + mln_deduce(B, site, coord) min_col(const Box& b); # ifndef MLN_INCLUDE_ONLY @@ -65,10 +65,10 @@ namespace mln template <typename B> inline - mln_deduce(B, point, coord) min_col(const Box& b) + mln_deduce(B, site, coord) min_col(const Box& b) { metal::not_<metal::equal<metal::int_<B::dim>, metal::int_<1> > >::check(); - mln_deduce(B, point, coord) mincol = exact(b).pmin().col(); + mln_deduce(B, site, coord) mincol = exact(b).pmin().col(); return mincol; } diff --git a/milena/mln/geom/min_row.hh b/milena/mln/geom/min_row.hh index ec833c3..5503de2 100644 --- a/milena/mln/geom/min_row.hh +++ b/milena/mln/geom/min_row.hh @@ -1,4 +1,4 @@ -// Copyright (C) 2007, 2008, 2009 EPITA Research and Development +// Copyright (C) 2007, 2008, 2009, 2010 EPITA Research and Development // Laboratory (LRDE) // // This file is part of Olena. @@ -50,7 +50,7 @@ namespace mln /// Give the minimum row of an box 2d or 3d. template <typename B> - mln_deduce(B, point, coord) min_row(const Box& b); + mln_deduce(B, site, coord) min_row(const Box& b); # ifndef MLN_INCLUDE_ONLY @@ -68,10 +68,10 @@ namespace mln template <typename B> inline - mln_deduce(B, point, coord) min_row(const Box& b) + mln_deduce(B, site, coord) min_row(const Box& b) { metal::not_<metal::equal<metal::int_<B::dim>, metal::int_<1> > >::check(); - mln_deduce(B, point, coord) minrow = exact(b).pmin().row(); + mln_deduce(B, site, coord) minrow = exact(b).pmin().row(); return minrow; } -- 1.5.6.5

1 0

last-svn-commit-424-g6270c8c core/component_set.hh: Add a new internal member valid_comps_image_().
by Guillaume Lazzara 04 Aug '10

04 Aug '10

--- scribo/ChangeLog | 5 +++++ scribo/core/component_set.hh | 30 ++++++++++++++++++++++++++++++ 2 files changed, 35 insertions(+), 0 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 8d151f4..8ae04f3 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,10 @@ 2010-08-04 Guillaume Lazzara <z(a)lrde.epita.fr> + * core/component_set.hh: Add a new internal member + valid_comps_image_(). + +2010-08-04 Guillaume Lazzara <z(a)lrde.epita.fr> + * filter/object_groups_with_holes.hh: Fix an invalid mismatch between groups ids and their related component ids and add more comments. diff --git a/scribo/core/component_set.hh b/scribo/core/component_set.hh index ef7ae4e..b8445eb 100644 --- a/scribo/core/component_set.hh +++ b/scribo/core/component_set.hh @@ -43,6 +43,7 @@ # include <mln/accu/shape/bbox.hh> # include <mln/labeling/compute.hh> +# include <mln/labeling/relabel.hh> # include <mln/convert/from_to.hh> @@ -198,6 +199,13 @@ namespace scribo // L& labeled_image_(); + /// Return the underlying labeled image where invalid components + /// have been erased. + /// + /// WARNING: this image is computed on the fly...! + // + mln_concrete(L) valid_comps_image_() const; + /// @} private: @@ -495,6 +503,28 @@ namespace scribo template <typename L> inline + mln_concrete(L) + component_set<L>::valid_comps_image_() const + { + mln::util::array<bool> f(unsigned(this->data_->ncomps_) + 1); + f(0) = true; + + for_all_comps(c, (*this)) + f(c) = (*this)(c).is_valid(); + + mln_value(L) new_ncomps; + mln_concrete(L) + output = mln::labeling::relabel(this->data_->ima_, + this->data_->ncomps_, + new_ncomps, + f); + + return output; + } + + + template <typename L> + inline bool component_set<L>::has_separators() const { -- 1.5.6.5

1 0

last-svn-commit-423-g290ccbe filter/object_groups_with_holes.hh: Fix an invalid mismatch between groups ids and their related component ids and add more comments.
by Guillaume Lazzara 04 Aug '10

04 Aug '10

--- scribo/ChangeLog | 6 ++ scribo/filter/object_groups_with_holes.hh | 87 ++++++++++++++++++---------- 2 files changed, 62 insertions(+), 31 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index bd3f45d..8d151f4 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,3 +1,9 @@ +2010-08-04 Guillaume Lazzara <z(a)lrde.epita.fr> + + * filter/object_groups_with_holes.hh: Fix an invalid mismatch + between groups ids and their related component ids and add more + comments. + 2010-07-06 Guillaume Lazzara <z(a)lrde.epita.fr> Compilation related fixes in Scribo. diff --git a/scribo/filter/object_groups_with_holes.hh b/scribo/filter/object_groups_with_holes.hh index 570ae6a..28cd928 100644 --- a/scribo/filter/object_groups_with_holes.hh +++ b/scribo/filter/object_groups_with_holes.hh @@ -28,7 +28,8 @@ /// \file /// -/// \brief Remove groups not having a minimum number of holes. +/// \brief Remove groups not having at least two background components +/// of a minimum size. # include <sstream> @@ -37,6 +38,9 @@ # include <mln/core/routine/extend.hh> # include <mln/core/image/dmorph/extended.hh> +# include <mln/geom/ncols.hh> +# include <mln/geom/nrows.hh> + # include <mln/extension/duplicate.hh> # include <mln/draw/box_plain.hh> @@ -58,9 +62,8 @@ namespace scribo using namespace mln; - /*! \brief Remove groups not having a minimum number of holes. - - + /*! \brief Remove groups not having at least two background + * components of \p min_size pixels. */ template <typename L> @@ -108,8 +111,8 @@ namespace scribo b.enlarge(1); unsigned - nrows = b.pmax().row() - b.pmin().row() + 1, - ncols = b.pmax().col() - b.pmin().col() + 1, + nrows = geom::nrows(b), + ncols = geom::ncols(b), row_offset = lbl.delta_index(D(+1, -ncols)); mln_value(L) *ptr = &output(b.pmin()); @@ -146,18 +149,27 @@ namespace scribo // Grouping groups and relabel the underlying labeled image. // Groups are now considered as components. - component_set<L> components = primitive::group::apply(groups); + // + // The relabeling function used in group::apply is kept in + // order to map properly the groups and their new component + // id. + // + mln::fun::i2v::array<mln_value(L)> group_2_comp; + component_set<L> + components = primitive::group::apply(groups, group_2_comp); neighb2d nbh = c8(); image2d<unsigned> parent, card; L bboxes_ima; + // Will store the first background component id associated + // to a group. util::array<unsigned> bg_comps( static_cast<unsigned>(components.nelements()) + 1, 0); - util::array<bool> bg_comps_done( - static_cast<unsigned>(components.nelements()) + 1, false); + // Will 'True' if a group has at least two background + // components. fun::i2v::array<bool> to_keep(static_cast<unsigned>(components.nelements()) + 1, false); @@ -166,22 +178,26 @@ namespace scribo // init { - extension::fill(lbl, mln_max(mln_value(L))); -// extension::adjust_fill(components, nbh, mln_max(mln_value(L))); + // The border should be considered as the background. + extension::fill(lbl, literal::zero); + initialize(parent, lbl); data::fill(parent, 0u); + border::fill(parent, 0u); initialize(card, lbl); data::fill(card, 1); border::fill(card, 1); // We want to label background components only in the - // group bounding boxes. Thus, this image is a labeling - // constraint. + // group/component bounding boxes. This image is a + // labeling constraint. bboxes_ima = internal::compute_bboxes_image(components); - to_keep(0) = true; - } +// to_keep(0) = true; + + } // end of init + // 1st pass { @@ -212,11 +228,13 @@ namespace scribo } // for_all(pxl) - } + } // end of 1st pass + + unsigned kept = 0; + // 2nd pass { - unsigned kept = 0; mln_fwd_pixter(const L) pxl(bboxes_ima); // Forward. for_all(pxl) { @@ -241,38 +259,45 @@ namespace scribo && bboxes_ima.element(p) != literal::zero) { mln_value(L) group_id = bboxes_ima.element(p); - if (!bg_comps_done(group_id) && components(group_id).is_valid()) + if (!to_keep(group_id)) { + // The group must have at least 2 different + // background components. + // + // This is the first background component found. if (bg_comps(group_id) == 0) { bg_comps(group_id) = parent_p; } + // This is the second background component found. else if (bg_comps(group_id) != parent_p) { - bg_comps_done(group_id) = true; to_keep(group_id) = true; ++kept; } } } - } - - if (kept == components.nelements()) - { - trace::exiting("scribo::filter::impl::generic::object_groups_with_holes"); - return groups.duplicate(); - } + } // for_all(pxl) - object_groups<L> output = groups.duplicate(); - for_all_groups(c, groups) - if (! to_keep(groups(c))) - output(c) = 0; + } // end of 2nd pass + // No groups need to be invalidated. + if (kept == components.nelements()) + { trace::exiting("scribo::filter::impl::generic::object_groups_with_holes"); - return output; + return groups.duplicate(); } + // Invalidate groups when necessary. + object_groups<L> output = groups.duplicate(); + for_all_groups(c, groups) + if (! to_keep(group_2_comp(c))) + output(c) = 0; + + trace::exiting("scribo::filter::impl::generic::object_groups_with_holes"); + return output; + } } // end of namespace scribo::filter::impl::generic -- 1.5.6.5

1 0

last-svn-commit-492-g1173b73 Fix bug in Qt interface.
by Arthur Crepin-Leblond 04 Aug '10

04 Aug '10

* scribo/demo/viewer/key_widget.cc * scribo/demo/viewer/viewer.cc --- scribo/ChangeLog | 7 +++++++ scribo/demo/viewer/key_widget.cc | 8 ++++---- scribo/demo/viewer/viewer.cc | 8 +++++--- 3 files changed, 16 insertions(+), 7 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 42d9e2f..3fd50af 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,3 +1,10 @@ +2010-08-04 Arthur Crepin-Leblond <crepin(a)ptaouchnok.lrde.epita.fr> + + Fix bug in Qt interface. + + * scribo/demo/viewer/key_widget.cc + * scribo/demo/viewer/viewer.cc + 2010-07-21 Arthur Crepin-Leblond <crepin(a)ptaouchnok.lrde.epita.fr> Fix Segfault bug in Qt interface. diff --git a/scribo/demo/viewer/key_widget.cc b/scribo/demo/viewer/key_widget.cc index 44839c5..228ad67 100644 --- a/scribo/demo/viewer/key_widget.cc +++ b/scribo/demo/viewer/key_widget.cc @@ -90,16 +90,16 @@ KeyWidget::change_mode(bool b) if (b) { - text_->child(id_region)->setCheckState(0, Qt::Checked); + //text_->child(id_region)->setCheckState(0, Qt::Checked); text_->child(id_region)->setHidden(false); - text_->child(id_line)->setCheckState(0, Qt::Checked); + // text_->child(id_line)->setCheckState(0, Qt::Checked); text_->child(id_line)->setHidden(false); } else { - text_->child(id_region)->setCheckState(0, Qt::Unchecked); + //text_->child(id_region)->setCheckState(0, Qt::Unchecked); text_->child(id_region)->setHidden(true); - text_->child(id_line)->setCheckState(0, Qt::Unchecked); + // text_->child(id_line)->setCheckState(0, Qt::Unchecked); text_->child(id_line)->setHidden(true); } } diff --git a/scribo/demo/viewer/viewer.cc b/scribo/demo/viewer/viewer.cc index 36b8d82..38ca8b1 100644 --- a/scribo/demo/viewer/viewer.cc +++ b/scribo/demo/viewer/viewer.cc @@ -441,7 +441,7 @@ Viewer::load_xml(QString filename) } } - if (extended_mode_ && + if ((extended_mode_ || text_) && region.toElement().tagName().contains("text_region")) { QDomNode para = region.firstChild(); @@ -450,7 +450,8 @@ Viewer::load_xml(QString filename) if (!para.isNull()) { - add_region(para, attr_id); + if (extended_mode_) + add_region(para, attr_id); QDomNode line = para.firstChild(); while (!line.isNull() && !line.toElement().tagName().contains("line")) @@ -458,7 +459,8 @@ Viewer::load_xml(QString filename) if (!line.isNull()) { - add_region(line, attr_id); + if (extended_mode_) + add_region(line, attr_id); add_text(line, region); } } -- 1.5.6.5

1 0

last-svn-commit-245-g7a0f783 Fix bug in Qt interface.
by Arthur Crepin-Leblond 04 Aug '10

04 Aug '10

* scribo/demo/viewer/key_widget.cc * scribo/demo/viewer/viewer.cc --- scribo/ChangeLog | 7 +++++++ scribo/demo/viewer/key_widget.cc | 8 ++++---- scribo/demo/viewer/viewer.cc | 8 +++++--- 3 files changed, 16 insertions(+), 7 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index b7737d3..46a6255 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,3 +1,10 @@ +2010-08-04 Arthur Crepin-Leblond <crepin(a)ptaouchnok.lrde.epita.fr> + + Fix bug in Qt interface. + + * scribo/demo/viewer/key_widget.cc + * scribo/demo/viewer/viewer.cc + 2010-07-21 Arthur Crepin-Leblond <crepin(a)ptaouchnok.lrde.epita.fr> Fix Segfault bug in Qt interface. diff --git a/scribo/demo/viewer/key_widget.cc b/scribo/demo/viewer/key_widget.cc index 44839c5..228ad67 100644 --- a/scribo/demo/viewer/key_widget.cc +++ b/scribo/demo/viewer/key_widget.cc @@ -90,16 +90,16 @@ KeyWidget::change_mode(bool b) if (b) { - text_->child(id_region)->setCheckState(0, Qt::Checked); + //text_->child(id_region)->setCheckState(0, Qt::Checked); text_->child(id_region)->setHidden(false); - text_->child(id_line)->setCheckState(0, Qt::Checked); + // text_->child(id_line)->setCheckState(0, Qt::Checked); text_->child(id_line)->setHidden(false); } else { - text_->child(id_region)->setCheckState(0, Qt::Unchecked); + //text_->child(id_region)->setCheckState(0, Qt::Unchecked); text_->child(id_region)->setHidden(true); - text_->child(id_line)->setCheckState(0, Qt::Unchecked); + // text_->child(id_line)->setCheckState(0, Qt::Unchecked); text_->child(id_line)->setHidden(true); } } diff --git a/scribo/demo/viewer/viewer.cc b/scribo/demo/viewer/viewer.cc index 36b8d82..38ca8b1 100644 --- a/scribo/demo/viewer/viewer.cc +++ b/scribo/demo/viewer/viewer.cc @@ -441,7 +441,7 @@ Viewer::load_xml(QString filename) } } - if (extended_mode_ && + if ((extended_mode_ || text_) && region.toElement().tagName().contains("text_region")) { QDomNode para = region.firstChild(); @@ -450,7 +450,8 @@ Viewer::load_xml(QString filename) if (!para.isNull()) { - add_region(para, attr_id); + if (extended_mode_) + add_region(para, attr_id); QDomNode line = para.firstChild(); while (!line.isNull() && !line.toElement().tagName().contains("line")) @@ -458,7 +459,8 @@ Viewer::load_xml(QString filename) if (!line.isNull()) { - add_region(line, attr_id); + if (extended_mode_) + add_region(line, attr_id); add_text(line, region); } } -- 1.5.6.5

1 0

branch next updated: last-svn-commit-181-g565a8ac
by git＠lrde.epita.fr 03 Aug '10

03 Aug '10

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 next has been updated via 565a8acd20101cf22d58b674d4d1695d8e9926c6 (commit) from 7671c7df2acc25243c83131813db612be8a654b2 (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 ----------------------------------------------------------------- No new revisions were added by this update. ----------------------------------------------------------------------- Summary of changes: scribo/ChangeLog | 7 +++++++ scribo/src/Makefile.am | 4 ++-- 2 files changed, 9 insertions(+), 2 deletions(-) hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

last-svn-commit-422-g9fffc80 configure.ac: Improve configure's outputs for external library checks.
by Guillaume Lazzara 03 Aug '10

03 Aug '10

--- ChangeLog | 5 +++++ configure.ac | 28 ++++++++++++++++++++++++++++ 2 files changed, 33 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index c16a450..ec948cc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ 2010-08-03 Guillaume Lazzara <z(a)lrde.epita.fr> + * configure.ac: Improve configure's outputs for external library + checks. + +2010-08-03 Guillaume Lazzara <z(a)lrde.epita.fr> + Handle libMagick++ dependency with pkg-config. * configure.ac: Use PKG_* macros to find Magick++ path and diff --git a/configure.ac b/configure.ac index efe48d6..d5cdca0 100644 --- a/configure.ac +++ b/configure.ac @@ -193,10 +193,20 @@ AM_CONDITIONAL([DARWIN], [echo "$host_os" | grep '^darwin']) # Prepare calls to pkg-config PKG_PROG_PKG_CONFIG + +AC_MSG_RESULT([]) +AC_MSG_RESULT([]) +AC_MSG_RESULT([Checking external libraries]) +AC_MSG_RESULT([------------------------------------------------------------]) + + ### Support for FreeImagePlus has been disabled for Olena 1.0. ## OLN_WITH_LIB([FreeImagePlus], [FreeImagePlus.h], [freeimageplus]) # CFITSIO library. +AC_MSG_RESULT([]) +AC_MSG_RESULT([* libcfitsio]) +AC_MSG_RESULT([------------]) OLN_WITH_LIB([CFITSIO], [fitsio.h], [cfitsio]) @@ -245,23 +255,41 @@ AM_CONDITIONAL(HAVE_MAGICKXX, test "x$have_magickxx" = 'xyes') # TIFF library. +AC_MSG_RESULT([]) +AC_MSG_RESULT([* libtiff]) +AC_MSG_RESULT([---------]) OLN_WITH_LIB([TIFF], [tiff.h], [tiff]) # Grassroots DiCoM (GDCM). +AC_MSG_RESULT([]) +AC_MSG_RESULT([* libgdcm]) +AC_MSG_RESULT([---------]) OLN_WITH_LIB([GDCM], [gdcm-2.0/gdcmReader.h], [gdcmCommon], [gdcm], [GDCM], [-lgdcmzlib]) # Tesseract. +AC_MSG_RESULT([]) +AC_MSG_RESULT([* Tesseract]) +AC_MSG_RESULT([-----------]) OLN_WITH_LIB([TESSERACT], [tesseract/baseapi.h], [tesseract_full], [tesseract], [TESSERACT]) # Qt. +AC_MSG_RESULT([]) +AC_MSG_RESULT([* Qt]) +AC_MSG_RESULT([----]) AT_WITH_QT([+xml], [], [], AC_DEFINE([HAVE_QT], 0, [Define to 1 if we can use Qt]), AC_DEFINE([HAVE_QT], 1)) AM_CONDITIONAL([HAVE_QT], [test x$QT_PATH != x]) +AC_MSG_RESULT([]) +AC_MSG_RESULT([------------------------------------------------------------]) +AC_MSG_RESULT([]) +AC_MSG_RESULT([]) + + ## ---------------------------- ## ## (Bundled) trimesh2 library. ## ## ---------------------------- ## -- 1.5.6.5

1 0

last-svn-commit-421-gaa19b0a Handle libMagick++ dependency with pkg-config.
by Guillaume Lazzara 03 Aug '10

03 Aug '10

* configure.ac: Use PKG_* macros to find Magick++ path and libraries. * m4/pkg.m4: New macros to use pkg-config. --- ChangeLog | 9 +++ configure.ac | 49 +++++++++++++++++-- m4/pkg.m4 | 155 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 209 insertions(+), 4 deletions(-) create mode 100644 m4/pkg.m4 diff --git a/ChangeLog b/ChangeLog index b41d019..c16a450 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2010-08-03 Guillaume Lazzara <z(a)lrde.epita.fr> + + Handle libMagick++ dependency with pkg-config. + + * configure.ac: Use PKG_* macros to find Magick++ path and + libraries. + + * m4/pkg.m4: New macros to use pkg-config. + 2010-07-01 Guillaume Lazzara <z(a)lrde.epita.fr> * m4/autotroll.m4: Fix invalid configuration when Qt is missing. diff --git a/configure.ac b/configure.ac index 46dc531..efe48d6 100644 --- a/configure.ac +++ b/configure.ac @@ -191,17 +191,58 @@ AM_CONDITIONAL([DARWIN], [echo "$host_os" | grep '^darwin']) ## External libraries. ## ## -------------------- ## +# Prepare calls to pkg-config +PKG_PROG_PKG_CONFIG ### Support for FreeImagePlus has been disabled for Olena 1.0. ## OLN_WITH_LIB([FreeImagePlus], [FreeImagePlus.h], [freeimageplus]) # CFITSIO library. OLN_WITH_LIB([CFITSIO], [fitsio.h], [cfitsio]) + +#------------------------------------------------------------ # Magick++. -# FIXME: We should handle Magick++ using pkgconfig (and/or -# Magick++-config?) instead of OLN_WITH_LIB. See how other projects -# handle this. -OLN_WITH_LIB([Magick++], [Magick++.h], [Magick++], [magickxx], [MAGICKXX]) + +# FIXME: We should handle Magick++ both with Magick++-config and +# pkg-config? instead of OLN_WITH_LIB. See how other projects handle +# this. +#OLN_WITH_LIB([Magick++], [Magick++.h], [Magick++], [magickxx], [MAGICKXX]) + +AC_ARG_WITH([magickxx], + [AC_HELP_STRING([--with-magickxx], + [enable magickxx support (default)])], + [with_magickxx=$withval], + [with_magickxx='yes']) + +if test "x$with_magickxx" != 'xyes'; then + DISTCHECK_CONFIG_FLAGS="${DISTCHECK_CONFIG_FLAGS} --with-magickxx=$with_magickxx " +fi + +have_magickxx='no' +MAGICKXX_CFLAGS="" +MAGICKXX_LIBS="" +MAGICKXX_PKG="" +if test "x$with_magickxx" = 'xyes'; then + AC_MSG_RESULT([]) + AC_MSG_RESULT([* libMagick++]) + AC_MSG_RESULT([---------------]) + PKG_CHECK_MODULES(MAGICKXX,[ImageMagick++], have_magickxx=yes, have_magickxx=no) + AC_MSG_RESULT([]) +fi + +if test "$have_magickxx" = 'yes'; then + AC_DEFINE([HAVE_MAGICKXX], 1, [Define to 1 if we can use libMagick++]) + # Use standard variable names. + MAGICKXX_CPPFLAGS="$MAGICKXX_CFLAGS" + MAGICKXX_LDFLAGS="$MAGICKXX_LIBS" + AC_SUBST(MAGICKXX_CPPFLAGS) + AC_SUBST(MAGICKXX_LDFLAGS) +fi + +AM_CONDITIONAL(HAVE_MAGICKXX, test "x$have_magickxx" = 'xyes') + +#------------------------------------------------------------ + # TIFF library. OLN_WITH_LIB([TIFF], [tiff.h], [tiff]) diff --git a/m4/pkg.m4 b/m4/pkg.m4 new file mode 100644 index 0000000..cc47557 --- /dev/null +++ b/m4/pkg.m4 @@ -0,0 +1,155 @@ +# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- +# +# Copyright © 2004 Scott James Remnant <scott(a)netsplit.com>. +# +# This program 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; either version 2 of the License, or +# (at your option) any later version. +# +# This program 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 program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# +# As a special exception to the GNU General Public License, if you +# distribute this file as part of a program that contains a +# configuration script generated by Autoconf, you may include it under +# the same distribution terms that you use for the rest of that program. + +# PKG_PROG_PKG_CONFIG([MIN-VERSION]) +# ---------------------------------- +AC_DEFUN([PKG_PROG_PKG_CONFIG], +[m4_pattern_forbid([^_?PKG_[A-Z_]+$]) +m4_pattern_allow([^PKG_CONFIG(_PATH)?$]) +AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])dnl +if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then + AC_PATH_TOOL([PKG_CONFIG], [pkg-config]) +fi +if test -n "$PKG_CONFIG"; then + _pkg_min_version=m4_default([$1], [0.9.0]) + AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version]) + if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) + PKG_CONFIG="" + fi + +fi[]dnl +])# PKG_PROG_PKG_CONFIG + +# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) +# +# Check to see whether a particular set of modules exists. Similar +# to PKG_CHECK_MODULES(), but does not set variables or print errors. +# +# +# Similar to PKG_CHECK_MODULES, make sure that the first instance of +# this or PKG_CHECK_MODULES is called, or make sure to call +# PKG_CHECK_EXISTS manually +# -------------------------------------------------------------- +AC_DEFUN([PKG_CHECK_EXISTS], +[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl +if test -n "$PKG_CONFIG" && \ + AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then + m4_ifval([$2], [$2], [:]) +m4_ifvaln([$3], [else + $3])dnl +fi]) + + +# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES]) +# --------------------------------------------- +m4_define([_PKG_CONFIG], +[if test -n "$$1"; then + pkg_cv_[]$1="$$1" + elif test -n "$PKG_CONFIG"; then + PKG_CHECK_EXISTS([$3], + [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`], + [pkg_failed=yes]) + else + pkg_failed=untried +fi[]dnl +])# _PKG_CONFIG + +# _PKG_SHORT_ERRORS_SUPPORTED +# ----------------------------- +AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED], +[AC_REQUIRE([PKG_PROG_PKG_CONFIG]) +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes +else + _pkg_short_errors_supported=no +fi[]dnl +])# _PKG_SHORT_ERRORS_SUPPORTED + + +# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND], +# [ACTION-IF-NOT-FOUND]) +# +# +# Note that if there is a possibility the first call to +# PKG_CHECK_MODULES might not happen, you should be sure to include an +# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac +# +# +# -------------------------------------------------------------- +AC_DEFUN([PKG_CHECK_MODULES], +[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl +AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl +AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl + +pkg_failed=no +AC_MSG_CHECKING([for $2]) + +_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2]) +_PKG_CONFIG([$1][_LIBS], [libs], [$2]) + +m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS +and $1[]_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details.]) + +if test $pkg_failed = yes; then + _PKG_SHORT_ERRORS_SUPPORTED + if test $_pkg_short_errors_supported = yes; then + $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2" 2>&1` + else + $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD + + ifelse([$4], , [AC_MSG_ERROR(dnl +[Package requirements ($2) were not met: + +$$1_PKG_ERRORS + +Consider adjusting the PKG_CONFIG_PATH environment variable if you +installed software in a non-standard prefix. + +_PKG_TEXT +])], + [AC_MSG_RESULT([no]) + $4]) +elif test $pkg_failed = untried; then + ifelse([$4], , [AC_MSG_FAILURE(dnl +[The pkg-config script could not be found or is too old. Make sure it +is in your PATH or set the PKG_CONFIG environment variable to the full +path to pkg-config. + +_PKG_TEXT + +To get pkg-config, see <http://pkg-config.freedesktop.org/>.])], + [$4]) +else + $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS + $1[]_LIBS=$pkg_cv_[]$1[]_LIBS + AC_MSG_RESULT([yes]) + ifelse([$3], , :, [$3]) +fi[]dnl +])# PKG_CHECK_MODULES -- 1.5.6.5

1 0

last-svn-commit-181-g565a8ac Fix Scribo's dependencies w.r.t. libraries.
by Roland Levillain 31 Jul '10

31 Jul '10

* src/Makefile.am (text_in_doc_LDFLAGS, text_in_doc_ppm_LDFLAGS): Remove -lhpdf. --- scribo/ChangeLog | 7 +++++++ scribo/src/Makefile.am | 4 ++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 9506589..3f0ee54 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,3 +1,10 @@ +2010-07-31 Roland Levillain <roland(a)lrde.epita.fr> + + Fix Scribo's dependencies w.r.t. libraries. + + * src/Makefile.am (text_in_doc_LDFLAGS, text_in_doc_ppm_LDFLAGS): + Remove -lhpdf. + 2010-04-23 Roland Levillain <roland(a)lrde.epita.fr> Get C++ compiler flags for Scribo from configure. diff --git a/scribo/src/Makefile.am b/scribo/src/Makefile.am index 5f2367f..818b005 100644 --- a/scribo/src/Makefile.am +++ b/scribo/src/Makefile.am @@ -50,7 +50,7 @@ if HAVE_TIFF text_in_doc_LDFLAGS = $(AM_LDFLAGS) \ $(TESSERACT_LDFLAGS) \ $(TIFF_LDFLAGS) \ - -lpthread -lhpdf + -lpthread bin_PROGRAMS += text_in_doc_ppm text_in_doc_ppm_SOURCES = text_in_doc_ppm.cc @@ -60,7 +60,7 @@ if HAVE_TIFF text_in_doc_ppm_LDFLAGS = $(AM_LDFLAGS) \ $(TESSERACT_LDFLAGS) \ $(TIFF_LDFLAGS) \ - -lpthread -lhpdf + -lpthread endif HAVE_TIFF endif HAVE_TESSERACT -- 1.5.6.5

1 0

branch fix-scribo-lib-deps created: last-svn-commit-181-g565a8ac
by git＠lrde.epita.fr 31 Jul '10

31 Jul '10

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 fix-scribo-lib-deps has been created at 565a8acd20101cf22d58b674d4d1695d8e9926c6 (commit) - Log ----------------------------------------------------------------- 565a8ac Fix Scribo's dependencies w.r.t. libraries. ----------------------------------------------------------------------- hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0