Added OpenCV contribution Bioinspired package

opencv/cppbuild.sh

@@ -17,7 +17,7 @@ tar -xzvf ../opencv-$OPENCV_VERSION.tar.gz
 tar -xzvf ../opencv_contrib-$OPENCV_VERSION.tar.gz
 cd opencv-$OPENCV_VERSION
 
-BUILD_CONTRIB_X="-DBUILD_opencv_stereo=OFF -DBUILD_opencv_plot=OFF -DBUILD_opencv_fuzzy=OFF -DBUILD_opencv_aruco=OFF -DBUILD_opencv_adas=OFF -DBUILD_opencv_bgsegm=OFF -DBUILD_opencv_bioinspired=OFF -DBUILD_opencv_ccalib=OFF -DBUILD_opencv_datasets=OFF -DBUILD_opencv_dnn=ON -DBUILD_opencv_dpm=OFF -DBUILD_opencv_face=ON -DBUILD_opencv_latentsvm=OFF -DBUILD_opencv_line_descriptor=OFF -DBUILD_opencv_matlab=OFF -DBUILD_opencv_optflow=ON -DBUILD_opencv_reg=OFF -DBUILD_opencv_rgbd=OFF -DBUILD_opencv_saliency=OFF -DBUILD_opencv_surface_matching=OFF -DBUILD_opencv_text=OFF -DBUILD_opencv_tracking=OFF -DBUILD_opencv_xfeatures2d=ON -DBUILD_opencv_ximgproc=ON -DBUILD_opencv_xobjdetect=OFF -DBUILD_opencv_xphoto=OFF"
+BUILD_CONTRIB_X="-DBUILD_opencv_stereo=OFF -DBUILD_opencv_plot=OFF -DBUILD_opencv_fuzzy=OFF -DBUILD_opencv_aruco=OFF -DBUILD_opencv_adas=OFF -DBUILD_opencv_bgsegm=OFF -DBUILD_opencv_bioinspired=ON -DBUILD_opencv_ccalib=OFF -DBUILD_opencv_datasets=OFF -DBUILD_opencv_dnn=ON -DBUILD_opencv_dpm=OFF -DBUILD_opencv_face=ON -DBUILD_opencv_latentsvm=OFF -DBUILD_opencv_line_descriptor=OFF -DBUILD_opencv_matlab=OFF -DBUILD_opencv_optflow=ON -DBUILD_opencv_reg=OFF -DBUILD_opencv_rgbd=OFF -DBUILD_opencv_saliency=OFF -DBUILD_opencv_surface_matching=OFF -DBUILD_opencv_text=OFF -DBUILD_opencv_tracking=OFF -DBUILD_opencv_xfeatures2d=ON -DBUILD_opencv_ximgproc=ON -DBUILD_opencv_xobjdetect=OFF -DBUILD_opencv_xphoto=OFF"
 
 case $PLATFORM in
     android-arm)
@@ -70,6 +70,11 @@ case $PLATFORM in
         ;;
     windows-x86)
         patch -Np1 < ../../../opencv-$OPENCV_VERSION-windows.patch
+        cd ..
+		cd opencv_contrib-$OPENCV_VERSION
+		patch -Np1 < ../../../opencv-contrib-bioinspired-$OPENCV_VERSION-windows.patch
+		cd ..
+		cd opencv-$OPENCV_VERSION
         BUILD_X="-DBUILD_TESTS=OFF -DBUILD_PERF_TESTS=OFF -DBUILD_JASPER=ON -DBUILD_JPEG=ON -DBUILD_WEBP=ON -DBUILD_OPENEXR=ON -DBUILD_PNG=ON -DBUILD_TIFF=ON -DBUILD_ZLIB=ON -DBUILD_opencv_java=OFF -DBUILD_opencv_python2=OFF"
         WITH_X="-DWITH_1394=OFF -DWITH_FFMPEG=OFF -DWITH_GSTREAMER=OFF -DWITH_OPENMP=OFF -DWITH_CUDA=OFF -DWITH_OPENCL=OFF -DWITH_IPP=OFF"
         "$CMAKE" -G "Visual Studio 12 2013" -DCMAKE_INSTALL_PREFIX=.. $BUILD_X -DENABLE_PRECOMPILED_HEADERS=OFF $WITH_X $BUILD_CONTRIB_X -DOPENCV_EXTRA_MODULES_PATH=../opencv_contrib-$OPENCV_VERSION/modules
@@ -79,6 +84,11 @@ case $PLATFORM in
         ;;
     windows-x86_64)
         patch -Np1 < ../../../opencv-$OPENCV_VERSION-windows.patch
