Skip to content

Commit 463ee8e

Browse files
hez2010hez2010
committed
simplified delegate invoke
1 parent 58aedb8 commit 463ee8e

File tree

7 files changed

+13
-19
lines changed

7 files changed

+13
-19
lines changed

‎src/OpenCvSharp.Extensions/MyParallel.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ public static void For(int fromInclusive, int toExclusive, Action<int> body)
2727
Thread[] threads = new Thread[NumThread];
2828
for (int i = 0; i < NumThread; i++)
2929
{
30-
threads[i] = new Thread(delegate(object arg)
30+
threads[i] = new Thread(arg =>
3131
{
3232
ForRange range = (ForRange)arg;
3333
for (int j = range.Start; j < range.End; j++)

‎src/OpenCvSharp/Modules/core/Mat/Mat.cs

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -388,7 +388,7 @@ public Mat(IEnumerable<int> sizes, MatType type, IntPtr data, IEnumerable<long>
388388
}
389389
else
390390
{
391-
IntPtr[] stepsArray = EnumerableEx.SelectToArray(steps, delegate(long s) { return new IntPtr(s); });
391+
IntPtr[] stepsArray = EnumerableEx.SelectToArray(steps, s => new IntPtr(s));
392392
ptr = NativeMethods.core_Mat_new9(sizesArray.Length, sizesArray, type, data, stepsArray);
393393
}
394394
}
@@ -438,7 +438,7 @@ public Mat(IEnumerable<int> sizes, MatType type, Array data, IEnumerable<long> s
438438
}
439439
else
440440
{
441-
IntPtr[] stepsArray = EnumerableEx.SelectToArray(steps, delegate(long s) { return new IntPtr(s); });
441+
IntPtr[] stepsArray = EnumerableEx.SelectToArray(steps, s => new IntPtr(s));
442442
ptr = NativeMethods.core_Mat_new9(sizesArray.Length, sizesArray,
443443
type, handle.AddrOfPinnedObject(), stepsArray);
444444
}
@@ -3517,10 +3517,7 @@ private void CheckArgumentsForConvert(int row, int col, Array data,
35173517
35183518
if (acceptableTypes != null && acceptableTypes.Length > 0)
35193519
{
3520-
bool isValidDepth = EnumerableEx.Any(acceptableTypes, delegate(MatType type)
3521-
{
3522-
return type == t;
3523-
});
3520+
bool isValidDepth = EnumerableEx.Any(acceptableTypes, type => type == t);
35243521
if (!isValidDepth)
35253522
throw new OpenCvSharpException("Mat data type is not compatible: " + t);
35263523
}
@@ -3546,7 +3543,7 @@ private void CheckArgumentsForConvert(int row, int col, Array data, int dataDime
35463543

35473544
if (acceptableTypes != null && acceptableTypes.Length > 0)
35483545
{
3549-
bool isValidDepth = EnumerableEx.Any(acceptableTypes, delegate(MatType type) { return type == t; });
3546+
bool isValidDepth = EnumerableEx.Any(acceptableTypes, type => type == t);
35503547
if (!isValidDepth)
35513548
throw new OpenCvSharpException("Mat data type is not compatible: " + t);
35523549
}

‎src/OpenCvSharp/Modules/cuda/Stream.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -307,7 +307,7 @@ public void EnqueueHostCallback(StreamCallback callback, object userData = null)
307307
}
308308

309309
callbackInternal = new StreamCallbackInternal(
310-
delegate(IntPtr rawStream, int status, IntPtr rawUserData)
310+
(rawStream, status, rawUserData) =>
311311
{
312312
var streamObj = new Stream(rawStream) {IsEnabledDispose = false};
313313
var userDataObj = GCHandle.FromIntPtr(rawUserData).Target;

‎src/OpenCvSharp/Modules/highgui/CvTrackbar.cs

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -104,10 +104,7 @@ public CvTrackbar(string name, string window, int value, int max, CvTrackbarCall
104104
this.callback = callback;
105105

106106
// userdata wrapper
107-
callbackNative = delegate (int pos, IntPtr ud)
108-
{
109-
callback(pos);
110-
};
107+
callbackNative = (pos, ud) => callback(pos);
111108

112109
//gchValue = GCHandle.Alloc(value, GCHandleType.Pinned);
113110
gchCallback = GCHandle.Alloc(callback);
@@ -171,7 +168,7 @@ public CvTrackbar(string name, string window, int value, int max, CvTrackbarCall
171168

172169
this.callback = callback;
173170
// コールバックdelegateを、userdataをobjectとするように変換
174-
callbackNative = delegate (int pos, IntPtr ud)
171+
callbackNative = (pos, ud) =>
175172
{
176173
if (ud == IntPtr.Zero)
177174
{

‎src/OpenCvSharp/PInvoke/NativeMethods.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,7 @@ public static bool IsMono()
207207
/// Custom error handler to be thrown by OpenCV
208208
/// </summary>
209209
public static readonly CvErrorCallback ErrorHandlerThrowException =
210-
delegate(ErrorCode status, string funcName, string errMsg, string fileName, int line, IntPtr userdata)
210+
(status, funcName, errMsg, fileName, line, userdata) =>
211211
{
212212
try
213213
{
@@ -224,7 +224,7 @@ public static bool IsMono()
224224
/// Custom error handler to ignore all OpenCV errors
225225
/// </summary>
226226
public static readonly CvErrorCallback ErrorHandlerIgnorance =
227-
delegate(ErrorCode status, string funcName, string errMsg, string fileName, int line, IntPtr userdata)
227+
(status, funcName, errMsg, fileName, line, userdata) =>
228228
{
229229
//cvSetErrStatus(CvStatus.StsOk);
230230
return 0;

‎src/OpenCvSharp/Util/EnumerableEx.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ public static TResult[] SelectToArray<TSource, TResult>(
9090
/// <returns></returns>
9191
public static IntPtr[] SelectPtrs(IEnumerable<Mat> enumerable)
9292
{
93-
return SelectToArray(enumerable, delegate(Mat obj)
93+
return SelectToArray(enumerable, obj =>
9494
{
9595
if (obj == null)
9696
throw new ArgumentException("enumerable contains null");
@@ -106,7 +106,7 @@ public static IntPtr[] SelectPtrs(IEnumerable<Mat> enumerable)
106106
/// <returns></returns>
107107
public static IntPtr[] SelectPtrs(IEnumerable<InputArray> enumerable)
108108
{
109-
return SelectToArray(enumerable, delegate(InputArray obj)
109+
return SelectToArray(enumerable, obj =>
110110
{
111111
if (obj == null)
112112
throw new ArgumentException("enumerable contains null");

‎test/OpenCvSharp.Tests/text/TextDetectorTest.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ public TextDetectorTest()
1818
{
1919
var handler = new HttpClientHandler
2020
{
21-
ServerCertificateCustomValidationCallback = delegate{ return true; }
21+
ServerCertificateCustomValidationCallback = (message, cert, chain, errors) => true
2222
};
2323
using (var client = new HttpClient(handler))
2424
{

0 commit comments

Comments
 (0)