Peter M. Groen / openbr

Commit 153ba3ef323eb38d6a6def7144d77db4e9c7b0be

Authored by Josh Klontz
2 parents fba2a991 e2dfc356

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

Inline Side-by-side
Showing 2 changed files with 20 additions and 6 deletions
openbr/plugins/stream.cpp
  View file @153ba3e
@@ -393,7 +393,6 @@ public: @@ -393,7 +393,6 @@ public:
393 bool open(Template & input) 393 bool open(Template & input)
394 { 394 {
395 close(); 395 close();
396 - bool open_res = false;  
397 final_frame = -1; 396 final_frame = -1;
398 last_issued = -2; 397 last_issued = -2;
399 last_received = -3; 398 last_received = -3;
@@ -401,12 +400,12 @@ public: @@ -401,12 +400,12 @@ public:
401 // Input has no matrices? Its probably a video that hasn't been loaded yet 400 // Input has no matrices? Its probably a video that hasn't been loaded yet
402 if (input.empty()) { 401 if (input.empty()) {
403 actualSource = new VideoDataSource(0); 402 actualSource = new VideoDataSource(0);
404 - open_res = actualSource->open(input); 403 + actualSource->open(input);
405 } 404 }
406 else { 405 else {
407 // create frame dealer 406 // create frame dealer
408 actualSource = new TemplateDataSource(0); 407 actualSource = new TemplateDataSource(0);
409 - open_res = actualSource->open(input); 408 + actualSource->open(input);
410 } 409 }
411 if (!isOpen()) { 410 if (!isOpen()) {
412 delete actualSource; 411 delete actualSource;
scripts/downloadDatasets.sh
  View file @153ba3e
@@ -8,7 +8,12 @@ fi @@ -8,7 +8,12 @@ fi
8 # BioID 8 # BioID
9 if [ ! -d ../data/BioID/img ]; then 9 if [ ! -d ../data/BioID/img ]; then
10 echo "Downloading BioID..." 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 unzip BioID-FaceDatabase-V1.2.zip 17 unzip BioID-FaceDatabase-V1.2.zip
13 mkdir ../data/BioID/img 18 mkdir ../data/BioID/img
14 mv *.pgm ../data/BioID/img 19 mv *.pgm ../data/BioID/img
@@ -18,7 +23,12 @@ fi @@ -18,7 +23,12 @@ fi
18 # LFW 23 # LFW
19 if [ ! -d ../data/LFW/img ]; then 24 if [ ! -d ../data/LFW/img ]; then
20 echo "Downloading LFW..." 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 tar -xf lfw.tgz 32 tar -xf lfw.tgz
23 mv lfw ../data/LFW/img 33 mv lfw ../data/LFW/img
24 rm lfw.tgz 34 rm lfw.tgz
@@ -27,7 +37,12 @@ fi @@ -27,7 +37,12 @@ fi
27 # MEDS 37 # MEDS
28 if [ ! -d ../data/MEDS/img ]; then 38 if [ ! -d ../data/MEDS/img ]; then
29 echo "Downloading MEDS..." 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 unzip NIST_SD32_MEDS-II_face.zip 46 unzip NIST_SD32_MEDS-II_face.zip
32 mkdir ../data/MEDS/img 47 mkdir ../data/MEDS/img
33 mv data/*/*.jpg ../data/MEDS/img 48 mv data/*/*.jpg ../data/MEDS/img