diff --git a/openbr/plugins/cmake/opencv.cmake b/openbr/plugins/cmake/opencv.cmake index 397c8f2..9120309 100644 --- a/openbr/plugins/cmake/opencv.cmake +++ b/openbr/plugins/cmake/opencv.cmake @@ -27,12 +27,3 @@ else() plugins/metadata/cascade.cpp plugins/metadata/hogpersondetector.cpp) endif() - -option(BR_WITH_OPENCV_PHOTO "Build with OpenCV photo plugins." ON) -if(${BR_WITH_OPENCV_PHOTO}) - set(BR_THIRDPARTY_LIBS ${BR_THIRDPARTY_LIBS} opencv_photo) - set(OPENCV_DEPENDENCIES ${OPENCV_DEPENDENCIES} opencv_photo) -else() - set(BR_EXCLUDED_PLUGINS ${BR_EXCLUDED_PLUGINS} plugins/imgproc/denoising.cpp - plugins/imgproc/inpaint.cpp) -endif() diff --git a/openbr/plugins/imgproc/denoising.cpp b/openbr/plugins/imgproc/denoising.cpp deleted file mode 100644 index dd047c2..0000000 --- a/openbr/plugins/imgproc/denoising.cpp +++ /dev/null @@ -1,52 +0,0 @@ -/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * - * Copyright 2012 The MITRE Corporation * - * * - * Licensed under the Apache License, Version 2.0 (the "License"); * - * you may not use this file except in compliance with the License. * - * You may obtain a copy of the License at * - * * - * http://www.apache.org/licenses/LICENSE-2.0 * - * * - * Unless required by applicable law or agreed to in writing, software * - * distributed under the License is distributed on an "AS IS" BASIS, * - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * - * See the License for the specific language governing permissions and * - * limitations under the License. * - * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ - -#include - -#include - -using namespace cv; - -namespace br -{ - -/*! - * \ingroup transforms - * \brief Wraps OpenCV Non-Local Means Denoising - * \br_link http://docs.opencv.org/modules/photo/doc/denoising.html - * \author Josh Klontz \cite jklontz - */ -class NLMeansDenoisingTransform : public UntrainableTransform -{ - Q_OBJECT - Q_PROPERTY(float h READ get_h WRITE set_h RESET reset_h STORED false) - Q_PROPERTY(int templateWindowSize READ get_templateWindowSize WRITE set_templateWindowSize RESET reset_templateWindowSize STORED false) - Q_PROPERTY(int searchWindowSize READ get_searchWindowSize WRITE set_searchWindowSize RESET reset_searchWindowSize STORED false) - BR_PROPERTY(float, h, 3) - BR_PROPERTY(int, templateWindowSize, 7) - BR_PROPERTY(int, searchWindowSize, 21) - - void project(const Template &src, Template &dst) const - { - fastNlMeansDenoising(src, dst, h, templateWindowSize, searchWindowSize); - } -}; - -BR_REGISTER(Transform, NLMeansDenoisingTransform) - -} // namespace br - -#include "imgproc/denoising.moc" diff --git a/openbr/plugins/imgproc/inpaint.cpp b/openbr/plugins/imgproc/inpaint.cpp deleted file mode 100644 index 7c20d07..0000000 --- a/openbr/plugins/imgproc/inpaint.cpp +++ /dev/null @@ -1,62 +0,0 @@ -/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * - * Copyright 2012 The MITRE Corporation * - * * - * Licensed under the Apache License, Version 2.0 (the "License"); * - * you may not use this file except in compliance with the License. * - * You may obtain a copy of the License at * - * * - * http://www.apache.org/licenses/LICENSE-2.0 * - * * - * Unless required by applicable law or agreed to in writing, software * - * distributed under the License is distributed on an "AS IS" BASIS, * - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * - * See the License for the specific language governing permissions and * - * limitations under the License. * - * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ - -#include - -#include - -using namespace cv; - -namespace br -{ - -/*! - * \ingroup transforms - * \brief Wraps OpenCV inpainting - * \br_link http://docs.opencv.org/modules/photo/doc/inpainting.html - * \author Josh Klontz \cite jklontz - */ -class InpaintTransform : public UntrainableTransform -{ - Q_OBJECT - Q_ENUMS(Method) - Q_PROPERTY(int radius READ get_radius WRITE set_radius RESET reset_radius STORED false) - Q_PROPERTY(Method method READ get_method WRITE set_method RESET reset_method STORED false) - -public: - /*!< */ - enum Method { NavierStokes = INPAINT_NS, - Telea = INPAINT_TELEA }; - -private: - BR_PROPERTY(int, radius, 1) - BR_PROPERTY(Method, method, NavierStokes) - Transform *cvtGray; - - void init() - { - cvtGray = make("Cvt(Gray)"); - } - - void project(const Template &src, Template &dst) const - { - inpaint(src, (*cvtGray)(src)<5, dst, radius, method); - } -}; - -} // namespace br - -#include "imgproc/inpaint.moc"