Merge pull request #10 from vorsprung/master

Fix for arrow keys on recent Ubunu

Makefile

@@ -1,10 +1,3 @@
-CONFIG_FILE := Makefile.config
-
-ifeq ($(wildcard $(CONFIG_FILE)),)
-$(error $(CONFIG_FILE) not found. See $(CONFIG_FILE).example.)
-endif
-include $(CONFIG_FILE)
-
 # Determine platform
 UNAME := $(shell uname -s)
 ifeq ($(UNAME), Linux)
@@ -14,7 +7,7 @@ else ifeq ($(UNAME), Darwin)
 endif
 
 opencv_l := -lopencv_core -lopencv_imgcodecs -lopencv_videoio -lopencv_imgproc -lopencv_highgui -lopencv_features2d -lopencv_calib3d
-opencv_l := -lopencv_calib3d -lopencv_core -lopencv_features2d -lopencv_flann -lopencv_gpu -lopencv_highgui -lopencv_imgproc -lopencv_legacy -lopencv_ml -lopencv_objdetect -lopencv_ocl -lopencv_photo -lopencv_stitching -lopencv_superres -lopencv_ts -lopencv_video -lopencv_videostab -lopencv_imgcodecs  -lopencv_videoio
+opencv_l := -lopencv_calib3d -lopencv_core -lopencv_features2d -lopencv_flann -lopencv_highgui -lopencv_imgproc -lopencv_objdetect -lopencv_photo -lopencv_stitching -lopencv_superres -lopencv_ts -lopencv_video -lopencv_videostab -lopencv_imgcodecs  -lopencv_videoio
 
 
 # Linux

README.md

@@ -20,6 +20,16 @@ The philosophy of this tool is
 
 Requires OPENCV 3 and Google Protobuf.
 
+### Build on Ubuntu 18.04
+    sudo apt-get install caffe-cpu caffe-doc caffe-tools-cpu libcaffe-cpu-dev libcaffe-cpu1 python3-caffe-cpu
+    sudo apt-get install libgoogle-glog-dev
+    sudo apt-get install libprotobuf-dev libprotoc-dev protobuf-compiler
+    sudo apt-get install libprotobuf-dev libprotoc-dev protobuf-compiler
+    sudo apt-get install libopencv-contrib-dev libopencv-dev libopencv-photo-dev libopencv-shape-dev
+    sudo apt-get install libopencv-contrib-dev libopencv-dev libopencv-photo-dev libopencv-shape-dev
+    sudo apt-get install liblmdb-dev
+    make all
+
 ### File format
 
 Rectangle extraction tools create annotations CSV files in the RotatedRect file format. [This blog post will give you the reasons motivating this choice](http://christopher5106.github.io/computer/vision/2015/12/26/file-format-for-computer-vision-annotations.html).

src/annotateRect.cpp

@@ -261,7 +261,7 @@ int annotate( char *  input_dir, char* csv_file, float ratio, string init_rectan
           continue;
 
         int k ;
-        while ( (k = waitKey(0)) ) {
+        while ( (k = waitKeyEx(0)) ) {
           cout << "key " << k << endl;
 
           last_timer = new_timer;