Fixes issue 26 "Make include guards unique"

https://github.com/openalpr/openalpr/issues/26
This commit is contained in:
Matt Hill
2014-05-02 20:23:47 -04:00
parent 9d9afa37fb
commit 0bf3f674ee
19 changed files with 60 additions and 54 deletions

View File

@@ -17,8 +17,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#ifndef ALPR_H #ifndef OPENALPR_ALPR_H
#define ALPR_H #define OPENALPR_ALPR_H
#include <iostream> #include <iostream>
#include <vector> #include <vector>
@@ -83,4 +83,4 @@ class Alpr
AlprImpl* impl; AlprImpl* impl;
}; };
#endif // APLR_H #endif // OPENALPR_APLR_H

View File

@@ -18,8 +18,8 @@
*/ */
#ifndef ALPRIMPL_H #ifndef OPENALPR_ALPRIMPL_H
#define ALPRIMPL_H #define OPENALPR_ALPRIMPL_H
#include <list> #include <list>
#include <sstream> #include <sstream>
@@ -163,4 +163,4 @@ class PlateDispatcher
}; };
#endif // ALPRIMPL_H #endif // OPENALPR_ALPRIMPL_H

View File

@@ -17,8 +17,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#ifndef BINARIZEWOLF_H #ifndef OPENALPR_BINARIZEWOLF_H
#define BINARIZEWOLF_H #define OPENALPR_BINARIZEWOLF_H
#include "support/filesystem.h" #include "support/filesystem.h"
@@ -47,4 +47,4 @@ enum NiblackVersion
void NiblackSauvolaWolfJolion (Mat im, Mat output, NiblackVersion version, void NiblackSauvolaWolfJolion (Mat im, Mat output, NiblackVersion version,
int winx, int winy, float k); int winx, int winy, float k);
#endif // BINARIZEWOLF_H #endif // OPENALPR_BINARIZEWOLF_H

View File

@@ -17,8 +17,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#ifndef CHARACTERANALYSIS_H #ifndef OPENALPR_CHARACTERANALYSIS_H
#define CHARACTERANALYSIS_H #define OPENALPR_CHARACTERANALYSIS_H
#include "opencv2/imgproc/imgproc.hpp" #include "opencv2/imgproc/imgproc.hpp"
#include "constants.h" #include "constants.h"
@@ -91,4 +91,4 @@ class CharacterAnalysis
}; };
#endif // CHARACTERANALYSIS_H #endif // OPENALPR_CHARACTERANALYSIS_H

View File

@@ -17,8 +17,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#ifndef CHARACTERREGION_H #ifndef OPENALPR_CHARACTERREGION_H
#define CHARACTERREGION_H #define OPENALPR_CHARACTERREGION_H
#include "opencv2/imgproc/imgproc.hpp" #include "opencv2/imgproc/imgproc.hpp"
#include "constants.h" #include "constants.h"
@@ -78,4 +78,4 @@ class CharacterRegion
}; };
#endif // CHARACTERREGION_H #endif // OPENALPR_CHARACTERREGION_H

View File

@@ -17,8 +17,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#ifndef CHARACTERSEGMENTER_H #ifndef OPENALPR_CHARACTERSEGMENTER_H
#define CHARACTERSEGMENTER_H #define OPENALPR_CHARACTERSEGMENTER_H
#include "opencv2/imgproc/imgproc.hpp" #include "opencv2/imgproc/imgproc.hpp"
#include "constants.h" #include "constants.h"
@@ -98,4 +98,4 @@ class CharacterSegmenter
vector<Point> getEncapsulatingLines(Mat img, vector<vector<Point> > contours, vector<bool> goodIndices); vector<Point> getEncapsulatingLines(Mat img, vector<vector<Point> > contours, vector<bool> goodIndices);
}; };
#endif // CHARACTERSEGMENTER_H #endif // OPENALPR_CHARACTERSEGMENTER_H

