artf4107: Uniform initialization syntax introduced

Change-Id: I452b4794d757a0817589ec62b75eda7fbdd74904
This commit is contained in:
Tyler Veness
2015-06-24 01:06:29 -07:00
parent b1befed14f
commit 368ad30d37
179 changed files with 379 additions and 831 deletions

View File

@@ -89,27 +89,27 @@ class AxisCamera : public ErrorBase {
private:
std::thread m_captureThread;
std::string m_cameraHost;
int m_cameraSocket;
int m_cameraSocket = -1;
std::mutex m_captureMutex;
std::mutex m_imageDataMutex;
std::vector<uint8_t> m_imageData;
bool m_freshImage;
bool m_freshImage = false;
int m_brightness;
WhiteBalance m_whiteBalance;
int m_colorLevel;
ExposureControl m_exposureControl;
int m_exposurePriority;
int m_maxFPS;
Resolution m_resolution;
int m_compression;
Rotation m_rotation;
bool m_parametersDirty;
bool m_streamDirty;
int m_brightness = 50;
WhiteBalance m_whiteBalance = kWhiteBalance_Automatic;
int m_colorLevel = 50;
ExposureControl m_exposureControl = kExposureControl_Automatic;
int m_exposurePriority = 50;
int m_maxFPS = 0;
Resolution m_resolution = kResolution_640x480;
int m_compression = 50;
Rotation m_rotation = kRotation_0;
bool m_parametersDirty = true;
bool m_streamDirty = true;
std::mutex m_parametersMutex;
bool m_done;
bool m_done = false;
void Capture();
void ReadImagesFromCamera();

View File

@@ -19,7 +19,7 @@
class BinaryImage : public MonoImage {
public:
BinaryImage();
virtual ~BinaryImage();
virtual ~BinaryImage() = default;
int GetNumberParticles();
ParticleAnalysisReport GetParticleAnalysisReport(int particleNumber);
void GetParticleAnalysisReport(int particleNumber,

View File

@@ -13,7 +13,7 @@
class ColorImage : public ImageBase {
public:
ColorImage(ImageType type);
virtual ~ColorImage();
virtual ~ColorImage() = default;
BinaryImage *ThresholdRGB(int redLow, int redHigh, int greenLow,
int greenHigh, int blueLow, int blueHigh);
BinaryImage *ThresholdHSL(int hueLow, int hueHigh, int saturationLow,

View File

@@ -15,5 +15,5 @@ class HSLImage : public ColorImage {
public:
HSLImage();
HSLImage(const char *fileName);
virtual ~HSLImage();
virtual ~HSLImage() = default;
};

View File

@@ -13,7 +13,7 @@
class MonoImage : public ImageBase {
public:
MonoImage();
virtual ~MonoImage();
virtual ~MonoImage() = default;
std::vector<EllipseMatch> *DetectEllipses(
EllipseDescriptor *ellipseDescriptor, CurveOptions *curveOptions,

View File

@@ -15,5 +15,5 @@ class RGBImage : public ColorImage {
public:
RGBImage();
RGBImage(const char *fileName);
virtual ~RGBImage();
virtual ~RGBImage() = default;
};