Merge branch 4.x

modules/features/misc/java/gen_dict.json

@@ -7,6 +7,12 @@
             "jni_var": "Feature2D %(n)s",
             "suffix": "J",
             "j_import": "org.opencv.features.Feature2D"
+        },
+        "uchar": {
+            "j_type": "byte",
+            "jn_type": "byte",
+            "jni_type": "jbyte",
+            "suffix": "B"
         }
     }
 }

modules/features/misc/java/test/SIMPLEBLOBFeatureDetectorTest.java

@@ -108,8 +108,7 @@ public class SIMPLEBLOBFeatureDetectorTest extends OpenCVTestCase {
         assertEquals(2, params.get_minRepeatability());
         assertEquals(10.0f, params.get_minDistBetweenBlobs());
         assertEquals(true, params.get_filterByColor());
-        // FIXME: blobColor field has uchar type in C++ and cannot be automatically wrapped to Java as it does not support unsigned types
-        //assertEquals(0, params.get_blobColor());
+        assertEquals(0, params.get_blobColor());
         assertEquals(true, params.get_filterByArea());
         assertEquals(800f, params.get_minArea());
         assertEquals(6000f, params.get_maxArea());