diff --git a/openbr/plugins/stream.cpp b/openbr/plugins/stream.cpp index 391bc79..3c723c7 100644 --- a/openbr/plugins/stream.cpp +++ b/openbr/plugins/stream.cpp @@ -393,7 +393,6 @@ public: bool open(Template & input) { close(); - bool open_res = false; final_frame = -1; last_issued = -2; last_received = -3; @@ -401,12 +400,12 @@ public: // Input has no matrices? Its probably a video that hasn't been loaded yet if (input.empty()) { actualSource = new VideoDataSource(0); - open_res = actualSource->open(input); + actualSource->open(input); } else { // create frame dealer actualSource = new TemplateDataSource(0); - open_res = actualSource->open(input); + actualSource->open(input); } if (!isOpen()) { delete actualSource; diff --git a/scripts/downloadDatasets.sh b/scripts/downloadDatasets.sh index 4f74b10..b54cd5d 100755 --- a/scripts/downloadDatasets.sh +++ b/scripts/downloadDatasets.sh @@ -8,7 +8,12 @@ fi # BioID if [ ! -d ../data/BioID/img ]; then echo "Downloading BioID..." - curl -OL ftp://ftp.uni-erlangen.de/pub/facedb/BioID-FaceDatabase-V1.2.zip + if hash curl 2>/dev/null; then + curl -OL ftp://ftp.uni-erlangen.de/pub/facedb/BioID-FaceDatabase-V1.2.zip + else + wget ftp://ftp.uni-erlangen.de/pub/facedb/BioID-FaceDatabase-V1.2.zip + fi + unzip BioID-FaceDatabase-V1.2.zip mkdir ../data/BioID/img mv *.pgm ../data/BioID/img @@ -18,7 +23,12 @@ fi # LFW if [ ! -d ../data/LFW/img ]; then echo "Downloading LFW..." - curl -OL http://vis-www.cs.umass.edu/lfw/lfw.tgz + if hash curl 2>/dev/null; then + curl -OL http://vis-www.cs.umass.edu/lfw/lfw.tgz + else + wget http://vis-www.cs.umass.edu/lfw/lfw.tgz + fi + tar -xf lfw.tgz mv lfw ../data/LFW/img rm lfw.tgz @@ -27,7 +37,12 @@ fi # MEDS if [ ! -d ../data/MEDS/img ]; then echo "Downloading MEDS..." - curl -OL http://nigos.nist.gov:8080/nist/sd/32/NIST_SD32_MEDS-II_face.zip + if hash curl 2>/dev/null; then + curl -OL http://nigos.nist.gov:8080/nist/sd/32/NIST_SD32_MEDS-II_face.zip + else + wget http://nigos.nist.gov:8080/nist/sd/32/NIST_SD32_MEDS-II_face.zip + fi + unzip NIST_SD32_MEDS-II_face.zip mkdir ../data/MEDS/img mv data/*/*.jpg ../data/MEDS/img