Skip to content

Commit 4af52f2

Browse files
committed
[opencl] Update CMakeList and sipify
1 parent 44adfe5 commit 4af52f2

File tree

2 files changed

+11
-15
lines changed

2 files changed

+11
-15
lines changed

CMakeLists.txt

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,6 @@ IF (USE_OPENCL)
3737
SET(HAVE_OPENCL TRUE)
3838
ELSE(${OpenCL_FOUND})
3939
MESSAGE(STATUS "Couldn't find OpenCL: support DISABLED")
40-
SET (USE_OPENCL TRUE CACHE BOOL "Use OpenCL")
41-
IF(USE_OPENCL)
42-
SET(HAVE_OPENCL TRUE)
43-
ENDIF(USE_OPENCL)
4440
ENDIF(${OpenCL_FOUND})
4541
ENDIF(USE_OPENCL)
4642

@@ -477,7 +473,7 @@ IF (PEDANTIC)
477473
# ADD_DEFINITIONS( -fstrict-aliasing -Wstrict-aliasing=1 -Wredundant-decls )
478474

479475
IF ("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang")
480-
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-return-type-c-linkage -Wno-overloaded-virtual -Wimplicit-fallthrough")
476+
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-return-type-c-linkage -Wno-overloaded-virtual")
481477
ENDIF ("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang")
482478

483479
# add any extra CXXFLAGS flags set by user. can be -D CXX_EXTRA_FLAGS or environment variable

python/analysis/auto_generated/raster/qgsninecellfilter.sip.in

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -61,16 +61,16 @@ Must be implemented by subclasses.
6161

6262
First index of the input cell is the row, second index is the column
6363

64-
:param x11: surrounding cell top left
65-
:param x21: surrounding cell central left
66-
:param x31: surrounding cell bottom left
67-
:param x12: surrounding cell top central
68-
:param x22: the central cell for which the value will be calculated
69-
:param x32: surrounding cell bottom central
70-
:param x13: surrounding cell top right
71-
:param x23: surrounding cell central right
72-
:param x33: surrounding cell bottom right
73-
@return the calculated cell value for the central cell x22
64+
@param x11 surrounding cell top left
65+
@param x21 surrounding cell central left
66+
@param x31 surrounding cell bottom left
67+
@param x12 surrounding cell top central
68+
@param x22 the central cell for which the value will be calculated
69+
@param x32 surrounding cell bottom central
70+
@param x13 surrounding cell top right
71+
@param x23 surrounding cell central right
72+
@param x33 surrounding cell bottom right
73+
@return the calculated cell value for the central cell x22
7474
%End
7575

7676
protected:

0 commit comments

Comments
 (0)