NextCloud/dlib
1
0
Fork 0
mirror of https://github.com/davisking/dlib.git synced 2024-11-01 10:14:53 +08:00
Code Issues Packages Projects Releases Wiki Activity

Do not build WebP features if WebP is not available (#2582)

Browse Source
This commit is contained in:
Adrià Arrufat 2022-04-29 21:38:21 +09:00 committed by GitHub
parent e264c26641
commit 8ceb91fb44
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tools/imglab/src/cluster.cpp
View File

@ -302,6 +302,7 @@ int cluster_dataset(
temp.push_back(images[assignments[i].idx]);
}
#ifdef DLIB_WEBP_SUPPORT
if (parser.option("webp"))
{
string outfile = "cluster_"+pad_int_with_zeros(c+1, 3) + ".webp";
@ -310,6 +311,7 @@ int cluster_dataset(
save_webp(tile_images(temp), outfile, webp_quality);
}
else
#endif
{
string outfile = "cluster_"+pad_int_with_zeros(c+1, 3) + ".jpg";
cout << "Saving " << outfile << endl;

2
tools/imglab/src/common.cpp
View File

@ -58,6 +58,7 @@ std::string to_jpg_name (const std::string& filename)
// ----------------------------------------------------------------------------------------
#ifdef DLIB_WEBP_SUPPORT
std::string to_webp_name (const std::string& filename)
{
std::string::size_type pos = filename.find_last_of(".");
@ -65,6 +66,7 @@ std::string to_webp_name (const std::string& filename)
throw dlib::error("invalid filename: " + filename);
return filename.substr(0,pos) + ".webp";
}
#endif
// ----------------------------------------------------------------------------------------

2
tools/imglab/src/common.h
View File

@ -34,7 +34,9 @@ void make_empty_file (
std::string to_png_name (const std::string& filename);
std::string to_jpg_name (const std::string& filename);
#ifdef DLIB_WEBP_SUPPORT
std::string to_webp_name (const std::string& filename);
#endif
// ----------------------------------------------------------------------------------------

2
tools/imglab/src/flip_dataset.cpp
View File

@ -220,12 +220,14 @@ void flip_dataset(const command_line_parser& parser)
filename = to_jpg_name(filename);
save_jpeg(temp, filename,JPEG_QUALITY);
}
#ifdef DLIB_WEBP_SUPPORT
else if (parser.option("webp"))
{
filename = to_webp_name(filename);
const float webp_quality = std::stof(parser.option("webp").argument());
save_webp(temp, filename, webp_quality);
}
#endif
else
{
save_png(temp, filename);

12
tools/imglab/src/main.cpp
View File

@ -339,12 +339,14 @@ void rotate_dataset(const command_line_parser& parser)
filename = to_jpg_name(filename);
save_jpeg(temp, filename,JPEG_QUALITY);
}
#ifdef DLIB_WEBP_SUPPORT
else if (parser.option("webp"))
{
filename = to_webp_name(filename);
const float webp_quality = std::stof(parser.option("webp").argument());
save_webp(temp, filename, webp_quality);
}
#endif
else
{
save_png(temp, filename);
@ -489,12 +491,14 @@ int resample_dataset(const command_line_parser& parser)
dimg.filename = to_jpg_name(dimg.filename);
save_jpeg(chip,dimg.filename, JPEG_QUALITY);
}
#ifdef DLIB_WEBP_SUPPORT
else if (parser.option("webp"))
{
dimg.filename = to_webp_name(dimg.filename);
const float webp_quality = std::stof(parser.option("webp").argument());
save_webp(chip, dimg.filename, webp_quality);
}
#endif
else
{
save_png(chip,dimg.filename);
@ -567,12 +571,14 @@ int tile_dataset(const command_line_parser& parser)
{
save_png(tile_images(images), out_image);
}
#ifdef DLIB_WEBP_SUPPORT
else if (ext == "webp")
{
// Lossless by default
const float webp_quality = get_option(parser, "webp", 101.f);
save_webp(tile_images(images), out_image, webp_quality);
}
#endif
else
{
save_jpeg(tile_images(images), out_image, JPEG_QUALITY);
@ -650,7 +656,9 @@ int main(int argc, char** argv)
parser.add_option("rmignore","Remove all boxes marked ignore and save the results to a new XML file.");
parser.add_option("rm-if-overlaps","Remove all boxes labeled <arg> if they overlap any box not labeled <arg> and save the results to a new XML file.",1);
parser.add_option("jpg", "When saving images to disk, write them as jpg files instead of png.");
#ifdef DLIB_WEBP_SUPPORT
parser.add_option("webp", "When saving images to disk, write them as webp files instead of png or jpg, using <arg> as the quality factor.", 1);
#endif
parser.set_group_name("Cropping sub images");
parser.add_option("resample", "Crop out images that are centered on each object in the dataset. "
@ -764,7 +772,9 @@ int main(int argc, char** argv)
parser.check_incompatible_options("rmtrunc", "ignore");
parser.check_incompatible_options("box-images", "rename");
parser.check_incompatible_options("box-images", "ignore");
#ifdef DLIB_WEBP_SUPPORT
parser.check_incompatible_options("jpg", "webp");
#endif
const char* convert_args[] = {"pascal-xml","pascal-v1","idl"};
parser.check_option_arg_range("convert", convert_args);
parser.check_option_arg_range("cluster", 0, 999);
@ -774,7 +784,9 @@ int main(int argc, char** argv)
parser.check_option_arg_range("cropped-object-size", 4, 10000*10000);
parser.check_option_arg_range("crop-size", 1.0, 100.0);
parser.check_option_arg_range("split-train-test", 0.0, 1.0);
#ifdef DLIB_WEBP_SUPPORT
parser.check_option_arg_range("webp", 0.f, std::numeric_limits<float>::max());
#endif
if (parser.option("h"))
{