From 8640e133aecc20580db7c99ceb5ef98c3785ed5d Mon Sep 17 00:00:00 2001 From: Daniel O'Connell Date: Sun, 14 Aug 2016 11:34:09 +0200 Subject: [PATCH] string -> std::string --- microcr/src/image.cpp | 2 +- microcr/src/image.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/microcr/src/image.cpp b/microcr/src/image.cpp index 7a9f759..14e1e3e 100644 --- a/microcr/src/image.cpp +++ b/microcr/src/image.cpp @@ -75,7 +75,7 @@ Image* Image::cloneEmpty() { return cloned; } -Image* Image::loadImage(string filePath) { +Image* Image::loadImage(std::string filePath) { IplImage* loaded = cvLoadImage(filePath.c_str(), CV_LOAD_IMAGE_GRAYSCALE); diff --git a/microcr/src/image.h b/microcr/src/image.h index db335cd..5831a22 100644 --- a/microcr/src/image.h +++ b/microcr/src/image.h @@ -10,7 +10,7 @@ class Image public: - static Image* loadImage(string filename); + static Image* loadImage(std::string filename); Image(IplImage* p_img); ~Image();