[opencl] Update CMakeList and sipify

qgis · Aug 8, 2018 · 4af52f2 · 4af52f2
1 parent 44adfe5
commit 4af52f2
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 15 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -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

diff --git a/python/analysis/auto_generated/raster/qgsninecellfilter.sip.in b/python/analysis/auto_generated/raster/qgsninecellfilter.sip.in
@@ -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: