Skip to content

Commit

Permalink
opencv ifdef fix
Browse files Browse the repository at this point in the history
  • Loading branch information
ahundt committed Jan 16, 2017
1 parent ea562a5 commit ddda9bb
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions src/gpl/gpl.h
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ unsigned long long timeInMicroseconds(void);

double timeInSeconds(void);

#ifdef HAVE_OPENCV
#if defined(HAVE_OPENCV2) || defined(HAVE_OPENCV3)
void colorDepthImage(cv::Mat& imgDepth,
cv::Mat& imgColoredDepth,
float minRange, float maxRange);
Expand All @@ -99,7 +99,7 @@ void fitCircle(const std::vector<cv::Point2d>& points,

std::vector<cv::Point2d> intersectCircles(double x1, double y1, double r1,
double x2, double y2, double r2);
#endif // HAVE_OPENCV
#endif // defined(HAVE_OPENCV2) || defined(HAVE_OPENCV3)

void LLtoUTM(double latitude, double longitude,
double& utmNorthing, double& utmEasting,
Expand Down

0 comments on commit ddda9bb

Please sign in to comment.