Skip to content
Snippets Groups Projects
Commit 034329f3 authored by faber's avatar faber
Browse files

Updates for OpenCL2, OpenCV3/4 

Introduced cl2.hpp; corrected OpenCV libraries (for OpenCV3); corrected
waitkey() for int->char->-1 peculiarities
parent db58abfd
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 59 additions and 29 deletions
parallel_worlds_0/src/main.cpp
+ 5
− 4
View file @ 034329f3
......@@ -3,7 +3,6 @@
// Author :
// Version :
// Copyright : Your copyright notice
// Description : Hello World in C++, Ansi-style
//============================================================================
......@@ -11,7 +10,7 @@
#include <sstream>
#include <stdlib.h>
#include "cl.hpp"
#include "cl2.hpp"
/*
* VECTOR_CLASS and STRING_CLASS are defined by OpenCL so that
......@@ -20,10 +19,12 @@
* all these definitions available
*/
#ifndef STRING_CLASS
#define STRING_CLASS cl::STRING_CLASS
#define STRING_CLASS ::std::string
//cl::STRING_CLASS
#endif
#ifndef VECTOR_CLASS
#define VECTOR_CLASS cl::VECTOR_CLASS
#define VECTOR_CLASS ::std::vector
//cl::VECTOR_CLASS
#endif
/*
......
parallel_worlds_1/.cproject
+ 7
− 1
View file @ 034329f3
......@@ -73,10 +73,16 @@
<tool id="cdt.managedbuild.tool.gnu.cpp.linker.exe.debug.207526064" name="GCC C++ Linker" superClass="cdt.managedbuild.tool.gnu.cpp.linker.exe.debug">
<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="gnu.cpp.link.option.libs.982738935" name="Libraries (-l)" superClass="gnu.cpp.link.option.libs" valueType="libs">
<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="gnu.cpp.link.option.libs.982738935" name="Libraries (-l)" superClass="gnu.cpp.link.option.libs" useByScannerDiscovery="false" valueType="libs">
<listOptionValue builtIn="false" value="opencv_highgui"/>
<listOptionValue builtIn="false" value="opencv_videoio"/>
<listOptionValue builtIn="false" value="opencv_imgcodecs"/>
<listOptionValue builtIn="false" value="opencv_imgproc"/>
<listOptionValue builtIn="false" value="opencv_core"/>
<listOptionValue builtIn="false" value="OpenCL"/>
......
parallel_worlds_1/src/CMakeLists.txt
+ 1
− 1
View file @ 034329f3
cmake_minimum_required( VERSION 3.1 )
project( parallel_worlds_1 )
set( EXECUTABLE parallel_worlds_1 )
set( EXECUTABLE ${PROJECT_NAME} )
if( MSVC )
message( "MSVC: adding compiler flags" )
......
parallel_worlds_1/src/OpenCLInterface.hpp
+ 8
− 5
View file @ 034329f3
......@@ -6,19 +6,22 @@
#include <stdlib.h>
#include <stdio.h>
#include "cl.hpp"
#include <string>
#include <vector>
#include "cl2.hpp"
/*
* VECTOR_CLASS and STRING_CLASS are defined by OpenCL so that
* the user may use her own implementation of these classes, if she
* VECTOR_CLASS and STRING_CLASS are defined by OpenCL 1.x BUT NOT 2.x(!)
* so that the user may use her own implementation of these classes, if she
* wants to avoid the STL; the defines below are only safeguards to have
* all these definitions available
*/
#ifndef STRING_CLASS
#define STRING_CLASS cl::STRING_CLASS
#define STRING_CLASS ::std::string
#endif
#ifndef VECTOR_CLASS
#define VECTOR_CLASS cl::VECTOR_CLASS
#define VECTOR_CLASS ::std::vector
#endif
/*
......
parallel_worlds_1/src/main.cpp
+ 1
− 1
View file @ 034329f3
......@@ -27,7 +27,7 @@ int main(int argc, const char** argv) {
cv::namedWindow("preview", 0);
cv::namedWindow("converted", 0);
while (cv::waitKey(10) < 0) {
while (((char)cv::waitKey(10)) <= -1) {
if (cameraOn && !capture.read(frame))
exit(3);
......
parallel_worlds_2/.cproject
+ 7
− 1
View file @ 034329f3
......@@ -73,10 +73,16 @@
<tool id="cdt.managedbuild.tool.gnu.cpp.linker.exe.debug.207526064" name="GCC C++ Linker" superClass="cdt.managedbuild.tool.gnu.cpp.linker.exe.debug">
<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="gnu.cpp.link.option.libs.982738935" name="Libraries (-l)" superClass="gnu.cpp.link.option.libs" valueType="libs">
<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="gnu.cpp.link.option.libs.982738935" name="Libraries (-l)" superClass="gnu.cpp.link.option.libs" useByScannerDiscovery="false" valueType="libs">
<listOptionValue builtIn="false" value="opencv_highgui"/>
<listOptionValue builtIn="false" value="opencv_videoio"/>
<listOptionValue builtIn="false" value="opencv_imgcodecs"/>
<listOptionValue builtIn="false" value="opencv_imgproc"/>
<listOptionValue builtIn="false" value="opencv_core"/>
<listOptionValue builtIn="false" value="OpenCL"/>
......
parallel_worlds_2/src/CMakeLists.txt
+ 1
− 1
View file @ 034329f3
cmake_minimum_required( VERSION 3.1 )
project( parallel_worlds_2 )
set( EXECUTABLE parallelwelten_2 )
set( EXECUTABLE ${PROJECT_NAME} )
if( MSVC )
message( "MSVC: adding compiler flags" )
......
parallel_worlds_2/src/OpenCLInterface.hpp
+ 8
− 5
View file @ 034329f3
......@@ -6,19 +6,22 @@
#include <stdlib.h>
#include <stdio.h>
#include "cl.hpp"
#include <string>
#include <vector>
#include "cl2.hpp"
/*
* VECTOR_CLASS and STRING_CLASS are defined by OpenCL so that
* the user may use her own implementation of these classes, if she
* VECTOR_CLASS and STRING_CLASS are defined by OpenCL 1.x BUT NOT 2.x(!)
* so that the user may use her own implementation of these classes, if she
* wants to avoid the STL; the defines below are only safeguards to have
* all these definitions available
*/
#ifndef STRING_CLASS
#define STRING_CLASS cl::STRING_CLASS
#define STRING_CLASS ::std::string
#endif
#ifndef VECTOR_CLASS
#define VECTOR_CLASS cl::VECTOR_CLASS
#define VECTOR_CLASS ::std::vector
#endif
/*
......
parallel_worlds_2/src/main.cpp
+ 1
− 1
View file @ 034329f3
......@@ -27,7 +27,7 @@ int main(int argc, const char** argv) {
cv::namedWindow("preview", 0);
cv::namedWindow("converted", 0);
while (cv::waitKey(10) < 0) {
while (((char)cv::waitKey(10)) <= -1) {
if (cameraOn && !capture.read(frame))
exit(3);
......
parallel_worlds_3/.cproject
+ 9
− 1
View file @ 034329f3
......@@ -73,10 +73,16 @@
<tool id="cdt.managedbuild.tool.gnu.cpp.linker.exe.debug.207526064" name="GCC C++ Linker" superClass="cdt.managedbuild.tool.gnu.cpp.linker.exe.debug">
<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="gnu.cpp.link.option.libs.982738935" name="Libraries (-l)" superClass="gnu.cpp.link.option.libs" valueType="libs">
<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="gnu.cpp.link.option.libs.982738935" name="Libraries (-l)" superClass="gnu.cpp.link.option.libs" useByScannerDiscovery="false" valueType="libs">
<listOptionValue builtIn="false" value="opencv_highgui"/>
<listOptionValue builtIn="false" value="opencv_videoio"/>
<listOptionValue builtIn="false" value="opencv_imgcodecs"/>
<listOptionValue builtIn="false" value="opencv_imgproc"/>
<listOptionValue builtIn="false" value="opencv_core"/>
<listOptionValue builtIn="false" value="OpenCL"/>
......@@ -248,5 +254,7 @@
<storageModule moduleId="refreshScope"/>
<storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/>
<storageModule moduleId="org.eclipse.cdt.make.core.buildtargets"/>
</cproject>
parallel_worlds_3/src/CMakeLists.txt
+ 1
− 1
View file @ 034329f3
cmake_minimum_required( VERSION 3.1 )
project( parallel_worlds_3 )
set( EXECUTABLE parallelwelten_3 )
set( EXECUTABLE ${PROJECT_NAME} )
if( MSVC )
message( "MSVC: adding compiler flags" )
......
parallel_worlds_3/src/DeviceInterface.hpp
+ 1
− 1
View file @ 034329f3
......@@ -44,7 +44,7 @@ private:
for (VECTOR_CLASS<cl::Platform>::iterator pit = platforms.begin();
platforms.end() != pit; ++pit) {
// try to find a device of type devType
CHECK_ERROR(pit->getDevices(devType, &deviceVector));
pit->getDevices(devType, &deviceVector);
/* the C-way:
* cl_int clGetDeviceIDs (cl_platform_id platform,
* cl_device_type device_type,
......
parallel_worlds_3/src/OpenCLInterface.hpp
+ 8
− 5
View file @ 034329f3
......@@ -6,19 +6,22 @@
#include <stdlib.h>
#include <stdio.h>
#include "cl.hpp"
#include <string>
#include <vector>
#include "cl2.hpp"
/*
* VECTOR_CLASS and STRING_CLASS are defined by OpenCL so that
* the user may use her own implementation of these classes, if she
* VECTOR_CLASS and STRING_CLASS are defined by OpenCL 1.x BUT NOT 2.x(!)
* so that the user may use her own implementation of these classes, if she
* wants to avoid the STL; the defines below are only safeguards to have
* all these definitions available
*/
#ifndef STRING_CLASS
#define STRING_CLASS cl::STRING_CLASS
#define STRING_CLASS ::std::string
#endif
#ifndef VECTOR_CLASS
#define VECTOR_CLASS cl::VECTOR_CLASS
#define VECTOR_CLASS ::std::vector
#endif
/*
......
parallel_worlds_3/src/main.cpp
+ 1
− 1
View file @ 034329f3
......@@ -36,7 +36,7 @@ int main(int argc, const char** argv) {
cv::namedWindow("edge", 0);
cv::namedWindow("effect", 0);
while (cv::waitKey(10) < 0) {
while (((char)cv::waitKey(10)) <= -1) {
if (cameraOn && !capture.read(frame))
exit(3);
greyFilter(frame.data, convertedFrame.data, w, h);
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment