Skip to content

Commit c6daf3a

Browse files
committedJun 23, 2017
added strictest check for aliasing
1 parent b69ea1f commit c6daf3a

File tree

3 files changed

+5
-4
lines changed

3 files changed

+5
-4
lines changed
 

‎QtCampp.pro

+1
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ CONFIG += ptpdevices #enables ptp cameras
1212

1313
QMAKE_CXXFLAGS += -std=c++11 -Wall -Werror=strict-aliasing -fstrict-aliasing -Wctor-dtor-privacy -Werror=delete-non-virtual-dtor
1414
QMAKE_CXXFLAGS += -fexceptions -Werror=return-type -Werror=overloaded-virtual
15+
QMAKE_CXXFLAGS += -Werror=strict-aliasing -Wstrict-aliasing=2
1516

1617
greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
1718

‎devicing/v4l2device.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ v4l2device::devices_list_t v4l2device::list_attached_devices(v4l2device::ListTyp
8080
v4l2_capability cap;
8181
tmp.querycap(cap);
8282
tmp.close();
83-
inf.devname = std::string(utility::union_cast<const char*>(cap.card));
83+
inf.devname = std::string(reinterpret_cast<const char*>(cap.card));
8484
inf.devCaps = cap.device_caps;
8585

8686
res.push_back(inf);
@@ -180,14 +180,14 @@ bool v4l2device::open(const std::string &device)
180180

181181
bool v4l2device::reopen()
182182
{
183-
std::string currName(utility::union_cast<const char*>(m_capability.card));
183+
std::string currName(reinterpret_cast<const char*>(m_capability.card));
184184
std::string d = m_device;
185185
auto ca = m_capability;
186186
bool w = usingWrapper;
187187

188188
auto r = open(d, usingWrapper);
189189

190-
if (r && currName != std::string(utility::union_cast<const char*>(m_capability.card)))
190+
if (r && currName != std::string(reinterpret_cast<const char*>(m_capability.card)))
191191
{
192192
close(); //opened something, but it's other device
193193
r = false;

‎tools/onlinestacker.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ class OnlineStacker : public ILiveFilter
1111
{
1212
public:
1313

14-
using RGBVectorSum = std::vector<uint32_t>;
14+
using RGBVectorSum = std::vector<uint64_t>;
1515
using QueuedElement = RGBVector;
1616
using RGBQueue = std::deque<std::shared_ptr<QueuedElement>>;
1717
private:

0 commit comments

Comments
 (0)
Please sign in to comment.