Peter M. Groen / openbr

Commit 91c585cf80f645602378fb02df6451e1df6e26ee

Authored by Scott Klum
2 parents a882ab00 e2dfc356

Merge branch 'master' of https://github.com/biometrics/openbr

Inline Side-by-side
Showing 3 changed files with 21 additions and 7 deletions
openbr/plugins/filter.cpp
  View file @91c585c
... ... @@ -31,7 +31,7 @@ namespace br
31 31 class GammaTransform : public UntrainableTransform
32 32 {
33 33 Q_OBJECT
34   - Q_PROPERTY(float gamma READ get_gamma WRITE set_gamma RESET reset_gamma)
  34 + Q_PROPERTY(float gamma READ get_gamma WRITE set_gamma RESET reset_gamma STORED false)
35 35 BR_PROPERTY(float, gamma, 0.2)
36 36  
37 37 Mat lut;
... ...
openbr/plugins/stream.cpp
  View file @91c585c
... ... @@ -393,7 +393,6 @@ public:
393 393 bool open(Template & input)
394 394 {
395 395 close();
396   - bool open_res = false;
397 396 final_frame = -1;
398 397 last_issued = -2;
399 398 last_received = -3;
... ... @@ -401,12 +400,12 @@ public:
401 400 // Input has no matrices? Its probably a video that hasn't been loaded yet
402 401 if (input.empty()) {
403 402 actualSource = new VideoDataSource(0);
404   - open_res = actualSource->open(input);
  403 + actualSource->open(input);
405 404 }
406 405 else {
407 406 // create frame dealer
408 407 actualSource = new TemplateDataSource(0);
409   - open_res = actualSource->open(input);
  408 + actualSource->open(input);
410 409 }
411 410 if (!isOpen()) {
412 411 delete actualSource;
... ...
scripts/downloadDatasets.sh
  View file @91c585c
... ... @@ -8,7 +8,12 @@ fi
8 8 # BioID
9 9 if [ ! -d ../data/BioID/img ]; then
10 10 echo "Downloading BioID..."
11   - curl -OL ftp://ftp.uni-erlangen.de/pub/facedb/BioID-FaceDatabase-V1.2.zip
  11 + if hash curl 2>/dev/null; then
  12 + curl -OL ftp://ftp.uni-erlangen.de/pub/facedb/BioID-FaceDatabase-V1.2.zip
  13 + else
  14 + wget ftp://ftp.uni-erlangen.de/pub/facedb/BioID-FaceDatabase-V1.2.zip
  15 + fi
  16 +
12 17 unzip BioID-FaceDatabase-V1.2.zip
13 18 mkdir ../data/BioID/img
14 19 mv *.pgm ../data/BioID/img
... ... @@ -18,7 +23,12 @@ fi
18 23 # LFW
19 24 if [ ! -d ../data/LFW/img ]; then
20 25 echo "Downloading LFW..."
21   - curl -OL http://vis-www.cs.umass.edu/lfw/lfw.tgz
  26 + if hash curl 2>/dev/null; then
  27 + curl -OL http://vis-www.cs.umass.edu/lfw/lfw.tgz
  28 + else
  29 + wget http://vis-www.cs.umass.edu/lfw/lfw.tgz
  30 + fi
  31 +
22 32 tar -xf lfw.tgz
23 33 mv lfw ../data/LFW/img
24 34 rm lfw.tgz
... ... @@ -27,7 +37,12 @@ fi
27 37 # MEDS
28 38 if [ ! -d ../data/MEDS/img ]; then
29 39 echo "Downloading MEDS..."
30   - curl -OL http://nigos.nist.gov:8080/nist/sd/32/NIST_SD32_MEDS-II_face.zip
  40 + if hash curl 2>/dev/null; then
  41 + curl -OL http://nigos.nist.gov:8080/nist/sd/32/NIST_SD32_MEDS-II_face.zip
  42 + else
  43 + wget http://nigos.nist.gov:8080/nist/sd/32/NIST_SD32_MEDS-II_face.zip
  44 + fi
  45 +
31 46 unzip NIST_SD32_MEDS-II_face.zip
32 47 mkdir ../data/MEDS/img
33 48 mv data/*/*.jpg ../data/MEDS/img
... ...