diff --git a/tools/imglab/CMakeLists.txt b/tools/imglab/CMakeLists.txt index 17fb8ad708..19b263d2a3 100644 --- a/tools/imglab/CMakeLists.txt +++ b/tools/imglab/CMakeLists.txt @@ -18,8 +18,8 @@ ADD_EXECUTABLE(${target_name} src/image_dataset_metadata.cpp src/metadata_editor.h src/metadata_editor.cpp - src/convert_pascal_voc.h - src/convert_pascal_voc.cpp + src/convert_pascal_xml.h + src/convert_pascal_xml.cpp src/convert_pascal_v1.h src/convert_pascal_v1.cpp src/common.h diff --git a/tools/imglab/src/convert_pascal_voc.cpp b/tools/imglab/src/convert_pascal_xml.cpp similarity index 93% rename from tools/imglab/src/convert_pascal_voc.cpp rename to tools/imglab/src/convert_pascal_xml.cpp index 5abfdc9f4e..af3e434c94 100644 --- a/tools/imglab/src/convert_pascal_voc.cpp +++ b/tools/imglab/src/convert_pascal_xml.cpp @@ -1,5 +1,5 @@ -#include "convert_pascal_voc.h" +#include "convert_pascal_xml.h" #include "image_dataset_metadata.h" #include #include @@ -163,11 +163,11 @@ namespace } -void convert_pascal_voc( +void convert_pascal_xml( const parser_type& parser ) { - cout << "Convert from PASCAL VOC annotation format..." << endl; + cout << "Convert from PASCAL XML annotation format..." << endl; dlib::image_dataset_metadata::dataset dataset; @@ -185,8 +185,8 @@ void convert_pascal_voc( try { parse_annotation_file(parser[i], img, name); - const string voc_root = get_parent_directory(get_parent_directory(file(parser[i]))).full_name(); - const string img_path = voc_root + directory::get_separator() + "JPEGImages" + directory::get_separator(); + const string root = get_parent_directory(get_parent_directory(file(parser[i]))).full_name(); + const string img_path = root + directory::get_separator() + "JPEGImages" + directory::get_separator(); dataset.name = name; img.filename = strip_path(img_path + img.filename, parent_dir); diff --git a/tools/imglab/src/main.cpp b/tools/imglab/src/main.cpp index 53a0d6f509..301a0c45f8 100644 --- a/tools/imglab/src/main.cpp +++ b/tools/imglab/src/main.cpp @@ -1,7 +1,7 @@ #include "image_dataset_metadata.h" #include "metadata_editor.h" -#include "convert_pascal_voc.h" +#include "convert_pascal_xml.h" #include "convert_pascal_v1.h" #include @@ -125,7 +125,7 @@ int main(int argc, char** argv) parser.add_option("rename", "Rename all labels of to .",2); parser.add_option("v","Display version."); parser.add_option("convert","Convert foreign image Annotations from format to the imglab format. " - "Supported formats: pascal-voc, pascal-v1",1); + "Supported formats: pascal-xml, pascal-v1",1); parser.parse(argc, argv); @@ -138,7 +138,7 @@ int main(int argc, char** argv) parser.check_incompatible_options("l", "rename"); parser.check_incompatible_options("convert", "l"); parser.check_incompatible_options("convert", "rename"); - const char* convert_args[] = {"pascal-voc","pascal-v1"}; + const char* convert_args[] = {"pascal-xml","pascal-v1"}; parser.check_option_arg_range("convert", convert_args); if (parser.option("h")) @@ -162,8 +162,8 @@ int main(int argc, char** argv) { if (parser.option("convert")) { - if (parser.option("convert").argument() == "pascal-voc") - convert_pascal_voc(parser); + if (parser.option("convert").argument() == "pascal-xml") + convert_pascal_xml(parser); else if (parser.option("convert").argument() == "pascal-v1") convert_pascal_v1(parser); }