Merge remote-tracking branch 'upstream/master'

2013-09-09 23:23:12 +10:00
parent cc15898353 77a2529eb7
commit 0e06465a23
189 changed files with 9004 additions and 8084 deletions
--- a/modules/imgproc/include/opencv2/imgproc.hpp
+++ b/modules/imgproc/include/opencv2/imgproc.hpp
@@ -660,7 +660,7 @@ public:
                        Point dstOfs = Point(0,0),
                        bool isolated = false);
    //! returns true if the filter is separable
-    bool isSeparable() const { return (const BaseFilter*)filter2D == 0; }
+    bool isSeparable() const { return !filter2D; }
    //! returns the number
    int remainingInputRows() const;
    int remainingOutputRows() const;