generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fixed trailing whitespaces

Browse Source
This commit is contained in:
Vadim Pisarevsky 2014-08-14 14:53:02 +04:00
parent 9a5aa4b23c
commit 75487d43f5
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
modules/java/android_test/src/org/opencv/test/imgproc/ImgprocTest.java
View File

@ -1931,7 +1931,7 @@ public class ImgprocTest extends OpenCVTestCase {
}; };
assertMatEqual(truth, markers); assertMatEqual(truth, markers);
} }
public void testGetTextSize() { public void testGetTextSize() {
String text = "Android all the way"; String text = "Android all the way";
double fontScale = 2; double fontScale = 2;
@ -1945,7 +1945,7 @@ public class ImgprocTest extends OpenCVTestCase {
assertEquals(44.0, res.height); assertEquals(44.0, res.height);
assertEquals(20, baseLine[0]); assertEquals(20, baseLine[0]);
} }
public void testCircleMatPointIntScalar() { public void testCircleMatPointIntScalar() {
Point center = new Point(gray0.cols() / 2, gray0.rows() / 2); Point center = new Point(gray0.cols() / 2, gray0.rows() / 2);
int radius = Math.min(gray0.cols() / 4, gray0.rows() / 4); int radius = Math.min(gray0.cols() / 4, gray0.rows() / 4);
@ -2008,7 +2008,7 @@ public class ImgprocTest extends OpenCVTestCase {
assertEquals(pt1Clipped, pt1); assertEquals(pt1Clipped, pt1);
assertEquals(pt2Clipped, pt2); assertEquals(pt2Clipped, pt2);
} }
public void testEllipse2Poly() { public void testEllipse2Poly() {
Point center = new Point(4, 4); Point center = new Point(4, 4);
Size axes = new Size(2, 2); Size axes = new Size(2, 2);
@ -2112,7 +2112,7 @@ public class ImgprocTest extends OpenCVTestCase {
assertTrue(0 < Core.countNonZero(gray0)); assertTrue(0 < Core.countNonZero(gray0));
} }
public void testPolylinesMatListOfListOfPointBooleanScalar() { public void testPolylinesMatListOfListOfPointBooleanScalar() {
Mat img = gray0; Mat img = gray0;
List<MatOfPoint> polyline = new ArrayList<MatOfPoint>(); List<MatOfPoint> polyline = new ArrayList<MatOfPoint>();
@ -2152,7 +2152,7 @@ public class ImgprocTest extends OpenCVTestCase {
assertEquals(0, Core.countNonZero(img)); assertEquals(0, Core.countNonZero(img));
} }
public void testPutTextMatStringPointIntDoubleScalar() { public void testPutTextMatStringPointIntDoubleScalar() {
String text = "Hello World"; String text = "Hello World";
Size labelSize = new Size(175, 22); Size labelSize = new Size(175, 22);

8
modules/java/generator/gen_java.py
View File

@ -415,7 +415,7 @@ JNIEXPORT jdoubleArray JNICALL Java_org_opencv_core_Core_n_1minMaxLocManual
""", """,
}, # minMaxLoc }, # minMaxLoc
## "checkRange" : #TBD ## "checkRange" : #TBD
## {'j_code' : '/* TBD: checkRange() */', 'jn_code' : '', 'cpp_code' : '' }, ## {'j_code' : '/* TBD: checkRange() */', 'jn_code' : '', 'cpp_code' : '' },
@ -424,7 +424,7 @@ JNIEXPORT jdoubleArray JNICALL Java_org_opencv_core_Core_n_1minMaxLocManual
"useOptimized" : {'j_code' : '', 'jn_code' : '', 'cpp_code' : '' }, "useOptimized" : {'j_code' : '', 'jn_code' : '', 'cpp_code' : '' },
}, # Core }, # Core
'Imgproc' : 'Imgproc' :
{ {
'getTextSize' : 'getTextSize' :
@ -497,8 +497,8 @@ JNIEXPORT jdoubleArray JNICALL Java_org_opencv_core_Core_n_1minMaxLocManual
} }
} }
""", """,
}, # getTextSize }, # getTextSize
}, # Imgproc }, # Imgproc
'Highgui' : 'Highgui' :