third_party/exiv2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

removinf usage of EXIV2_DEPRECATED macro

Browse Source 
It can expand to [[deprecated]] which cannot be combined
with result of EXIV2API macro expansion: __attribute__(...)
This commit is contained in:
Michał Walenciak 2019-02-02 09:52:39 +01:00
parent a12986b9b5
commit a7340a3801
9 changed files with 26 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
include/exiv2/asfvideo.hpp
View File

@ -31,7 +31,6 @@
#include "exiv2lib_export.h"
// included header files
#include "exiv2lib_compiler_detection.h"
#include "image.hpp"
namespace Exiv2 {
@ -47,7 +46,7 @@ namespace Exiv2 {
/*!
@brief Class to access ASF video files.
*/
class EXIV2_DEPRECATED EXIV2API AsfVideo:public Image
class EXIV2LIB_DEPRECATED_EXPORT AsfVideo:public Image
{
public:
//! @name Creators
@ -170,10 +169,10 @@ namespace Exiv2 {
Caller owns the returned object and the auto-pointer ensures that
it will be deleted.
*/
EXIV2_DEPRECATED EXIV2API Image::AutoPtr newAsfInstance(BasicIo::AutoPtr io, bool create);
EXIV2LIB_DEPRECATED_EXPORT Image::AutoPtr newAsfInstance(BasicIo::AutoPtr io, bool create);
//! Check if the file iIo is a Windows Asf Video.
EXIV2_DEPRECATED EXIV2API bool isAsfType(BasicIo& iIo, bool advance);
EXIV2LIB_DEPRECATED_EXPORT bool isAsfType(BasicIo& iIo, bool advance);
} // namespace Exiv2

3
include/exiv2/basicio.hpp
View File

@ -27,7 +27,6 @@
#include "exiv2lib_export.h"
// included header files
#include "exiv2lib_compiler_detection.h"
#include "types.hpp"
// + standard includes
@ -1113,7 +1112,7 @@ namespace Exiv2 {
@brief Provides the ssh read/write access and sftp read access for the RemoteIo.
This class is based on libssh.
*/
class EXIV2_DEPRECATED EXIV2API SshIo : public RemoteIo {
class EXIV2LIB_DEPRECATED_EXPORT SshIo : public RemoteIo {
public:
//! @name Creators
//@{

7
include/exiv2/epsimage.hpp
View File

@ -38,7 +38,6 @@
#include "exiv2lib_export.h"
// included header files
#include "exiv2lib_compiler_detection.h"
#include "image.hpp"
// *****************************************************************************
@ -57,7 +56,7 @@ namespace Exiv2
/*!
@brief Class to access EPS images.
*/
class EXIV2_DEPRECATED EXIV2API EpsImage : public Image {
class EXIV2LIB_DEPRECATED_EXPORT EpsImage : public Image {
public:
//! @name Creators
//@{
@ -115,10 +114,10 @@ namespace Exiv2
Caller owns the returned object and the auto-pointer ensures that
it will be deleted.
*/
EXIV2_DEPRECATED EXIV2API Image::AutoPtr newEpsInstance(BasicIo::AutoPtr io, bool create);
EXIV2LIB_DEPRECATED_EXPORT Image::AutoPtr newEpsInstance(BasicIo::AutoPtr io, bool create);
//! Check if the file iIo is a EPS image.
EXIV2_DEPRECATED EXIV2API bool isEpsType(BasicIo& iIo, bool advance);
EXIV2LIB_DEPRECATED_EXPORT bool isEpsType(BasicIo& iIo, bool advance);
} // namespace Exiv2

9
include/exiv2/matroskavideo.hpp
View File

@ -31,7 +31,6 @@
#include "exiv2lib_export.h"
// included header files
#include "exiv2lib_compiler_detection.h"
#include "image.hpp"
// *****************************************************************************
@ -50,7 +49,7 @@ namespace Exiv2 {
/*!
@brief Helper structure for the Matroska tags lookup table.
*/
struct EXIV2_DEPRECATED MatroskaTags {
struct EXIV2LIB_DEPRECATED MatroskaTags {
uint64_t val_; //!< Tag value
const char* label_; //!< Translation of the tag value
@ -61,7 +60,7 @@ namespace Exiv2 {
/*!
@brief Class to access Matroska video files.
*/
class EXIV2_DEPRECATED EXIV2API MatroskaVideo : public Image {
class EXIV2LIB_DEPRECATED_EXPORT MatroskaVideo : public Image {
public:
//! @name Creators
//@{
@ -146,10 +145,10 @@ namespace Exiv2 {
Caller owns the returned object and the auto-pointer ensures that
it will be deleted.
*/
EXIV2_DEPRECATED EXIV2API Image::AutoPtr newMkvInstance(BasicIo::AutoPtr io, bool create);
EXIV2LIB_DEPRECATED_EXPORT Image::AutoPtr newMkvInstance(BasicIo::AutoPtr io, bool create);
//! Check if the file iIo is a Matroska Video.
EXIV2_DEPRECATED EXIV2API bool isMkvType(BasicIo& iIo, bool advance);
EXIV2LIB_DEPRECATED_EXPORT bool isMkvType(BasicIo& iIo, bool advance);
} // namespace Exiv2

6
include/exiv2/quicktimevideo.hpp
View File

@ -49,7 +49,7 @@ namespace Exiv2 {
/*!
@brief Class to access QuickTime video files.
*/
class EXIV2_DEPRECATED EXIV2API QuickTimeVideo:public Image
class EXIV2LIB_DEPRECATED_EXPORT QuickTimeVideo:public Image
{
public:
//! @name Creators
@ -242,10 +242,10 @@ namespace Exiv2 {
Caller owns the returned object and the auto-pointer ensures that
it will be deleted.
*/
EXIV2_DEPRECATED EXIV2API Image::AutoPtr newQTimeInstance(BasicIo::AutoPtr io, bool create);
EXIV2LIB_DEPRECATED_EXPORT Image::AutoPtr newQTimeInstance(BasicIo::AutoPtr io, bool create);
//! Check if the file iIo is a Quick Time Video.
EXIV2_DEPRECATED EXIV2API bool isQTimeType(BasicIo& iIo, bool advance);
EXIV2LIB_DEPRECATED_EXPORT bool isQTimeType(BasicIo& iIo, bool advance);
} // namespace Exiv2

7
include/exiv2/riffvideo.hpp
View File

@ -32,7 +32,6 @@
// included header files
#include "exif.hpp"
#include "exiv2lib_compiler_detection.h"
#include "image.hpp"
// *****************************************************************************
@ -50,7 +49,7 @@ namespace Exiv2 {
/*!
@brief Class to access RIFF video files.
*/
class EXIV2_DEPRECATED EXIV2API RiffVideo:public Image
class EXIV2LIB_DEPRECATED_EXPORT RiffVideo:public Image
{
public:
//! @name Creators
@ -211,10 +210,10 @@ namespace Exiv2 {
Caller owns the returned object and the auto-pointer ensures that
it will be deleted.
*/
EXIV2_DEPRECATED EXIV2API Image::AutoPtr newRiffInstance(BasicIo::AutoPtr io, bool create);
EXIV2LIB_DEPRECATED_EXPORT Image::AutoPtr newRiffInstance(BasicIo::AutoPtr io, bool create);
//! Check if the file iIo is a Riff Video.
EXIV2_DEPRECATED EXIV2API bool isRiffType(BasicIo& iIo, bool advance);
EXIV2LIB_DEPRECATED_EXPORT bool isRiffType(BasicIo& iIo, bool advance);
} // namespace Exiv2

3
include/exiv2/ssh.hpp
View File

@ -30,7 +30,6 @@
#include <string>
#include "error.hpp"
#include "exiv2lib_compiler_detection.h"
#include "types.hpp"
#include "futils.hpp"
@ -40,7 +39,7 @@ namespace Exiv2 {
It makes the libssh transparent. The functions in this class can
be used without the requirement of understanding libssh.
*/
class EXIV2_DEPRECATED EXIV2API SSH {
class EXIV2LIB_DEPRECATED_EXPORT SSH {
public:
//! @name Creators
//@{

8
include/exiv2/utilsvideo.hpp
View File

@ -21,7 +21,9 @@
#ifndef UTILSVIDEO_HPP_
#define UTILSVIDEO_HPP_
#include "exiv2lib_compiler_detection.h"
#include "exiv2lib_export.h"
#include "exif.hpp"
namespace Exiv2
{
@ -29,7 +31,7 @@ namespace Exiv2
/*!
@brief Class of utility functions used by the video code.
*/
class EXIV2_DEPRECATED UtilsVideo
class EXIV2LIB_DEPRECATED_EXPORT UtilsVideo
{
public:
/*!
@ -61,4 +63,4 @@ namespace Exiv2
} // namespace Exiv2
#endif // #ifndef UTILSVIDEO_HPP_
#endif // #ifndef UTILSVIDEO_HPP_

3
src/utilsvideo.cpp
View File

@ -25,6 +25,9 @@
@date 16-Aug-14, AB: created
*/
// *****************************************************************************
#include "config.h"
#ifdef EXV_ENABLE_VIDEO
#include "utilsvideo.hpp"