EXV_ENABLE_AUDIO_VIDEO.patch

Thomas Beutlich, 26 Apr 2015 19:22

Download (7.96 KB)

View differences:

include/exiv2/exv_msvc-webready.h (working copy)
72 72

  
73 73
#endif /* !EXV_COMMERCIAL_VERSION */
74 74

  
75
/* Define to 1 to enable audio/video metadata support. */
76
# undef EXV_ENABLE_AUDIO_VIDEO
77

  
75 78
/* Define to 1 if you have the `iconv' function. */
76 79
# undef EXV_HAVE_ICONV
77 80

  
include/exiv2/exv_msvc.h (working copy)
72 72

  
73 73
#endif /* !EXV_COMMERCIAL_VERSION */
74 74

  
75
/* Define to 1 to enable audio/video metadata support. */
76
# undef EXV_ENABLE_AUDIO_VIDEO
77

  
75 78
/* Define to 1 if you have the `iconv' function. */
76 79
# undef EXV_HAVE_ICONV
77 80

  
src/asfvideo.cpp (working copy)
31 31

  
32 32
// *****************************************************************************
33 33
// included header files
34
#ifdef _MSC_VER
35
# include "exv_msvc.h"
36
#else
37
# include "exv_conf.h"
38
#endif
39

  
40
#ifdef EXV_ENABLE_AUDIO_VIDEO
34 41
#include "asfvideo.hpp"
35 42
#include "futils.hpp"
36 43
#include "basicio.hpp"
......
815 822
    }
816 823

  
817 824
}                                       // namespace Exiv2
825
#endif // EXV_ENABLE_AUDIO_VIDEO
src/image.cpp (working copy)
55 55
#include "tgaimage.hpp"
56 56
#include "bmpimage.hpp"
57 57
#include "jp2image.hpp"
58
#ifdef EXV_ENABLE_AUDIO_VIDEO
58 59
#include "matroskavideo.hpp"
59 60
#include "quicktimevideo.hpp"
60 61
#include "riffvideo.hpp"
61 62
#include "asfvideo.hpp"
63
#endif // EXV_ENABLE_AUDIO_VIDEO
62 64
#include "rw2image.hpp"
63 65
#include "pgfimage.hpp"
64 66
#include "xmpsidecar.hpp"
......
128 130
        { ImageType::tga,  newTgaInstance,  isTgaType,  amNone,      amNone,      amNone,      amNone      },
129 131
        { ImageType::bmp,  newBmpInstance,  isBmpType,  amNone,      amNone,      amNone,      amNone      },
130 132
        { ImageType::jp2,  newJp2Instance,  isJp2Type,  amReadWrite, amReadWrite, amReadWrite, amNone      },
133
#ifdef EXV_ENABLE_AUDIO_VIDEO
131 134
        { ImageType::qtime,newQTimeInstance,isQTimeType,amRead,      amNone,      amRead,      amNone      },
132 135
        { ImageType::riff, newRiffInstance, isRiffType, amRead,      amNone,      amRead,      amNone      },
133 136
        { ImageType::asf,  newAsfInstance,  isAsfType,  amNone,      amNone,      amRead,      amNone      },
134 137
        { ImageType::mkv,  newMkvInstance,  isMkvType,  amNone,      amNone,      amRead,      amNone      },
135
        // End of list marker
138
#endif // EXV_ENABLE_AUDIO_VIDEO
139
		// End of list marker
136 140
        { ImageType::none, 0,               0,          amNone,      amNone,      amNone,      amNone      }
137 141
    };
138 142

  
src/matroskavideo.cpp (working copy)
31 31

  
32 32
// *****************************************************************************
33 33
// included header files
34
#ifdef _MSC_VER
35
# include "exv_msvc.h"
36
#else
37
# include "exv_conf.h"
38
#endif
39

  
40
#ifdef EXV_ENABLE_AUDIO_VIDEO
34 41
#include "matroskavideo.hpp"
35 42
#include "futils.hpp"
36 43
#include "basicio.hpp"
......
764 771
    }
765 772

  
766 773
}                                       // namespace Exiv2
774
#endif // EXV_ENABLE_AUDIO_VIDEO
src/properties.cpp (working copy)
97 97
    extern const XmpPropertyInfo xmpMicrosoftPhotoRegionInfo[];
98 98
    extern const XmpPropertyInfo xmpMWGRegionsInfo[];
99 99
    extern const XmpPropertyInfo xmpMWGKeywordInfo[];
100
#ifdef EXV_ENABLE_AUDIO_VIDEO
100 101
    extern const XmpPropertyInfo xmpVideoInfo[];
101 102
    extern const XmpPropertyInfo xmpAudioInfo[];
