Merge pull request #37 from soler2000/gh-pages

Added Sony Nex 7 + changed  "-j+0" param to "-j3" ala https://github.com/OpenDroneMap/OpenDroneMap/issues/28#issuecomment-70371681

Former-commit-id: 2f9013b7ea

ccd_defs.pl

@@ -294,4 +294,5 @@
      "SONY DSC-W7"                              => 7.176,  # 1/1.8"
      "SONY DSC-W80"                             => 5.75,   # 1/2.5"
      "SONY DSC-HX5V"                            => 6.104,  # 1/2.4"
+     "SONY NEX-7"                               => 23.5, # APS-C" 
 );

run.pl

@@ -475,7 +475,7 @@ sub getKeypoints {
     print SIFT_DEST $vlsiftJobs;
     close(SIFT_DEST);
     
-    run("\"$BIN_PATH/parallel\" --halt-on-error 1 -j+0 < \"$jobOptions{step_1_vlsift}\"");
+    run("\"$BIN_PATH/parallel\" --halt-on-error 1 -j3 < \"$jobOptions{step_1_vlsift}\"");
     
     if($args{"--end-with"} ne "getKeypoints"){
         match();