View File

@@ -17,8 +17,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#ifndef COLORFILTER_H #ifndef OPENALPR_COLORFILTER_H
#define COLORFILTER_H #define OPENALPR_COLORFILTER_H
#include <iomanip> #include <iomanip>
#include "opencv2/imgproc/imgproc.hpp" #include "opencv2/imgproc/imgproc.hpp"
@@ -56,4 +56,4 @@ class ColorFilter
int getMajorityOpinion(vector<float> values, float minPercentAgreement, float maxValDifference); int getMajorityOpinion(vector<float> values, float minPercentAgreement, float maxValDifference);
}; };
#endif // COLORFILTER_H #endif // OPENALPR_COLORFILTER_H

View File

@@ -18,8 +18,8 @@
*/ */
#ifndef CONFIG_H #ifndef OPENALPR_CONFIG_H
#define CONFIG_H #define OPENALPR_CONFIG_H
#include "simpleini/simpleini.h" #include "simpleini/simpleini.h"
@@ -129,4 +129,4 @@ private:
}; };
#endif // CONFIG_H #endif // OPENALPR_CONFIG_H

View File

@@ -16,6 +16,10 @@
* You should have received a copy of the GNU Affero General Public License * You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#ifndef OPENALPR_CONSTANTS_H
#define OPENALPR_CONSTANTS_H
#define OPENALPR_MAJOR_VERSION 1 #define OPENALPR_MAJOR_VERSION 1
#define OPENALPR_MINOR_VERSION 1 #define OPENALPR_MINOR_VERSION 1
#define OPENALPR_PATCH_VERSION 0 #define OPENALPR_PATCH_VERSION 0
@@ -30,3 +34,5 @@
#endif #endif
#define ENV_VARIABLE_RUNTIME_DIR "OPENALPR_RUNTIME_DIR" #define ENV_VARIABLE_RUNTIME_DIR "OPENALPR_RUNTIME_DIR"
#endif // OPENALPR_CONSTANTS_H

View File

@@ -17,8 +17,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#ifndef FEATUREMATCHER_H #ifndef OPENALPR_FEATUREMATCHER_H
#define FEATUREMATCHER_H #define OPENALPR_FEATUREMATCHER_H
#include "opencv2/calib3d/calib3d.hpp" #include "opencv2/calib3d/calib3d.hpp"
#include "opencv2/imgproc/imgproc.hpp" #include "opencv2/imgproc/imgproc.hpp"
@@ -76,4 +76,4 @@ class FeatureMatcher
}; };
#endif // FEATUREMATCHER_H #endif // OPENALPR_FEATUREMATCHER_H

View File

@@ -17,8 +17,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#ifndef STAGE2_H #ifndef OPENALPR_LICENSEPLATECANDIDATE_H
#define STAGE2_H #define OPENALPR_LICENSEPLATECANDIDATE_H
#include <iostream> #include <iostream>
#include <stdio.h> #include <stdio.h>
@@ -72,4 +72,4 @@ class LicensePlateCandidate
}; };
#endif // STAGE2_H #endif // OPENALPR_LICENSEPLATECANDIDATE_H

View File

@@ -17,8 +17,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#ifndef OCR_H #ifndef OPENALPR_OCR_H
#define OCR_H #define OPENALPR_OCR_H
#include <iostream> #include <iostream>
#include <stdio.h> #include <stdio.h>
@@ -56,4 +56,4 @@ class OCR
}; };
#endif // OCR_H #endif // OPENALPR_OCR_H

View File

@@ -17,8 +17,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#ifndef PLATECORNERS_H #ifndef OPENALPR_PLATECORNERS_H
#define PLATECORNERS_H #define OPENALPR_PLATECORNERS_H
#include "opencv2/imgproc/imgproc.hpp" #include "opencv2/imgproc/imgproc.hpp"
#include "characterregion.h" #include "characterregion.h"
@@ -75,4 +75,4 @@ class PlateCorners
}; };
#endif // PLATELINES_H #endif // OPENALPR_PLATELINES_H

