Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
OpenDAS
dlib
Commits
aa4e230d
Commit
aa4e230d
authored
Jul 04, 2015
by
Davis King
Browse files
Removed conditional compilation regarding jpeg and png support. It's just
always going to be required for imglab.
parent
7aed6b3a
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
0 additions
and
8 deletions
+0
-8
tools/imglab/src/main.cpp
tools/imglab/src/main.cpp
+0
-8
No files found.
tools/imglab/src/main.cpp
View file @
aa4e230d
...
@@ -271,7 +271,6 @@ string to_png_name (const string& filename)
...
@@ -271,7 +271,6 @@ string to_png_name (const string& filename)
void
flip_dataset
(
const
command_line_parser
&
parser
)
void
flip_dataset
(
const
command_line_parser
&
parser
)
{
{
#ifdef DLIB_PNG_SUPPORT
image_dataset_metadata
::
dataset
metadata
;
image_dataset_metadata
::
dataset
metadata
;
const
string
datasource
=
parser
.
option
(
"flip"
).
argument
();
const
string
datasource
=
parser
.
option
(
"flip"
).
argument
();
load_image_dataset_metadata
(
metadata
,
datasource
);
load_image_dataset_metadata
(
metadata
,
datasource
);
...
@@ -311,9 +310,6 @@ void flip_dataset(const command_line_parser& parser)
...
@@ -311,9 +310,6 @@ void flip_dataset(const command_line_parser& parser)
}
}
save_image_dataset_metadata
(
metadata
,
metadata_filename
);
save_image_dataset_metadata
(
metadata
,
metadata_filename
);
#else
throw
dlib
::
error
(
"imglab must be compiled with libpng if you want to use the --flip option."
);
#endif
}
}
// ----------------------------------------------------------------------------------------
// ----------------------------------------------------------------------------------------
...
@@ -321,7 +317,6 @@ void flip_dataset(const command_line_parser& parser)
...
@@ -321,7 +317,6 @@ void flip_dataset(const command_line_parser& parser)
int
tile_dataset
(
const
command_line_parser
&
parser
)
int
tile_dataset
(
const
command_line_parser
&
parser
)
{
{
#if defined(DLIB_PNG_SUPPORT) && defined(DLIB_JPEG_SUPPORT)
if
(
parser
.
number_of_arguments
()
!=
1
)
if
(
parser
.
number_of_arguments
()
!=
1
)
{
{
cerr
<<
"The --tile option requires you to give one XML file on the command line."
<<
endl
;
cerr
<<
"The --tile option requires you to give one XML file on the command line."
<<
endl
;
...
@@ -379,9 +374,6 @@ int tile_dataset(const command_line_parser& parser)
...
@@ -379,9 +374,6 @@ int tile_dataset(const command_line_parser& parser)
save_jpeg
(
tile_images
(
images
),
out_image
);
save_jpeg
(
tile_images
(
images
),
out_image
);
return
EXIT_SUCCESS
;
return
EXIT_SUCCESS
;
#else
throw
dlib
::
error
(
"imglab must be compiled with libpng and libjpeg if you want to use the --tile option."
);
#endif
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment