[Olena-patches] last-svn-commit-196-g00152b7 2009-12-15 green <jacquelet@lrde.epita.fr>

Add new image paths to use the annoting database. * green/mln/img_path.hh: Update to LRDE norm and add annoting database. --- milena/sandbox/ChangeLog | 26 +++++++++++++++++ milena/sandbox/green/mln/img_path.hh | 52 +++++++++++++++++++++------------- 2 files changed, 58 insertions(+), 20 deletions(-) diff --git a/milena/sandbox/ChangeLog b/milena/sandbox/ChangeLog index ac48ee2..acb7027 100644 --- a/milena/sandbox/ChangeLog +++ b/milena/sandbox/ChangeLog @@ -75,6 +75,32 @@ * bin/pgm_to_pbm.cc, * bin/ppm_negate.cc: New. +2009-12-15 green &lt;jacquelet(a)lrde.epita.fr&gt; + + Add new image paths to use the annoting database. + + * green/mln/img_path.hh: Update to LRDE norm and add annoting database. + +2009-12-15 Yann Jacquelet &lt;jacquelet(a)lrde.epita.fr&gt; + + Work around the regional labeling chain and experiment it on the + annoting database. + + * green/exp/labeling/regional_maxima/Makefile.am: Add boost library. + * green/exp/labeling/regional_maxima/regional_maxima.cc: Count colors. + +2009-12-15 Yann Jacquelet &lt;jacquelet(a)lrde.epita.fr&gt; + + Test clipart operators described by Millet on annoting database. + + * green/exp/annoting/nb_color: New experimentation directory. + * green/exp/annoting/nb_color/Makefile.am: New Makefile. + * green/exp/annoting/nb_color/nb_color.cc: New experementation. + + * green/exp/annoting/stddev_color: New experimentation directory. + * green/exp/annoting/stddev_color/Makefile.am: New Makefile. + * green/exp/annoting/stddev_color/stddev_color.cc: New experimentation. + 2009-12-15 Yann Jacquelet &lt;jacquelet(a)lrde.epita.fr&gt; Introduce clipart operators described by Millet. diff --git a/milena/sandbox/green/mln/img_path.hh b/milena/sandbox/green/mln/img_path.hh index 188b813..04ff0c5 100644 --- a/milena/sandbox/green/mln/img_path.hh +++ b/milena/sandbox/green/mln/img_path.hh @@ -26,31 +26,43 @@ // executable file might be covered by the GNU General Public License. #ifndef MLN_IMG_PATH_HH -#define MLN_IMG_PATH_HH +# define MLN_IMG_PATH_HH -#define IMG_PATH "/home/green/svn/oln/trunk/milena/sandbox/green/img" +# define IMG_PATH "/home/green/svn/oln/trunk/milena/sandbox/green/img" +# define RESULT_PATH "/home/green/svn/oln/trunk/milena/sandbox/green/result" -#define INIM_IMG_PATH IMG_PATH"/inim" -#define INIM_FG_BG_IMG_PATH INIM_IMG_PATH"/fg_bg" -#define INIM_IN_IMG_PATH INIM_IMG_PATH"/in" +# define INIM_IMG_PATH IMG_PATH"/inim" +# define INIM_FG_BG_IMG_PATH INIM_IMG_PATH"/fg_bg" +# define INIM_IN_IMG_PATH INIM_IMG_PATH"/in" -#define OLENA_IMG_PATH IMG_PATH"/olena" +# define OLENA_IMG_PATH IMG_PATH"/olena" -#define SCRIBO_IMG_PATH IMG_PATH"/scribo" -#define SCRIBO_JPG_IMG_PATH SCRIBO_IMG_PATH"/jpg_50p" -#define SCRIBO_PGM_IMG_PATH SCRIBO_IMG_PATH"/pgm_50p" -#define SCRIBO_PPM_IMG_PATH SCRIBO_IMG_PATH"/ppm_50p" - -#define ANNOTING_IMG_PATH IMG_PATH"/annoting" -#define ANNOTING_BILL_IMG_PATH ANNOTING_IMG_PATH"/bill" -#define ANNOTING_FAX_IMG_PATH ANNOTING_IMG_PATH"/fax" -#define ANNOTING_HANDWRITTEN_IMG_PATH ANNOTING_IMG_PATH"/handwritten" -#define ANNOTING_LOGO_IMG_PATH ANNOTING_IMG_PATH"/logo" -#define ANNOTING_MAP_IMG_PATH ANNOTING_IMG_PATH"/map" -#define ANNOTING_SCREENSHOT_IMG_PATH ANNOTING_IMG_PATH"/screenshot" -#define ANNOTING_SLIDE_IMG_PATH ANNOTING_IMG_PATH"/slide" -#define ANNOTING_TYPED_IMG_PATH ANNOTING_IMG_PATH"/typed" +# define SCRIBO_IMG_PATH IMG_PATH"/scribo" +# define SCRIBO_JPG_IMG_PATH SCRIBO_IMG_PATH"/jpg_50p" +# define SCRIBO_PGM_IMG_PATH SCRIBO_IMG_PATH"/pgm_50p" +# define SCRIBO_PPM_IMG_PATH SCRIBO_IMG_PATH"/ppm_50p" +# define ANNOTING_IMG_PATH IMG_PATH"/annoting" +# define ANNOTING_BILL_IMG_PATH ANNOTING_IMG_PATH"/bill" +# define ANNOTING_FAX_IMG_PATH ANNOTING_IMG_PATH"/fax" +# define ANNOTING_HANDWRITTEN_IMG_PATH ANNOTING_IMG_PATH"/handwritten" +# define ANNOTING_LOGO_IMG_PATH ANNOTING_IMG_PATH"/logo" +# define ANNOTING_MAP_IMG_PATH ANNOTING_IMG_PATH"/map" +# define ANNOTING_SCREENSHOT_IMG_PATH ANNOTING_IMG_PATH"/screenshot" +# define ANNOTING_SLIDE_IMG_PATH ANNOTING_IMG_PATH"/slide" +# define ANNOTING_TYPED_IMG_PATH ANNOTING_IMG_PATH"/typed" +# define ANNOTING_PHOTO_IMG_PATH ANNOTING_IMG_PATH"/photo" +// result directories +# define RESULT_ANNOTING_PATH RESULT_PATH"/annoting" +# define RESULT_ANNOTING_BILL_PATH RESULT_ANNOTING_PATH"/bill" +# define RESULT_ANNOTING_FAX_PATH RESULT_ANNOTING_PATH"/fax" +# define RESULT_ANNOTING_HANDWRITTEN_PATH RESULT_ANNOTING_PATH"/handwritten" +# define RESULT_ANNOTING_LOGO_PATH RESULT_ANNOTING_PATH"/logo" +# define RESULT_ANNOTING_MAP_PATH RESULT_ANNOTING_PATH"/map" +# define RESULT_ANNOTING_SCREENSHOT_PATH RESULT_ANNOTING_PATH"/screenshot" +# define RESULT_ANNOTING_SLIDE_PATH RESULT_ANNOTING_PATH"/slide" +# define RESULT_ANNOTING_TYPED_PATH RESULT_ANNOTING_PATH"/typed" +# define RESULT_ANNOTING_PHOTO_PATH RESULT_ANNOTING_PATH"/photo" #endif // ! MLN_IMG_PATH_HH -- 1.5.6.5