* green/demo/annoting: Rename as ... * green/demo/annotating: ... these. * green/exp/annoting: Rename as ... * green/exp/annotating: ... these. * green/mln/img_path.hh: Propagate mistake corrections. * green/exp/labeling/regional_maxima/regional_maxima.cc (main): Rename ANNOTING macro references as ANNOTATING ones. * green/exp/annotating/stddev_color/stddev_color (main): Rename ANNOTING macro references as ANNOTATING ones. * green/exp/annotating/nb_color/nb_color.cc (main): Rename ANNOTING macro references as ANNOTATING ones. --- milena/sandbox/ChangeLog | 21 ++++++++++ .../demo/{annoting => annotating}/bic/Makefile.am | 0 .../green/demo/{annoting => annotating}/bic/bic.cc | 0 .../green/demo/{annoting => annotating}/class.txt | 0 .../demo/{annoting => annotating}/lep/Makefile.am | 0 .../green/demo/{annoting => annotating}/lep/lep.cc | 0 .../{annoting => annotating}/nb_color/Makefile.am | 0 .../{annoting => annotating}/nb_color/nb_color.cc | 0 .../{annoting => annotating}/project/Makefile.am | 0 .../{annoting => annotating}/project/project.cc | 0 .../{annoting => annotating}/rgb_64/Makefile.am | 0 .../demo/{annoting => annotating}/rgb_64/rgb_64.cc | 0 .../{annoting => annotating}/rgb_64_9/Makefile.am | 0 .../{annoting => annotating}/rgb_64_9/rgb_64_9.cc | 0 .../stddev_color/Makefile.am | 0 .../stddev_color/stddev_color.cc | 0 .../{annoting => annotating}/nb_color/Makefile.am | 0 .../{annoting => annotating}/nb_color/nb_color.cc | 18 ++++---- .../stddev_color/Makefile.am | 0 .../stddev_color/stddev_color.cc | 18 ++++---- .../labeling/regional_maxima/regional_maxima.cc | 2 +- milena/sandbox/green/mln/img_path.hh | 40 ++++++++++---------- 22 files changed, 60 insertions(+), 39 deletions(-) rename milena/sandbox/green/demo/{annoting => annotating}/bic/Makefile.am (100%) rename milena/sandbox/green/demo/{annoting => annotating}/bic/bic.cc (100%) rename milena/sandbox/green/demo/{annoting => annotating}/class.txt (100%) rename milena/sandbox/green/demo/{annoting => annotating}/lep/Makefile.am (100%) rename milena/sandbox/green/demo/{annoting => annotating}/lep/lep.cc (100%) rename milena/sandbox/green/demo/{annoting => annotating}/nb_color/Makefile.am (100%) rename milena/sandbox/green/demo/{annoting => annotating}/nb_color/nb_color.cc (100%) rename milena/sandbox/green/demo/{annoting => annotating}/project/Makefile.am (100%) rename milena/sandbox/green/demo/{annoting => annotating}/project/project.cc (100%) rename milena/sandbox/green/demo/{annoting => annotating}/rgb_64/Makefile.am (100%) rename milena/sandbox/green/demo/{annoting => annotating}/rgb_64/rgb_64.cc (100%) rename milena/sandbox/green/demo/{annoting => annotating}/rgb_64_9/Makefile.am (100%) rename milena/sandbox/green/demo/{annoting => annotating}/rgb_64_9/rgb_64_9.cc (100%) rename milena/sandbox/green/demo/{annoting => annotating}/stddev_color/Makefile.am (100%) rename milena/sandbox/green/demo/{annoting => annotating}/stddev_color/stddev_color.cc (100%) rename milena/sandbox/green/exp/{annoting => annotating}/nb_color/Makefile.am (100%) rename milena/sandbox/green/exp/{annoting => annotating}/nb_color/nb_color.cc (91%) rename milena/sandbox/green/exp/{annoting => annotating}/stddev_color/Makefile.am (100%) rename milena/sandbox/green/exp/{annoting => annotating}/stddev_color/stddev_color.cc (91%) diff --git a/milena/sandbox/ChangeLog b/milena/sandbox/ChangeLog index bc689d2..ffbc6e3 100644 --- a/milena/sandbox/ChangeLog +++ b/milena/sandbox/ChangeLog @@ -1,3 +1,24 @@ +2009-12-16 Yann Jacquelet <jacquelet@lrde.epita.fr> + + Correct typo into directories. + + * green/demo/annoting: Rename as ... + * green/demo/annotating: ... these. + + * green/exp/annoting: Rename as ... + * green/exp/annotating: ... these. + + * green/mln/img_path.hh: Propagate mistake corrections. + + * green/exp/labeling/regional_maxima/regional_maxima.cc (main): + Rename ANNOTING macro references as ANNOTATING ones. + + * green/exp/annotating/stddev_color/stddev_color (main): + Rename ANNOTING macro references as ANNOTATING ones. + + * green/exp/annotating/nb_color/nb_color.cc (main): + Rename ANNOTING macro references as ANNOTATING ones. + 2009-12-15 green <jacquelet@lrde.epita.fr> Introduce new image converter from color to greyscale. diff --git a/milena/sandbox/green/demo/annoting/bic/Makefile.am b/milena/sandbox/green/demo/annotating/bic/Makefile.am similarity index 100% rename from milena/sandbox/green/demo/annoting/bic/Makefile.am rename to milena/sandbox/green/demo/annotating/bic/Makefile.am diff --git a/milena/sandbox/green/demo/annoting/bic/bic.cc b/milena/sandbox/green/demo/annotating/bic/bic.cc similarity index 100% rename from milena/sandbox/green/demo/annoting/bic/bic.cc rename to milena/sandbox/green/demo/annotating/bic/bic.cc diff --git a/milena/sandbox/green/demo/annoting/class.txt b/milena/sandbox/green/demo/annotating/class.txt similarity index 100% rename from milena/sandbox/green/demo/annoting/class.txt rename to milena/sandbox/green/demo/annotating/class.txt diff --git a/milena/sandbox/green/demo/annoting/lep/Makefile.am b/milena/sandbox/green/demo/annotating/lep/Makefile.am similarity index 100% rename from milena/sandbox/green/demo/annoting/lep/Makefile.am rename to milena/sandbox/green/demo/annotating/lep/Makefile.am diff --git a/milena/sandbox/green/demo/annoting/lep/lep.cc b/milena/sandbox/green/demo/annotating/lep/lep.cc similarity index 100% rename from milena/sandbox/green/demo/annoting/lep/lep.cc rename to milena/sandbox/green/demo/annotating/lep/lep.cc diff --git a/milena/sandbox/green/demo/annoting/nb_color/Makefile.am b/milena/sandbox/green/demo/annotating/nb_color/Makefile.am similarity index 100% rename from milena/sandbox/green/demo/annoting/nb_color/Makefile.am rename to milena/sandbox/green/demo/annotating/nb_color/Makefile.am diff --git a/milena/sandbox/green/demo/annoting/nb_color/nb_color.cc b/milena/sandbox/green/demo/annotating/nb_color/nb_color.cc similarity index 100% rename from milena/sandbox/green/demo/annoting/nb_color/nb_color.cc rename to milena/sandbox/green/demo/annotating/nb_color/nb_color.cc diff --git a/milena/sandbox/green/demo/annoting/project/Makefile.am b/milena/sandbox/green/demo/annotating/project/Makefile.am similarity index 100% rename from milena/sandbox/green/demo/annoting/project/Makefile.am rename to milena/sandbox/green/demo/annotating/project/Makefile.am diff --git a/milena/sandbox/green/demo/annoting/project/project.cc b/milena/sandbox/green/demo/annotating/project/project.cc similarity index 100% rename from milena/sandbox/green/demo/annoting/project/project.cc rename to milena/sandbox/green/demo/annotating/project/project.cc diff --git a/milena/sandbox/green/demo/annoting/rgb_64/Makefile.am b/milena/sandbox/green/demo/annotating/rgb_64/Makefile.am similarity index 100% rename from milena/sandbox/green/demo/annoting/rgb_64/Makefile.am rename to milena/sandbox/green/demo/annotating/rgb_64/Makefile.am diff --git a/milena/sandbox/green/demo/annoting/rgb_64/rgb_64.cc b/milena/sandbox/green/demo/annotating/rgb_64/rgb_64.cc similarity index 100% rename from milena/sandbox/green/demo/annoting/rgb_64/rgb_64.cc rename to milena/sandbox/green/demo/annotating/rgb_64/rgb_64.cc diff --git a/milena/sandbox/green/demo/annoting/rgb_64_9/Makefile.am b/milena/sandbox/green/demo/annotating/rgb_64_9/Makefile.am similarity index 100% rename from milena/sandbox/green/demo/annoting/rgb_64_9/Makefile.am rename to milena/sandbox/green/demo/annotating/rgb_64_9/Makefile.am diff --git a/milena/sandbox/green/demo/annoting/rgb_64_9/rgb_64_9.cc b/milena/sandbox/green/demo/annotating/rgb_64_9/rgb_64_9.cc similarity index 100% rename from milena/sandbox/green/demo/annoting/rgb_64_9/rgb_64_9.cc rename to milena/sandbox/green/demo/annotating/rgb_64_9/rgb_64_9.cc diff --git a/milena/sandbox/green/demo/annoting/stddev_color/Makefile.am b/milena/sandbox/green/demo/annotating/stddev_color/Makefile.am similarity index 100% rename from milena/sandbox/green/demo/annoting/stddev_color/Makefile.am rename to milena/sandbox/green/demo/annotating/stddev_color/Makefile.am diff --git a/milena/sandbox/green/demo/annoting/stddev_color/stddev_color.cc b/milena/sandbox/green/demo/annotating/stddev_color/stddev_color.cc similarity index 100% rename from milena/sandbox/green/demo/annoting/stddev_color/stddev_color.cc rename to milena/sandbox/green/demo/annotating/stddev_color/stddev_color.cc diff --git a/milena/sandbox/green/exp/annoting/nb_color/Makefile.am b/milena/sandbox/green/exp/annotating/nb_color/Makefile.am similarity index 100% rename from milena/sandbox/green/exp/annoting/nb_color/Makefile.am rename to milena/sandbox/green/exp/annotating/nb_color/Makefile.am diff --git a/milena/sandbox/green/exp/annoting/nb_color/nb_color.cc b/milena/sandbox/green/exp/annotating/nb_color/nb_color.cc similarity index 91% rename from milena/sandbox/green/exp/annoting/nb_color/nb_color.cc rename to milena/sandbox/green/exp/annotating/nb_color/nb_color.cc index 6dd9c26..e46c8c2 100644 --- a/milena/sandbox/green/exp/annoting/nb_color/nb_color.cc +++ b/milena/sandbox/green/exp/annotating/nb_color/nb_color.cc @@ -80,15 +80,15 @@ int main() //typedef boost::filesystem::initial_path<t_path()> t_init_path; typedef boost::filesystem::directory_iterator t_iter_path; - t_path full_path[] = {t_path(ANNOTING_BILL_IMG_PATH), - t_path(ANNOTING_FAX_IMG_PATH), - t_path(ANNOTING_HANDWRITTEN_IMG_PATH), - t_path(ANNOTING_LOGO_IMG_PATH), - t_path(ANNOTING_MAP_IMG_PATH), - t_path(ANNOTING_PHOTO_IMG_PATH), - t_path(ANNOTING_SCREENSHOT_IMG_PATH), - t_path(ANNOTING_SLIDE_IMG_PATH), - t_path(ANNOTING_TYPED_IMG_PATH)}; + t_path full_path[] = {t_path(ANNOTATING_BILL_IMG_PATH), + t_path(ANNOTATING_FAX_IMG_PATH), + t_path(ANNOTATING_HANDWRITTEN_IMG_PATH), + t_path(ANNOTATING_LOGO_IMG_PATH), + t_path(ANNOTATING_MAP_IMG_PATH), + t_path(ANNOTATING_PHOTO_IMG_PATH), + t_path(ANNOTATING_SCREENSHOT_IMG_PATH), + t_path(ANNOTATING_SLIDE_IMG_PATH), + t_path(ANNOTATING_TYPED_IMG_PATH)}; for (int i = 0; i < 9; ++i) { diff --git a/milena/sandbox/green/exp/annoting/stddev_color/Makefile.am b/milena/sandbox/green/exp/annotating/stddev_color/Makefile.am similarity index 100% rename from milena/sandbox/green/exp/annoting/stddev_color/Makefile.am rename to milena/sandbox/green/exp/annotating/stddev_color/Makefile.am diff --git a/milena/sandbox/green/exp/annoting/stddev_color/stddev_color.cc b/milena/sandbox/green/exp/annotating/stddev_color/stddev_color.cc similarity index 91% rename from milena/sandbox/green/exp/annoting/stddev_color/stddev_color.cc rename to milena/sandbox/green/exp/annotating/stddev_color/stddev_color.cc index 652b8a8..aee3c5d 100644 --- a/milena/sandbox/green/exp/annoting/stddev_color/stddev_color.cc +++ b/milena/sandbox/green/exp/annotating/stddev_color/stddev_color.cc @@ -102,15 +102,15 @@ int main() typedef boost::filesystem::path t_path; typedef boost::filesystem::directory_iterator t_iter_path; - t_path full_path[] = {t_path(ANNOTING_BILL_IMG_PATH), - t_path(ANNOTING_FAX_IMG_PATH), - t_path(ANNOTING_HANDWRITTEN_IMG_PATH), - t_path(ANNOTING_LOGO_IMG_PATH), - t_path(ANNOTING_MAP_IMG_PATH), - t_path(ANNOTING_PHOTO_IMG_PATH), - t_path(ANNOTING_SCREENSHOT_IMG_PATH), - t_path(ANNOTING_SLIDE_IMG_PATH), - t_path(ANNOTING_TYPED_IMG_PATH)}; + t_path full_path[] = {t_path(ANNOTATING_BILL_IMG_PATH), + t_path(ANNOTATING_FAX_IMG_PATH), + t_path(ANNOTATING_HANDWRITTEN_IMG_PATH), + t_path(ANNOTATING_LOGO_IMG_PATH), + t_path(ANNOTATING_MAP_IMG_PATH), + t_path(ANNOTATING_PHOTO_IMG_PATH), + t_path(ANNOTATING_SCREENSHOT_IMG_PATH), + t_path(ANNOTATING_SLIDE_IMG_PATH), + t_path(ANNOTATING_TYPED_IMG_PATH)}; for (int i = 0; i < 9; ++i) { diff --git a/milena/sandbox/green/exp/labeling/regional_maxima/regional_maxima.cc b/milena/sandbox/green/exp/labeling/regional_maxima/regional_maxima.cc index a66c1b7..69fabd0 100644 --- a/milena/sandbox/green/exp/labeling/regional_maxima/regional_maxima.cc +++ b/milena/sandbox/green/exp/labeling/regional_maxima/regional_maxima.cc @@ -115,7 +115,7 @@ int main() //typedef boost::filesystem::initial_path<t_path()> t_init_path; typedef boost::filesystem::directory_iterator t_iter_path; - t_path full_path(ANNOTING_TYPED_IMG_PATH); + t_path full_path(ANNOTATING_TYPED_IMG_PATH); std::cout << "entering " << full_path << std::endl; diff --git a/milena/sandbox/green/mln/img_path.hh b/milena/sandbox/green/mln/img_path.hh index 04ff0c5..7368c22 100644 --- a/milena/sandbox/green/mln/img_path.hh +++ b/milena/sandbox/green/mln/img_path.hh @@ -42,27 +42,27 @@ # 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" +# define ANNOTATING_IMG_PATH IMG_PATH"/annotating" +# define ANNOTATING_BILL_IMG_PATH ANNOTATING_IMG_PATH"/bill" +# define ANNOTATING_FAX_IMG_PATH ANNOTATING_IMG_PATH"/fax" +# define ANNOTATING_HANDWRITTEN_IMG_PATH ANNOTATING_IMG_PATH"/handwritten" +# define ANNOTATING_LOGO_IMG_PATH ANNOTATING_IMG_PATH"/logo" +# define ANNOTATING_MAP_IMG_PATH ANNOTATING_IMG_PATH"/map" +# define ANNOTATING_SCREENSHOT_IMG_PATH ANNOTATING_IMG_PATH"/screenshot" +# define ANNOTATING_SLIDE_IMG_PATH ANNOTATING_IMG_PATH"/slide" +# define ANNOTATING_TYPED_IMG_PATH ANNOTATING_IMG_PATH"/typed" +# define ANNOTATING_PHOTO_IMG_PATH ANNOTATING_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" +# define RESULT_ANNOTATING_PATH RESULT_PATH"/annotating" +# define RESULT_ANNOTATING_BILL_PATH RESULT_ANNOTATING_PATH"/bill" +# define RESULT_ANNOTATING_FAX_PATH RESULT_ANNOTATING_PATH"/fax" +# define RESULT_ANNOTATING_HANDWRITTEN_PATH RESULT_ANNOTATING_PATH"/handwritten" +# define RESULT_ANNOTATING_LOGO_PATH RESULT_ANNOTATING_PATH"/logo" +# define RESULT_ANNOTATING_MAP_PATH RESULT_ANNOTATING_PATH"/map" +# define RESULT_ANNOTATING_SCREENSHOT_PATH RESULT_ANNOTATING_PATH"/screenshot" +# define RESULT_ANNOTATING_SLIDE_PATH RESULT_ANNOTATING_PATH"/slide" +# define RESULT_ANNOTATING_TYPED_PATH RESULT_ANNOTATING_PATH"/typed" +# define RESULT_ANNOTATING_PHOTO_PATH RESULT_ANNOTATING_PATH"/photo" #endif // ! MLN_IMG_PATH_HH -- 1.5.6.5