View File

@@ -17,8 +17,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#ifndef PLATELINES_H #ifndef OPENALPR_PLATELINES_H
#define PLATELINES_H #define OPENALPR_PLATELINES_H
#include "opencv2/highgui/highgui.hpp" #include "opencv2/highgui/highgui.hpp"
#include "opencv2/imgproc/imgproc.hpp" #include "opencv2/imgproc/imgproc.hpp"
@@ -53,4 +53,4 @@ class PlateLines
vector<LineSegment> getLines(Mat edges, float sensitivityMultiplier, bool vertical); vector<LineSegment> getLines(Mat edges, float sensitivityMultiplier, bool vertical);
}; };
#endif // PLATELINES_H #endif // OPENALPR_PLATELINES_H

View File

@@ -17,8 +17,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#ifndef POSTPROCESS_H #ifndef OPENALPR_POSTPROCESS_H
#define POSTPROCESS_H #define OPENALPR_POSTPROCESS_H
#include "TRexpp.h" #include "TRexpp.h"
#include "constants.h" #include "constants.h"
@@ -125,4 +125,4 @@ class LetterScores
vector<float> scores; vector<float> scores;
}; };
*/ */
#endif // POSTPROCESS_H #endif // OPENALPR_POSTPROCESS_H

View File

@@ -17,8 +17,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#ifndef REGIONDETECTOR_H #ifndef OPENALPR_REGIONDETECTOR_H
#define REGIONDETECTOR_H #define OPENALPR_REGIONDETECTOR_H
#include <iostream> #include <iostream>
#include <stdio.h> #include <stdio.h>
@@ -62,4 +62,4 @@ class RegionDetector
vector<PlateRegion> aggregateRegions(vector<Rect> regions); vector<PlateRegion> aggregateRegions(vector<Rect> regions);
}; };
#endif // REGIONDETECTOR_H #endif // OPENALPR_REGIONDETECTOR_H

View File

@@ -17,8 +17,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#ifndef STATEIDENTIFIER_H #ifndef OPENALPR_STATEIDENTIFIER_H
#define STATEIDENTIFIER_H #define OPENALPR_STATEIDENTIFIER_H
#include "opencv2/imgproc/imgproc.hpp" #include "opencv2/imgproc/imgproc.hpp"
#include "constants.h" #include "constants.h"
@@ -47,4 +47,4 @@ class StateIdentifier
}; };
#endif // STATEIDENTIFIER_H #endif // OPENALPR_STATEIDENTIFIER_H

View File

@@ -17,8 +17,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#ifndef UTILITY_H #ifndef OPENALPR_UTILITY_H
#define UTILITY_H #define OPENALPR_UTILITY_H
#include <iostream> #include <iostream>
#include <stdio.h> #include <stdio.h>
@@ -106,4 +106,4 @@ Rect expandRect(Rect original, int expandXPixels, int expandYPixels, int maxX, i
Mat addLabel(Mat input, string label); Mat addLabel(Mat input, string label);
#endif // UTILITY_H #endif // OPENALPR_UTILITY_H

View File

@@ -17,8 +17,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#ifndef VERTICALHISTOGRAM_H #ifndef OPENALPR_VERTICALHISTOGRAM_H
#define VERTICALHISTOGRAM_H #define OPENALPR_VERTICALHISTOGRAM_H
#include "opencv2/imgproc/imgproc.hpp" #include "opencv2/imgproc/imgproc.hpp"
@@ -63,4 +63,4 @@ class VerticalHistogram
HistogramDirection getHistogramDirection(int index); HistogramDirection getHistogramDirection(int index);
}; };
#endif // VERTICALHISTOGRAM_H #endif // OPENALPR_VERTICALHISTOGRAM_H