diff --git a/openbr/plugins/distance/halfbyteL1.cpp b/openbr/plugins/distance/halfbyteL1.cpp deleted file mode 100644 index d70c0cf..0000000 --- a/openbr/plugins/distance/halfbyteL1.cpp +++ /dev/null @@ -1,45 +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 distances - * \brief Fast 4-bit L1 distance - * \author Josh Klontz \cite jklontz - */ -class HalfByteL1Distance : public UntrainableDistance -{ - Q_OBJECT - - float compare(const Mat &a, const Mat &b) const - { - return packed_l1(a.data, b.data, a.total()); - } -}; - -BR_REGISTER(Distance, HalfByteL1Distance) - - -} // namespace br - -#include "distance/halfbyteL1.moc" diff --git a/openbr/plugins/imgproc/pack.cpp b/openbr/plugins/imgproc/pack.cpp deleted file mode 100644 index 9954af3..0000000 --- a/openbr/plugins/imgproc/pack.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 - -using namespace cv; - -namespace br -{ - -/*! - * \ingroup transforms - * \brief Compress two uchar into one uchar. - * \author Josh Klontz \cite jklontz - */ -class PackTransform : public UntrainableTransform -{ - Q_OBJECT - - void project(const Template &src, Template &dst) const - { - const Mat &m = src; - if ((m.cols % 2 != 0) || (m.type() != CV_8UC1)) - qFatal("Invalid template format."); - - Mat n(m.rows, m.cols/2, CV_8UC1); - for (int i=0; i(i,j) = ((m.at(i,2*j+0) >> 4) << 4) + - ((m.at(i,2*j+1) >> 4) << 0); - dst = n; - } -}; - -BR_REGISTER(Transform, PackTransform) - -} // namespace br - -#include "imgproc/pack.moc"