-
Notifications
You must be signed in to change notification settings - Fork 741
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #282 from Maurice-Betzel/master
Added OpenCV contribution Bioinspired package
- Loading branch information
Showing
3 changed files
with
99 additions
and
1 deletion.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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) | ||
| { |
44 changes: 44 additions & 0 deletions
44
opencv/src/main/java/org/bytedeco/javacpp/presets/opencv_bioinspired.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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()); | ||
| } | ||
|
|
||
| } |