+        cd ..
+		cd opencv_contrib-$OPENCV_VERSION
+		patch -Np1 < ../../../opencv-contrib-bioinspired-$OPENCV_VERSION-windows.patch
+		cd ..
+		cd opencv-$OPENCV_VERSION
         BUILD_X="-DBUILD_TESTS=OFF -DBUILD_PERF_TESTS=OFF -DBUILD_JASPER=ON -DBUILD_JPEG=ON -DBUILD_WEBP=ON -DBUILD_OPENEXR=ON -DBUILD_PNG=ON -DBUILD_TIFF=ON -DBUILD_ZLIB=ON -DBUILD_opencv_java=OFF -DBUILD_opencv_python2=OFF"
         WITH_X="-DWITH_1394=OFF -DWITH_FFMPEG=OFF -DWITH_GSTREAMER=OFF -DWITH_OPENMP=OFF -DWITH_CUDA=OFF -DWITH_OPENCL=OFF -DWITH_IPP=OFF"
         "$CMAKE" -G "Visual Studio 12 2013 Win64" -DCMAKE_INSTALL_PREFIX=.. $BUILD_X -DENABLE_PRECOMPILED_HEADERS=OFF $WITH_X $BUILD_CONTRIB_X -DOPENCV_EXTRA_MODULES_PATH=../opencv_contrib-$OPENCV_VERSION/modules

opencv/opencv-contrib-bioinspired-3.1.0-windows.patch

@@ -0,0 +1,44 @@
+--- opencv_contrib-3.1.0/modules/bioinspired/src/opencl/retina_kernel.cl	2016-09-02 15:16:19.000000000 +0200
+@@ -47,7 +47,7 @@
+ #define WIDTH_MULTIPLE (32 >> 2)
+
+ /////////////////////////////////////////////////////////
+-//*******************************************************
++//------------------------------------------------------
+ // basicretinafilter
+ //////////////// _spatiotemporalLPfilter ////////////////
+ //_horizontalCausalFilter_addInput
+@@ -380,13 +380,13 @@
+     output[offset] = (_maxInputValue + X0) * input_val / (input_val + X0 + 0.00000000001f);
+ }
+ // end of basicretinafilter
+-//*******************************************************
++//------------------------------------------------------
+ /////////////////////////////////////////////////////////
+
+
+
+ /////////////////////////////////////////////////////////
+-//******************************************************
++//------------------------------------------------------
+ // magno
+ // TODO: this kernel has too many buffer accesses, better to make it
+ //   vector read/write for fetch efficiency
+@@ -427,7 +427,7 @@
+ }
+
+ /////////////////////////////////////////////////////////
+-//******************************************************
++//------------------------------------------------------
+ // parvo
+ // TODO: this kernel has too many buffer accesses, needs optimization
+ kernel void OPL_OnOffWaysComputing(
+@@ -473,7 +473,7 @@
+ }
+
+ /////////////////////////////////////////////////////////
+-//******************************************************
++//------------------------------------------------------
+ // retinacolor
+ inline int bayerSampleOffset(int step, int rows, int x, int y)
+ {

opencv/src/main/java/org/bytedeco/javacpp/presets/opencv_bioinspired.java

@@ -0,0 +1,44 @@
+/*
+ * Copyright (C) 2016 Maurice Betzel
+ *
+ * Licensed either under the Apache License, Version 2.0, or (at your option)
+ * under the terms of the GNU General Public License as published by
+ * the Free Software Foundation (subject to the "Classpath" exception),
+ * either version 2, or any later version (collectively, the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.gnu.org/licenses/
+ *     http://www.gnu.org/software/classpath/license.html
+ *
+ * or as provided in the LICENSE.txt file that accompanied this code.
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bytedeco.javacpp.presets;
+
+import org.bytedeco.javacpp.annotation.Platform;
+import org.bytedeco.javacpp.annotation.Properties;
+import org.bytedeco.javacpp.tools.Info;
+import org.bytedeco.javacpp.tools.InfoMap;
+import org.bytedeco.javacpp.tools.InfoMapper;
+
+/**
+ * @author Maurice Betzel
+ */
+@Properties(inherit = {opencv_core.class, opencv_highgui.class}, value = {
+        @Platform(include = {"<opencv2/bioinspired.hpp>", "opencv2/bioinspired/bioinspired.hpp", "opencv2/bioinspired/retina.hpp",
+                "opencv2/bioinspired/retinafasttonemapping.hpp", "opencv2/bioinspired/transientareassegmentationmodule.hpp"}, link = "opencv_bioinspired@.3.1"),
+        @Platform(value = "windows", link = "opencv_bioinspired310")},
+        target = "org.bytedeco.javacpp.opencv_bioinspired")
+public class opencv_bioinspired implements InfoMapper {
+    public void map(InfoMap infoMap) {
+        infoMap.put(new Info("cv::bioinspired::createRetina_OCL").skip());
+    }
+
+}