Skip to content

Commit d01ed0f

Browse files
Structure for input parameters.
1 parent be2cb8d commit d01ed0f

File tree

4 files changed

+15
-10
lines changed

4 files changed

+15
-10
lines changed

include/auxiliaries.hpp

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,9 @@
22

33
#include <string>
44

5-
int parseArguments(int argc, char **argv, std::string &fileName);
5+
struct Parameters
6+
{
7+
std::string imgFileName;
8+
};
9+
10+
int parseArguments(int argc, char **argv, Parameters &params);

samples/sample_template.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ using namespace cv;
1010
int main(int argc, char **argv)
1111
{
1212
const std::string caption = "Median filter";
13-
std::string fileName;
14-
if (parseArguments(argc, argv, fileName) != 0)
13+
Parameters params;
14+
if (parseArguments(argc, argv, params) != 0)
1515
{
1616
cout << "practice2 <img_name>" << endl;
1717
cout << "<img_name> - image name for filtering" << endl;
@@ -20,7 +20,7 @@ int main(int argc, char **argv)
2020

2121
Mat src, dst;
2222

23-
if (getFrame(fileName, src) != 0)
23+
if (getFrame(params.imgFileName, src) != 0)
2424
{
2525
cout << "Error: \'src\' image is null or empty!" << endl;
2626
return 2;

src/auxiliaries.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
#include "auxiliaries.hpp"
22

3-
int parseArguments(int argc, char **argv, std::string &fileName)
3+
int parseArguments(int argc, char **argv, Parameters &params)
44
{
55
if (argc < 2)
66
{
77
return 1;
88
}
9-
fileName = std::string(argv[1]);
9+
params.imgFileName = std::string(argv[1]);
1010
return 0;
1111
}

test/aux_test.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ TEST(practice2, parse_empty_arguments)
55
{
66
int argc = 0;
77
char **argv = 0;
8-
std::string fileName;
9-
int res = parseArguments(argc, argv, fileName);
8+
Parameters params;
9+
int res = parseArguments(argc, argv, params);
1010

1111
EXPECT_EQ(1, res);
1212
}
@@ -15,8 +15,8 @@ TEST(practice2, parse_incorrect_arguments)
1515
{
1616
int argc = 2;
1717
char *argv[] = { "", "image.jpg" };
18-
std::string fileName;
19-
int res = parseArguments(argc, argv, fileName);
18+
Parameters params;
19+
int res = parseArguments(argc, argv, params);
2020

2121
EXPECT_EQ(0, res);
2222
}

0 commit comments

Comments
 (0)