[Olena-patches] last-svn-commit-420-g984412e Small fixes in milena.

* doc/figures/ima2d-rot-2.ppm: Update generated output. * mln/core/alias/window2d.hh: Aesthetic changes in the header. * mln/core/point.hh: Add mln:: prefix. * headers.mk, * tests/unit_test/unit-tests.mk: Regen. --- milena/ChangeLog | 13 +++++++ milena/doc/figures/ima2d-rot-2.ppm | Bin 235320 -> 235320 bytes milena/headers.mk | 2 +- milena/mln/core/alias/window2d.hh | 3 +- milena/mln/core/point.hh | 40 ++++++++++++------------ milena/tests/unit_test/unit-tests.mk | 58 ++++++++++++++++++++++++++++++++- 6 files changed, 92 insertions(+), 24 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 7705ca4..877da7c 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,16 @@ +2010-07-06 Guillaume Lazzara &lt;z(a)lrde.epita.fr&gt; + + Small fixes in milena. + + * doc/figures/ima2d-rot-2.ppm: Update generated output. + + * mln/core/alias/window2d.hh: Aesthetic changes in the header. + + * mln/core/point.hh: Add mln:: prefix. + + * headers.mk, + * tests/unit_test/unit-tests.mk: Regen. + 2010-06-21 Yann Jacquelet &lt;jacquelet(a)lrde.epita.fr&gt; Fix the way to convert unsigned to float. diff --git a/milena/doc/figures/ima2d-rot-2.ppm b/milena/doc/figures/ima2d-rot-2.ppm index 0d7d601d1411f2354054e1c088d23958a273d363..c46713d24fdf6898ab821f6945fcab91780063de 100644 GIT binary patch literal 235320 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 b0SG_<0uX=z1Rwwb2tWV=5P$##91!>)W)sP> delta 2900 zcmZ{le@xVM7{`5{<Bn+@xL7Wki_`ftMKUp(KLV#P9ppI~{lY?;Q*qi+POQe#B+Fkr zz%#E>f=VkLlOJb&NR2Z?YoY_xr6TT_j#iU-j*X^iUZ3aleZJrGzH<NE?)ALhpXYO* z=lkQD563qjj&HbJ?5kXnZGn&v-0x#m!{got2gZ0ZN{{+1?sp$9_<dG)sVpSu2~(lH z>?9}Rw8SHY!tzs`7^)J!!t%#rjGb*-Ex0W{#<Q%%s*>K0bhsdYNS1|5^DI@hHd$DY z+8#C4oiezNDRuuvNhO1l|Ij7r*0S>->XPSP&E#zCk}gcwq+7`@Ag;>&iVf<K$>oER ztL27tMeHIe)cU6{-#<?~27S?v@wyiFRkWq*hkk|E*Iy3GZux^!MxbB1CF~-py>~!5 zC%Z^0?7JgfF1tty_TQ6kA-iDz1G+DmHr{>UJ8)b7(OFvc(*$|x<fYN*hXjZL*&uUJ z6g4)8B|S&ek8r9ThLNAi-pu|)u#-<`FF8-2SQ^&?4oIZTv?%PF03$#QjD`gk`pnkv zsmYuVrNBs9uX9Bjj3S=M-pt9fAesC)_L9edoZ1-X`nli$Iiay(9!L4)D4ekXCXye; z-puWbU^4lU?9E)54^zpHU~lGN0Zb#G$X@aWeTKuimQW1ol(9$Q8W+qYKa9PZQ%hkE z`B?U5_Lo5>`55++=h4i7*;!6(bw9+}<R5@~-bG*=%m-ol0J8WA`Y$XN(!zVpu1d%y zz7vH*d%#J4fW4V3s$mKFe)f_-(}xx0TJnC_tJnItmeB|WwC?XH+%Dh^5c&0>y$iH& z+RLDqmlU=@5w*C%9BhT<#64kNNi(^|ys-@=Tip-wYVuv|6VAgbx(~a<yq5BpqHxV+ zC?S85y_r)3u#S8udo%lcp%lb{9_@%W--+gPoOJfVd$h7G%zk}<zjMuX7dBGnR1^+{ zU^DrX?9E(Z!!6|f?9H5P$F1a#vzNSsru9>pKL-A{`4PO120Z4SorI#Q_9@?Df0IhZ zdUx%^qg);>M_Z@LcJJwHC{)>-c^${gUA|HxQOFLvY1h4qM~br!^b+p^@9-Q<Hh8Dv zaboEN{DOQr@3$o##~Q^=Dl}E}rC>FMHYiRbj<-<1nW8KWYe}tADpSPG!f%KR6=xg# zD)*o94rYmcbMadW<*AU<;1?C=izy56Ao=-<3k-fiagjK_2<yntP-9zZ@Ux0ni`;yy zCqGGX32_sR-l4cubQcg?-ARhe#F{tJM>lSw;>`xz6>lYOro2`04vjrlcZjZ9mAJnO zkAcL02)zd0Cae}aUDyJ``WAiy-c8$$tGUQyao?cCK{2Wnf1&kP3F`>=Abo8Tb!FH} z<}6{em|c#)5&lZpV&Kn&t>Wx9JVW*f;TZ!P3D1e8m3WTq_k<S={F?BJ=-Y!GWIrbi z80aDF6=l_Uf$Vm|n}mOWr*g$dgttW8e!K`GuLj?aIAF0n;08+kONlGA-u0bC5c>{c zH{l8)(H7=q^y-Zj1E<jnVoD<hDD)bI;vzb`WapQ(a#ih6aa`baO6KUL1f!Itm!1&0 zE!az`+1#&Z4W8!*YrSW&|9NBY@gTZe@h{3gqh*DB#_T9Jous#WTC8cqn-m$%?Hu(m zU4%Nd;*)yrIdQ)eZ^?I52fiF}gb#7Z5K(jjrvo)lM8d`n%mLv@vdI6S%sjA(JEw7q W@?Sc=8A*7gv9?S8wiL_K;{O3iNgHwi diff --git a/milena/headers.mk b/milena/headers.mk index 110caa6..6ee6d7f 100644 --- a/milena/headers.mk +++ b/milena/headers.mk @@ -603,7 +603,7 @@ mln/geom/ncols.hh \ mln/geom/ninds.hh \ mln/geom/nrows.hh \ mln/geom/nsites.hh \ -mln/geom/nslis.hh \ +mln/geom/nslices.hh \ mln/geom/pmin_pmax.hh \ mln/geom/rotate.hh \ mln/geom/seeds2tiling.hh \ diff --git a/milena/mln/core/alias/window2d.hh b/milena/mln/core/alias/window2d.hh index a5b4442..5b8fe31 100644 --- a/milena/mln/core/alias/window2d.hh +++ b/milena/mln/core/alias/window2d.hh @@ -1,4 +1,5 @@ -// Copyright (C) 2007, 2008, 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2007, 2008, 2009, 2010 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // diff --git a/milena/mln/core/point.hh b/milena/mln/core/point.hh index e4b37ef..1b9efc8 100644 --- a/milena/mln/core/point.hh +++ b/milena/mln/core/point.hh @@ -76,11 +76,11 @@ namespace mln template <unsigned n, typename C1, typename G, typename C2> void - from_to_(const algebra::vec<n,C1>& from, point<G,C2>& to); + from_to_(const mln::algebra::vec<n,C1>& from, point<G,C2>& to); template <unsigned n, typename C1, typename G> void - from_to_(const algebra::vec<n,C1>& from, point<G,C1>& to); + from_to_(const mln::algebra::vec<n,C1>& from, point<G,C1>& to); } // end of namespace mln::convert::over_load @@ -95,7 +95,7 @@ namespace mln template <typename G, typename C> struct vec_of_point { - typedef algebra::vec<G::dim, float> ret; + typedef mln::algebra::vec<G::dim, float> ret; }; } @@ -131,10 +131,10 @@ namespace mln typedef C coord; /// Algebra vector (vec) associated type. - typedef algebra::vec<G::dim, float> vec; + typedef mln::algebra::vec<G::dim, float> vec; /// Algebra hexagonal vector (hvec) associated type. - typedef algebra::h_vec<G::dim, float> h_vec; + typedef mln::algebra::h_vec<G::dim, float> h_vec; /// Read-only access to the \p i-th coordinate value. /// \param[in] i The coordinate index. @@ -159,9 +159,9 @@ namespace mln /// Constructor from an algebra vector. template <typename C2> - point(const algebra::vec<dim,C2>& v); + point(const mln::algebra::vec<dim,C2>& v); - point(const algebra::vec<dim,C>& v); + point(const mln::algebra::vec<dim,C>& v); /// \{ Constructors with different numbers of arguments @@ -218,10 +218,10 @@ namespace mln static const point<G,C>& minus_infty(); /// Return the underlying vector storing the coordinates. - algebra::vec<G::dim, C>& hook_coord_(); + mln::algebra::vec<G::dim, C>& hook_coord_(); protected: - algebra::vec<G::dim, C> coord_; + mln::algebra::vec<G::dim, C> coord_; }; namespace internal @@ -250,7 +250,7 @@ namespace mln /// FIXME... template <typename G, typename C> - const algebra::vec<point<G,C>::dim - 1, C>& cut_(const point<G,C>& p); + const mln::algebra::vec<point<G,C>::dim - 1, C>& cut_(const point<G,C>& p); template <typename C> const util::yes& cut_(const point<grid::tick,C>& p); @@ -293,7 +293,7 @@ namespace mln mlc_and(mlc_is_not(C,float), mlc_is_not(C,double)), mlc_or(mlc_is(C2,float), - mlc_is(C2, double)))::check_t(), v); + mlc_is(C2, double)))::eval(), v); } @@ -324,7 +324,7 @@ namespace mln template <unsigned n, typename C1, typename G, typename C2> inline void - from_to_(const algebra::vec<n,C1>& from, point<G,C2>& to) + from_to_(const mln::algebra::vec<n,C1>& from, point<G,C2>& to) { mlc_converts_to(C1, C2)::check(); enum { dim = G::dim }; @@ -346,7 +346,7 @@ namespace mln template <unsigned n, typename C1, typename G> inline void - from_to_(const algebra::vec<n,C1>& from, point<G,C1>& to) + from_to_(const mln::algebra::vec<n,C1>& from, point<G,C1>& to) { enum { dim = G::dim }; mlc_bool(G::dim == n)::check(); @@ -414,7 +414,7 @@ namespace mln template <typename G, typename C> template <typename C2> inline - point<G,C>::point(const algebra::vec<dim,C2>& v) + point<G,C>::point(const mln::algebra::vec<dim,C2>& v) { convert::over_load::from_to_(v, *this); } @@ -422,7 +422,7 @@ namespace mln template <typename G, typename C> inline - point<G,C>::point(const algebra::vec<dim,C>& v) + point<G,C>::point(const mln::algebra::vec<dim,C>& v) { convert::over_load::from_to_(v, *this); } @@ -563,7 +563,7 @@ namespace mln //FIXME: to be improved. if (dim > 2) { - algebra::vec<G::dim, float> tmp; + mln::algebra::vec<G::dim, float> tmp; unsigned j = 0; for (unsigned i = dim - 2; i < dim; ++i) tmp[j++] = coord_[i]; @@ -581,7 +581,7 @@ namespace mln typename point<G,C>::h_vec point<G,C>::to_h_vec() const { - algebra::h_vec<G::dim, float> tmp; + mln::algebra::h_vec<G::dim, float> tmp; //FIXME: to be improved. if (dim == 1) @@ -622,7 +622,7 @@ namespace mln template <typename G, typename C> inline - algebra::vec<G::dim, C>& + mln::algebra::vec<G::dim, C>& point<G,C>::hook_coord_() { return coord_; @@ -658,10 +658,10 @@ namespace mln template <typename G, typename C> inline - const algebra::vec<point<G,C>::dim - 1, C>& + const mln::algebra::vec<point<G,C>::dim - 1, C>& cut_(const point<G,C>& p) { - return *(algebra::vec<point<G,C>::dim - 1, C>*)(& p.to_vec()); + return *(mln::algebra::vec<point<G,C>::dim - 1, C>*)(& p.to_vec()); } template <typename C> diff --git a/milena/tests/unit_test/unit-tests.mk b/milena/tests/unit_test/unit-tests.mk index 6a9d5d5..332c90b 100644 --- a/milena/tests/unit_test/unit-tests.mk +++ b/milena/tests/unit_test/unit-tests.mk @@ -1,6 +1,7 @@ ## Generated by ./build-aux/build_unit_test.sh, do not modify. check_PROGRAMS = \ +mln_+trash_erosion_tolerant \ mln_accu_all \ mln_accu_center \ mln_accu_compute \ @@ -156,6 +157,8 @@ mln_convert_to_fun \ mln_convert_to_image \ mln_convert_to_p_array \ mln_convert_to_p_set \ +mln_convert_to_qimage \ +mln_convert_to_qimage_nocopy \ mln_convert_to_upper_window \ mln_convert_to_window \ mln_core_a_point_of \ @@ -423,6 +426,7 @@ mln_data_replace \ mln_data_saturate \ mln_data_sort_offsets \ mln_data_sort_psites \ +mln_data_split \ mln_data_stretch \ mln_data_to_enc \ mln_data_transform \ @@ -437,16 +441,20 @@ mln_debug_filename \ mln_debug_format \ mln_debug_histo \ mln_debug_iota \ +mln_debug_mosaic \ mln_debug_println \ mln_debug_println_with_border \ mln_debug_put_word \ mln_debug_quiet \ mln_debug_slices_2d \ mln_debug_superpose \ +mln_debug_z_order \ mln_display_all \ mln_display_essential \ mln_draw_all \ mln_draw_box \ +mln_draw_box_plain \ +mln_draw_dashed_line \ mln_draw_essential \ mln_draw_line \ mln_draw_plot \ @@ -521,6 +529,8 @@ mln_fun_meta_red \ mln_fun_meta_sat \ mln_fun_meta_second \ mln_fun_meta_to_enc \ +mln_fun_n2v_all \ +mln_fun_n2v_white_gaussian \ mln_fun_ops \ mln_fun_p2b_all \ mln_fun_p2b_antilogy \ @@ -570,8 +580,10 @@ mln_fun_v2v_inc \ mln_fun_v2v_linear \ mln_fun_v2v_norm \ mln_fun_v2v_projection \ +mln_fun_v2v_qt_rgb_to_int_u \ mln_fun_v2v_rgb_to_hsi \ mln_fun_v2v_rgb_to_hsl \ +mln_fun_v2v_rgb_to_int_u \ mln_fun_v2v_saturate \ mln_fun_v2v_wrap \ mln_fun_v2w2v_all \ @@ -617,6 +629,7 @@ mln_geom_chamfer \ mln_geom_complex_geometry \ mln_geom_delta \ mln_geom_essential \ +mln_geom_horizontal_symmetry \ mln_geom_max_col \ mln_geom_max_ind \ mln_geom_max_row \ @@ -629,7 +642,7 @@ mln_geom_ncols \ mln_geom_ninds \ mln_geom_nrows \ mln_geom_nsites \ -mln_geom_nslis \ +mln_geom_nslices \ mln_geom_pmin_pmax \ mln_geom_rotate \ mln_geom_seeds2tiling \ @@ -638,6 +651,7 @@ mln_geom_size1d \ mln_geom_size2d \ mln_geom_size3d \ mln_geom_translate \ +mln_geom_vertical_symmetry \ mln_graph_all \ mln_graph_attribute_card \ mln_graph_attribute_representative \ @@ -649,6 +663,7 @@ mln_graph_to_win \ mln_histo_all \ mln_histo_array \ mln_histo_compute \ +mln_histo_equalize \ mln_histo_essential \ mln_histo_point_from_value \ mln_io_abort \ @@ -656,7 +671,9 @@ mln_io_all \ mln_io_cloud_all \ mln_io_cloud_load \ mln_io_cloud_save \ +mln_io_dicom_get_header \ mln_io_dump_all \ +mln_io_dump_get_header \ mln_io_dump_load \ mln_io_dump_save \ mln_io_essential \ @@ -700,6 +717,10 @@ mln_io_ppm_load \ mln_io_ppm_save \ mln_io_ppms_all \ mln_io_ppms_load \ +mln_io_raw_all \ +mln_io_raw_get_header \ +mln_io_raw_load \ +mln_io_raw_save \ mln_io_txt_all \ mln_io_txt_save \ mln_labeling_all \ @@ -721,6 +742,7 @@ mln_labeling_regional_minima \ mln_labeling_relabel \ mln_labeling_superpose \ mln_labeling_value \ +mln_labeling_value_and_compute \ mln_labeling_wrap \ mln_linear_all \ mln_linear_ch_convolve \ @@ -999,6 +1021,7 @@ mln_set_sym_diff \ mln_set_uni \ mln_set_unique \ mln_subsampling_all \ +mln_subsampling_antialiased \ mln_subsampling_essential \ mln_subsampling_gaussian_subsampling \ mln_subsampling_subsampling \ @@ -1235,6 +1258,7 @@ mln_value_internal_gray_f \ mln_value_internal_integer \ mln_value_internal_iterable_set \ mln_value_internal_limits \ +mln_value_internal_make_generic_name \ mln_value_internal_value_like \ mln_value_interval \ mln_value_label \ @@ -1246,6 +1270,7 @@ mln_value_mixin \ mln_value_ops \ mln_value_other \ mln_value_proxy \ +mln_value_qt_rgb32 \ mln_value_rgb \ mln_value_rgb16 \ mln_value_rgb8 \ @@ -1275,6 +1300,7 @@ mln_win_octagon2d \ mln_win_rectangle2d \ mln_win_segment1d \ mln_win_shift \ +mln_win_sline3d \ mln_win_sphere3d \ mln_win_sym \ mln_win_vline2d \ @@ -1282,6 +1308,7 @@ mln_world_all \ mln_world_binary_2d_all \ mln_world_binary_2d_enlarge \ mln_world_binary_2d_projected_histo \ +mln_world_binary_2d_reduce \ mln_world_binary_2d_subsample \ mln_world_inter_pixel_all \ mln_world_inter_pixel_compute \ @@ -1299,6 +1326,7 @@ mln_world_inter_pixel_is_separator \ mln_world_inter_pixel_neighb2d \ mln_world_inter_pixel_separator_to_pixels +mln_+trash_erosion_tolerant_SOURCES = mln_+trash_erosion_tolerant.cc mln_accu_all_SOURCES = mln_accu_all.cc mln_accu_center_SOURCES = mln_accu_center.cc mln_accu_compute_SOURCES = mln_accu_compute.cc @@ -1454,6 +1482,8 @@ mln_convert_to_fun_SOURCES = mln_convert_to_fun.cc mln_convert_to_image_SOURCES = mln_convert_to_image.cc mln_convert_to_p_array_SOURCES = mln_convert_to_p_array.cc mln_convert_to_p_set_SOURCES = mln_convert_to_p_set.cc +mln_convert_to_qimage_SOURCES = mln_convert_to_qimage.cc +mln_convert_to_qimage_nocopy_SOURCES = mln_convert_to_qimage_nocopy.cc mln_convert_to_upper_window_SOURCES = mln_convert_to_upper_window.cc mln_convert_to_window_SOURCES = mln_convert_to_window.cc mln_core_a_point_of_SOURCES = mln_core_a_point_of.cc @@ -1721,6 +1751,7 @@ mln_data_replace_SOURCES = mln_data_replace.cc mln_data_saturate_SOURCES = mln_data_saturate.cc mln_data_sort_offsets_SOURCES = mln_data_sort_offsets.cc mln_data_sort_psites_SOURCES = mln_data_sort_psites.cc +mln_data_split_SOURCES = mln_data_split.cc mln_data_stretch_SOURCES = mln_data_stretch.cc mln_data_to_enc_SOURCES = mln_data_to_enc.cc mln_data_transform_SOURCES = mln_data_transform.cc @@ -1735,16 +1766,20 @@ mln_debug_filename_SOURCES = mln_debug_filename.cc mln_debug_format_SOURCES = mln_debug_format.cc mln_debug_histo_SOURCES = mln_debug_histo.cc mln_debug_iota_SOURCES = mln_debug_iota.cc +mln_debug_mosaic_SOURCES = mln_debug_mosaic.cc mln_debug_println_SOURCES = mln_debug_println.cc mln_debug_println_with_border_SOURCES = mln_debug_println_with_border.cc mln_debug_put_word_SOURCES = mln_debug_put_word.cc mln_debug_quiet_SOURCES = mln_debug_quiet.cc mln_debug_slices_2d_SOURCES = mln_debug_slices_2d.cc mln_debug_superpose_SOURCES = mln_debug_superpose.cc +mln_debug_z_order_SOURCES = mln_debug_z_order.cc mln_display_all_SOURCES = mln_display_all.cc mln_display_essential_SOURCES = mln_display_essential.cc mln_draw_all_SOURCES = mln_draw_all.cc mln_draw_box_SOURCES = mln_draw_box.cc +mln_draw_box_plain_SOURCES = mln_draw_box_plain.cc +mln_draw_dashed_line_SOURCES = mln_draw_dashed_line.cc mln_draw_essential_SOURCES = mln_draw_essential.cc mln_draw_line_SOURCES = mln_draw_line.cc mln_draw_plot_SOURCES = mln_draw_plot.cc @@ -1819,6 +1854,8 @@ mln_fun_meta_red_SOURCES = mln_fun_meta_red.cc mln_fun_meta_sat_SOURCES = mln_fun_meta_sat.cc mln_fun_meta_second_SOURCES = mln_fun_meta_second.cc mln_fun_meta_to_enc_SOURCES = mln_fun_meta_to_enc.cc +mln_fun_n2v_all_SOURCES = mln_fun_n2v_all.cc +mln_fun_n2v_white_gaussian_SOURCES = mln_fun_n2v_white_gaussian.cc mln_fun_ops_SOURCES = mln_fun_ops.cc mln_fun_p2b_all_SOURCES = mln_fun_p2b_all.cc mln_fun_p2b_antilogy_SOURCES = mln_fun_p2b_antilogy.cc @@ -1868,8 +1905,10 @@ mln_fun_v2v_inc_SOURCES = mln_fun_v2v_inc.cc mln_fun_v2v_linear_SOURCES = mln_fun_v2v_linear.cc mln_fun_v2v_norm_SOURCES = mln_fun_v2v_norm.cc mln_fun_v2v_projection_SOURCES = mln_fun_v2v_projection.cc +mln_fun_v2v_qt_rgb_to_int_u_SOURCES = mln_fun_v2v_qt_rgb_to_int_u.cc mln_fun_v2v_rgb_to_hsi_SOURCES = mln_fun_v2v_rgb_to_hsi.cc mln_fun_v2v_rgb_to_hsl_SOURCES = mln_fun_v2v_rgb_to_hsl.cc +mln_fun_v2v_rgb_to_int_u_SOURCES = mln_fun_v2v_rgb_to_int_u.cc mln_fun_v2v_saturate_SOURCES = mln_fun_v2v_saturate.cc mln_fun_v2v_wrap_SOURCES = mln_fun_v2v_wrap.cc mln_fun_v2w2v_all_SOURCES = mln_fun_v2w2v_all.cc @@ -1915,6 +1954,7 @@ mln_geom_chamfer_SOURCES = mln_geom_chamfer.cc mln_geom_complex_geometry_SOURCES = mln_geom_complex_geometry.cc mln_geom_delta_SOURCES = mln_geom_delta.cc mln_geom_essential_SOURCES = mln_geom_essential.cc +mln_geom_horizontal_symmetry_SOURCES = mln_geom_horizontal_symmetry.cc mln_geom_max_col_SOURCES = mln_geom_max_col.cc mln_geom_max_ind_SOURCES = mln_geom_max_ind.cc mln_geom_max_row_SOURCES = mln_geom_max_row.cc @@ -1927,7 +1967,7 @@ mln_geom_ncols_SOURCES = mln_geom_ncols.cc mln_geom_ninds_SOURCES = mln_geom_ninds.cc mln_geom_nrows_SOURCES = mln_geom_nrows.cc mln_geom_nsites_SOURCES = mln_geom_nsites.cc -mln_geom_nslis_SOURCES = mln_geom_nslis.cc +mln_geom_nslices_SOURCES = mln_geom_nslices.cc mln_geom_pmin_pmax_SOURCES = mln_geom_pmin_pmax.cc mln_geom_rotate_SOURCES = mln_geom_rotate.cc mln_geom_seeds2tiling_SOURCES = mln_geom_seeds2tiling.cc @@ -1936,6 +1976,7 @@ mln_geom_size1d_SOURCES = mln_geom_size1d.cc mln_geom_size2d_SOURCES = mln_geom_size2d.cc mln_geom_size3d_SOURCES = mln_geom_size3d.cc mln_geom_translate_SOURCES = mln_geom_translate.cc +mln_geom_vertical_symmetry_SOURCES = mln_geom_vertical_symmetry.cc mln_graph_all_SOURCES = mln_graph_all.cc mln_graph_attribute_card_SOURCES = mln_graph_attribute_card.cc mln_graph_attribute_representative_SOURCES = mln_graph_attribute_representative.cc @@ -1947,6 +1988,7 @@ mln_graph_to_win_SOURCES = mln_graph_to_win.cc mln_histo_all_SOURCES = mln_histo_all.cc mln_histo_array_SOURCES = mln_histo_array.cc mln_histo_compute_SOURCES = mln_histo_compute.cc +mln_histo_equalize_SOURCES = mln_histo_equalize.cc mln_histo_essential_SOURCES = mln_histo_essential.cc mln_histo_point_from_value_SOURCES = mln_histo_point_from_value.cc mln_io_abort_SOURCES = mln_io_abort.cc @@ -1954,7 +1996,9 @@ mln_io_all_SOURCES = mln_io_all.cc mln_io_cloud_all_SOURCES = mln_io_cloud_all.cc mln_io_cloud_load_SOURCES = mln_io_cloud_load.cc mln_io_cloud_save_SOURCES = mln_io_cloud_save.cc +mln_io_dicom_get_header_SOURCES = mln_io_dicom_get_header.cc mln_io_dump_all_SOURCES = mln_io_dump_all.cc +mln_io_dump_get_header_SOURCES = mln_io_dump_get_header.cc mln_io_dump_load_SOURCES = mln_io_dump_load.cc mln_io_dump_save_SOURCES = mln_io_dump_save.cc mln_io_essential_SOURCES = mln_io_essential.cc @@ -1998,6 +2042,10 @@ mln_io_ppm_load_SOURCES = mln_io_ppm_load.cc mln_io_ppm_save_SOURCES = mln_io_ppm_save.cc mln_io_ppms_all_SOURCES = mln_io_ppms_all.cc mln_io_ppms_load_SOURCES = mln_io_ppms_load.cc +mln_io_raw_all_SOURCES = mln_io_raw_all.cc +mln_io_raw_get_header_SOURCES = mln_io_raw_get_header.cc +mln_io_raw_load_SOURCES = mln_io_raw_load.cc +mln_io_raw_save_SOURCES = mln_io_raw_save.cc mln_io_txt_all_SOURCES = mln_io_txt_all.cc mln_io_txt_save_SOURCES = mln_io_txt_save.cc mln_labeling_all_SOURCES = mln_labeling_all.cc @@ -2019,6 +2067,7 @@ mln_labeling_regional_minima_SOURCES = mln_labeling_regional_minima.cc mln_labeling_relabel_SOURCES = mln_labeling_relabel.cc mln_labeling_superpose_SOURCES = mln_labeling_superpose.cc mln_labeling_value_SOURCES = mln_labeling_value.cc +mln_labeling_value_and_compute_SOURCES = mln_labeling_value_and_compute.cc mln_labeling_wrap_SOURCES = mln_labeling_wrap.cc mln_linear_all_SOURCES = mln_linear_all.cc mln_linear_ch_convolve_SOURCES = mln_linear_ch_convolve.cc @@ -2297,6 +2346,7 @@ mln_set_sym_diff_SOURCES = mln_set_sym_diff.cc mln_set_uni_SOURCES = mln_set_uni.cc mln_set_unique_SOURCES = mln_set_unique.cc mln_subsampling_all_SOURCES = mln_subsampling_all.cc +mln_subsampling_antialiased_SOURCES = mln_subsampling_antialiased.cc mln_subsampling_essential_SOURCES = mln_subsampling_essential.cc mln_subsampling_gaussian_subsampling_SOURCES = mln_subsampling_gaussian_subsampling.cc mln_subsampling_subsampling_SOURCES = mln_subsampling_subsampling.cc @@ -2533,6 +2583,7 @@ mln_value_internal_gray_f_SOURCES = mln_value_internal_gray_f.cc mln_value_internal_integer_SOURCES = mln_value_internal_integer.cc mln_value_internal_iterable_set_SOURCES = mln_value_internal_iterable_set.cc mln_value_internal_limits_SOURCES = mln_value_internal_limits.cc +mln_value_internal_make_generic_name_SOURCES = mln_value_internal_make_generic_name.cc mln_value_internal_value_like_SOURCES = mln_value_internal_value_like.cc mln_value_interval_SOURCES = mln_value_interval.cc mln_value_label_SOURCES = mln_value_label.cc @@ -2544,6 +2595,7 @@ mln_value_mixin_SOURCES = mln_value_mixin.cc mln_value_ops_SOURCES = mln_value_ops.cc mln_value_other_SOURCES = mln_value_other.cc mln_value_proxy_SOURCES = mln_value_proxy.cc +mln_value_qt_rgb32_SOURCES = mln_value_qt_rgb32.cc mln_value_rgb_SOURCES = mln_value_rgb.cc mln_value_rgb16_SOURCES = mln_value_rgb16.cc mln_value_rgb8_SOURCES = mln_value_rgb8.cc @@ -2573,6 +2625,7 @@ mln_win_octagon2d_SOURCES = mln_win_octagon2d.cc mln_win_rectangle2d_SOURCES = mln_win_rectangle2d.cc mln_win_segment1d_SOURCES = mln_win_segment1d.cc mln_win_shift_SOURCES = mln_win_shift.cc +mln_win_sline3d_SOURCES = mln_win_sline3d.cc mln_win_sphere3d_SOURCES = mln_win_sphere3d.cc mln_win_sym_SOURCES = mln_win_sym.cc mln_win_vline2d_SOURCES = mln_win_vline2d.cc @@ -2580,6 +2633,7 @@ mln_world_all_SOURCES = mln_world_all.cc mln_world_binary_2d_all_SOURCES = mln_world_binary_2d_all.cc mln_world_binary_2d_enlarge_SOURCES = mln_world_binary_2d_enlarge.cc mln_world_binary_2d_projected_histo_SOURCES = mln_world_binary_2d_projected_histo.cc +mln_world_binary_2d_reduce_SOURCES = mln_world_binary_2d_reduce.cc mln_world_binary_2d_subsample_SOURCES = mln_world_binary_2d_subsample.cc mln_world_inter_pixel_all_SOURCES = mln_world_inter_pixel_all.cc mln_world_inter_pixel_compute_SOURCES = mln_world_inter_pixel_compute.cc -- 1.5.6.5