mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-08-06 06:26:29 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

videoio: remove throw lists since they are deprecated in cxx11 (and gcc7 produces a warning)

Browse Source
This commit is contained in:
Vladislav Sovrasov 2017-08-18 12:07:24 +03:00
parent 316fb26f5b
commit 2b8f888ea4
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
modules/videoio/src/cap_gphoto2.cpp
View File

@ -184,12 +184,12 @@ protected:
bool & output) const; bool & output) const;
// Widgets // Widgets
void reloadConfig() throw (GPhoto2Exception); void reloadConfig();
CameraWidget * getWidget(int widgetId) const; CameraWidget * getWidget(int widgetId) const;
CameraWidget * findWidgetByName(const char * name) const; CameraWidget * findWidgetByName(const char * name) const;
// Loading // Loading
void readFrameFromFile(CameraFile * file, OutputArray outputFrame) throw (GPhoto2Exception); void readFrameFromFile(CameraFile * file, OutputArray outputFrame);
// Context feedback // Context feedback
friend void ctxErrorFunc(GPContext *, const char *, void *); friend void ctxErrorFunc(GPContext *, const char *, void *);
@ -231,10 +231,8 @@ private:
// Widgets // Widgets
int noOfWidgets; int noOfWidgets;
int widgetDescription(std::ostream &os, CameraWidget * widget) const int widgetDescription(std::ostream &os, CameraWidget * widget) const;
throw (GPhoto2Exception); int collectWidgets(std::ostream &os, CameraWidget * widget);
int collectWidgets(std::ostream &os, CameraWidget * widget)
throw (GPhoto2Exception);
// Messages / debug // Messages / debug
mutable std::ostringstream msgsBuffer; // CV_CAP_PROP_GPHOTO2_FLUSH_MSGS mutable std::ostringstream msgsBuffer; // CV_CAP_PROP_GPHOTO2_FLUSH_MSGS
@ -929,7 +927,7 @@ int DigitalCameraCapture::findDevice(const char * deviceName) const
/** /**
* Load device settings. * Load device settings.
*/ */
void DigitalCameraCapture::reloadConfig() throw (GPhoto2Exception) void DigitalCameraCapture::reloadConfig()
{ {
std::ostringstream widgetInfoListStream; std::ostringstream widgetInfoListStream;
@ -999,7 +997,7 @@ CameraWidget * DigitalCameraCapture::findWidgetByName(
* @FUTURE: RAW format reader. * @FUTURE: RAW format reader.
*/ */
void DigitalCameraCapture::readFrameFromFile(CameraFile * file, OutputArray outputFrame) void DigitalCameraCapture::readFrameFromFile(CameraFile * file, OutputArray outputFrame)
throw (GPhoto2Exception)
{ {
// FUTURE: OpenCV cannot read RAW files right now. // FUTURE: OpenCV cannot read RAW files right now.
const char * data; const char * data;
@ -1022,7 +1020,7 @@ void DigitalCameraCapture::readFrameFromFile(CameraFile * file, OutputArray outp
* then IDs won't be the same) * then IDs won't be the same)
*/ */
int DigitalCameraCapture::widgetDescription(std::ostream &os, int DigitalCameraCapture::widgetDescription(std::ostream &os,
CameraWidget * widget) const throw (GPhoto2Exception) CameraWidget * widget) const
{ {
const char * label, *name, *info; const char * label, *name, *info;
int id, readonly; int id, readonly;
@ -1137,7 +1135,7 @@ int DigitalCameraCapture::widgetDescription(std::ostream &os,
* @return maximum of widget ID * @return maximum of widget ID
*/ */
int DigitalCameraCapture::collectWidgets(std::ostream & os, int DigitalCameraCapture::collectWidgets(std::ostream & os,
CameraWidget * widget) throw (GPhoto2Exception) CameraWidget * widget)
{ {
int id = widgetDescription(os, widget); int id = widgetDescription(os, widget);
os << lineDelimiter; os << lineDelimiter;