sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-04-15 00:04:00 -04:00
Code Issues Packages Projects Releases Wiki Activity

[opencl] Update CMakeList and sipify

Browse Source
This commit is contained in:
Alessandro Pasotti 2018-08-08 11:18:05 +02:00
parent 44adfe53df
commit 4af52f221c
2 changed files with 11 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CMakeLists.txt
View File

@ -37,10 +37,6 @@ IF (USE_OPENCL)
SET(HAVE_OPENCL TRUE)
ELSE(${OpenCL_FOUND})
MESSAGE(STATUS "Couldn't find OpenCL: support DISABLED")
SET (USE_OPENCL TRUE CACHE BOOL "Use OpenCL")
IF(USE_OPENCL)
SET(HAVE_OPENCL TRUE)
ENDIF(USE_OPENCL)
ENDIF(${OpenCL_FOUND})
ENDIF(USE_OPENCL)
@ -477,7 +473,7 @@ IF (PEDANTIC)
# ADD_DEFINITIONS( -fstrict-aliasing -Wstrict-aliasing=1 -Wredundant-decls )
IF ("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang")
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-return-type-c-linkage -Wno-overloaded-virtual -Wimplicit-fallthrough")
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-return-type-c-linkage -Wno-overloaded-virtual")
ENDIF ("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang")
# add any extra CXXFLAGS flags set by user. can be -D CXX_EXTRA_FLAGS or environment variable

20
python/analysis/auto_generated/raster/qgsninecellfilter.sip.in
View File

@ -61,16 +61,16 @@ Must be implemented by subclasses.
First index of the input cell is the row, second index is the column
:param x11: surrounding cell top left
:param x21: surrounding cell central left
:param x31: surrounding cell bottom left
:param x12: surrounding cell top central
:param x22: the central cell for which the value will be calculated
:param x32: surrounding cell bottom central
:param x13: surrounding cell top right
:param x23: surrounding cell central right
:param x33: surrounding cell bottom right
@return the calculated cell value for the central cell x22
@param x11 surrounding cell top left
@param x21 surrounding cell central left
@param x31 surrounding cell bottom left
@param x12 surrounding cell top central
@param x22 the central cell for which the value will be calculated
@param x32 surrounding cell bottom central
@param x13 surrounding cell top right
@param x23 surrounding cell central right
@param x33 surrounding cell bottom right
@return the calculated cell value for the central cell x22
%End
protected: