Merge branch 'thrust_tutorial' of http://github.com/dtmoodie/opencv into thrust_tutorial

Conflicts:
	samples/cpp/tutorial_code/gpu/gpu-thrust-interop/Thrust_interop.hpp

doc/tutorials/gpu/gpu-thrust-interop/gpu_thrust_interop.markdown

@@ -23,13 +23,11 @@ The following code will produce an iterator for a GpuMat
 @snippet samples/cpp/tutorial_code/gpu/gpu-thrust-interop/Thrust_interop.hpp begin_itr
 @snippet samples/cpp/tutorial_code/gpu/gpu-thrust-interop/Thrust_interop.hpp end_itr
 
-Our goal is to have an iterator that will start at the beginning of the matrix, and increment correctly to access continuous matrix elements.  This is trivial for a continuous row, but how about for a column
-of a pitched matrix?  To do this we need the iterator to be aware of the matrix dimensions and step.  This information is embedded in the step_functor.  
+Our goal is to have an iterator that will start at the beginning of the matrix, and increment correctly to access continuous matrix elements.  This is trivial for a continuous row, but how about for a column of a pitched matrix?  To do this we need the iterator to be aware of the matrix dimensions and step.  This information is embedded in the step_functor.
 @snippet samples/cpp/tutorial_code/gpu/gpu-thrust-interop/Thrust_interop.hpp step_functor
 The step functor takes in an index value and returns the appropriate
 offset from the beginning of the matrix.  The counting iterator simply increments over the range of pixel elements.  Combined into the transform_iterator we have an iterator that counts from 0 to M*N and correctly
-increments to account for the pitched memory of a GpuMat.  Unfortunately this does not include any memory location information, for that we need a thrust::device_ptr.  By combining a device pointer with the 
-transform_iterator we can point thrust to the first element of our matrix and have it step accordingly.
+increments to account for the pitched memory of a GpuMat.  Unfortunately this does not include any memory location information, for that we need a thrust::device_ptr.  By combining a device pointer with the transform_iterator we can point thrust to the first element of our matrix and have it step accordingly.
 
 Fill a GpuMat with random numbers
 ----
@@ -52,8 +50,7 @@ Lets fill matrix elements with random values and an index.  Afterwards we will s
 
 Copy values greater than 0 to a new gpu matrix while using streams
 ----
-In this example we're going to see how cv::cuda::Streams can be used with thrust.  Unfortunately this specific example uses functions that must return 
-results to the CPU so it isn't the optimal use of streams.
+In this example we're going to see how cv::cuda::Streams can be used with thrust.  Unfortunately this specific example uses functions that must return results to the CPU so it isn't the optimal use of streams.
 
 @snippet samples/cpp/tutorial_code/gpu/gpu-thrust-interop/main.cu copy_greater
 

samples/cpp/tutorial_code/gpu/gpu-thrust-interop/main.cu

@@ -19,7 +19,6 @@ struct prg
     thrust::default_random_engine rng;
     thrust::uniform_real_distribution<float> dist(a, b);
     rng.discard(n);
-
     return dist(rng);
   }
 };