Merge pull request #1375 from jrobble:fix_caffe_swaprb

Set swapRB to false in GOTURN tracker

modules/tracking/src/gtrTracker.cpp

@@ -153,11 +153,11 @@ bool TrackerGOTURNImpl::updateImpl(const Mat& image, Rect2d& boundingBox)
     searchPatch = searchPatch - 128;
 
     //Convert to Float type
-    Mat targetBlob = dnn::blobFromImage(targetPatch);
-    Mat searchBlob = dnn::blobFromImage(searchPatch);
+    Mat targetBlob = dnn::blobFromImage(targetPatch, 1.0f, Size(), Scalar(), false);
+    Mat searchBlob = dnn::blobFromImage(searchPatch, 1.0f, Size(), Scalar(), false);
 
-    net.setInput(targetBlob, ".data1");
-    net.setInput(searchBlob, ".data2");
+    net.setInput(targetBlob, "data1");
+    net.setInput(searchBlob, "data2");
 
     Mat resMat = net.forward("scale").reshape(1, 1);
 

modules/tracking/test/test_trackers.cpp

@@ -532,7 +532,7 @@ TEST_P(DistanceAndOverlap, DISABLED_Scaled_Data_TLD)
 
 TEST_P(DistanceAndOverlap, DISABLED_GOTURN)
 {
-  TrackerTest test(TrackerGOTURN::create(), dataset, 0, 100, NoTransform);
+  TrackerTest test(TrackerGOTURN::create(), dataset, 18, .5f, NoTransform);
   test.run();
 }