103
#endif // EXV_ENABLE_AUDIO_VIDEO
102 104
    extern const XmpPropertyInfo xmpDwCInfo[];
103 105
    extern const XmpPropertyInfo xmpDctermsInfo[];
104 106
    extern const XmpPropertyInfo xmpLrInfo[];
105
    extern const XmpPropertyInfo xmpAcdseeInfo[];
107
    extern const XmpPropertyInfo xmpAcdseeInfo[];  
106 108
    extern const XmpPropertyInfo xmpGPanoInfo[];    
107 109

  
108 110
    extern const XmpNsInfo xmpNsInfo[] = {
......
136 138
        { "http://ns.microsoft.com/photo/1.2/t/Region#",     "MPReg", xmpMicrosoftPhotoRegionInfo,     N_("Microsoft Photo Region schema")    },
137 139
        { "http://www.metadataworkinggroup.com/schemas/regions/",  "mwg-rs", xmpMWGRegionsInfo, N_("Metadata Working Group Regions schema")   },
138 140
        { "http://www.metadataworkinggroup.com/schemas/keywords/", "mwg-kw", xmpMWGKeywordInfo, N_("Metadata Working Group Keywords schema")  },
141
#ifdef EXV_ENABLE_AUDIO_VIDEO
139 142
        { "http://www.video",                                  "video",          xmpVideoInfo,     N_("XMP Extended Video schema")            },
140 143
        { "http://www.audio",                                  "audio",          xmpAudioInfo,     N_("XMP Extended Audio schema")            },
144
#endif // EXV_ENABLE_AUDIO_VIDEO
141 145
        { "http://rs.tdwg.org/dwc/index.htm",                     "dwc",            xmpDwCInfo,       N_("XMP Darwin Core schema")     		  },
142 146
        { "http://purl.org/dc/terms/",                      "dcterms",       xmpDctermsInfo,   N_("Qualified Dublin Core schema")             }, // Note: used as properties under dwc:record
143 147
        { "http://ns.acdsee.com/iptc/1.0/",                 "acdsee",       xmpAcdseeInfo,      N_("ACDSee XMP schema")                       },
......
1050 1054
        { 0, 0, 0, invalidTypeId, xmpInternal, 0 }
1051 1055
    };
1052 1056

  
1057
#ifdef EXV_ENABLE_AUDIO_VIDEO
1053 1058
    extern const XmpPropertyInfo xmpVideoInfo[] = {
1054 1059
        { "Album",                  N_("Album"),                            "Text",                     xmpText, xmpExternal, N_("The name of the album.")   },
1055 1060
        { "ArchivalLocation",       N_("Archival Location"),                "Text",                     xmpText, xmpExternal, N_("Information about the Archival Location.")   },
......
1443 1448
        { "VendorID",           N_("Vendor ID"),                    "Text",                  xmpText, xmpExternal, N_("A 32-bit integer that specifies the developer of the compressor that generated the compressed data. Often this field contains 'appl' to indicate Apple Computer, Inc.")   },
1444 1449
        { 0, 0, 0, invalidTypeId, xmpInternal, 0 }
1445 1450
    };
1451
#endif // EXV_ENABLE_AUDIO_VIDEO
1446 1452

  
1447 1453
    extern const XmpPropertyInfo xmpDctermsInfo[] = {
1448 1454
            // dcterms properties used by DwC under the Record Class.
src/quicktimevideo.cpp (working copy)
31 31

  
32 32
// *****************************************************************************
33 33
// included header files
34
#ifdef _MSC_VER
35
# include "exv_msvc.h"
36
#else
37
# include "exv_conf.h"
38
#endif
39

  
40
#ifdef EXV_ENABLE_AUDIO_VIDEO
34 41
#include "quicktimevideo.hpp"
35 42
#include "futils.hpp"
36 43
#include "basicio.hpp"
......
1655 1662
    }
1656 1663

  
1657 1664
}                                       // namespace Exiv2
1658

  
1665
#endif // EXV_ENABLE_AUDIO_VIDEO
src/riffvideo.cpp (working copy)
31 31

  
32 32
// *****************************************************************************
33 33
// included header files
34
#ifdef _MSC_VER
35
# include "exv_msvc.h"
36
#else
37
# include "exv_conf.h"
38
#endif
39

  
40
#ifdef EXV_ENABLE_AUDIO_VIDEO
34 41
#include "riffvideo.hpp"
35 42
#include "futils.hpp"
36 43
#include "basicio.hpp"
......
1249 1256
    }
1250 1257

  
1251 1258
}                                       // namespace Exiv2
1259
#endif // EXV_ENABLE_AUDIO_VIDEO
Redmine Appliance - Powered by TurnKey Linux