fix_1508_enableBMMF_effort2

clanmills · clanmills · commit 4a8d365e8040 · 2021-04-03T11:03:31.000+01:00
diff --git a/README.md b/README.md
@@ -587,7 +587,7 @@ int main(int argc, const char* argv[])
 {
     Exiv2::XmpParser::initialize();
     ::atexit(Exiv2::XmpParser::terminate);
-#if EXIV2_ENABLE_BMFF
+#ifdef EXV_ENABLE_BMFF
     Exiv2::enableBMFF(true);
 #endif
     ...
@@ -608,7 +608,7 @@ The exiv2 command-line program and sample applications call the following at the
 ```cpp
     Exiv2::XmpParser::initialize();
     ::atexit(Exiv2::XmpParser::terminate);
-#if EXIV2_ENABLE_BMFF
+#ifdef EXV_ENABLE_BMFF
     Exiv2::enableBMFF(true);
 #endif
 ```
diff --git a/samples/addmoddel.cpp b/samples/addmoddel.cpp
@@ -29,7 +29,7 @@ int main(int argc, char* const argv[])
 try {
     Exiv2::XmpParser::initialize();
     ::atexit(Exiv2::XmpParser::terminate);
-#ifdef EXIV2_ENABLE_BMFF
+#ifdef EXV_ENABLE_BMFF
     Exiv2::enableBMFF();
 #endif
 
diff --git a/samples/conntest.cpp b/samples/conntest.cpp
@@ -132,7 +132,7 @@ int main(int argc,const char** argv)
 {
     Exiv2::XmpParser::initialize();
     ::atexit(Exiv2::XmpParser::terminate);
-#ifdef EXIV2_ENABLE_BMFF
+#ifdef EXV_ENABLE_BMFF
     Exiv2::enableBMFF();
 #endif
 
diff --git a/samples/convert-test.cpp b/samples/convert-test.cpp
@@ -29,7 +29,7 @@ int main(int argc, char* const argv[])
 try {
     Exiv2::XmpParser::initialize();
     ::atexit(Exiv2::XmpParser::terminate);
-#ifdef EXIV2_ENABLE_BMFF
+#ifdef EXV_ENABLE_BMFF
     Exiv2::enableBMFF();
 #endif
 
diff --git a/samples/easyaccess-test.cpp b/samples/easyaccess-test.cpp
@@ -73,7 +73,7 @@ int main(int argc, char **argv)
 try {
     Exiv2::XmpParser::initialize();
     ::atexit(Exiv2::XmpParser::terminate);
-#ifdef EXIV2_ENABLE_BMFF
+#ifdef EXV_ENABLE_BMFF
     Exiv2::enableBMFF();
 #endif
 
diff --git a/samples/exifcomment.cpp b/samples/exifcomment.cpp
@@ -32,7 +32,7 @@ int main(int argc, char* const argv[])
 try {
     Exiv2::XmpParser::initialize();
     ::atexit(Exiv2::XmpParser::terminate);
-#ifdef EXIV2_ENABLE_BMFF
+#ifdef EXV_ENABLE_BMFF
     Exiv2::enableBMFF();
 #endif
 
diff --git a/samples/exifdata-test.cpp b/samples/exifdata-test.cpp
@@ -34,7 +34,7 @@ int main(int argc, char* const argv[])
 try {
     Exiv2::XmpParser::initialize();
     ::atexit(Exiv2::XmpParser::terminate);
-#ifdef EXIV2_ENABLE_BMFF
+#ifdef EXV_ENABLE_BMFF
     Exiv2::enableBMFF();
 #endif
 
diff --git a/samples/exifdata.cpp b/samples/exifdata.cpp
@@ -171,7 +171,7 @@ int main(int argc,const char* argv[])
 {
 	Exiv2::XmpParser::initialize();
 	::atexit(Exiv2::XmpParser::terminate);
-#ifdef EXIV2_ENABLE_BMFF
+#ifdef EXV_ENABLE_BMFF
     Exiv2::enableBMFF();
 #endif
 
diff --git a/samples/exifprint.cpp b/samples/exifprint.cpp
@@ -46,7 +46,7 @@ int _tmain(int argc, _tchar* const argv[])
 try {
     Exiv2::XmpParser::initialize();
     ::atexit(Exiv2::XmpParser::terminate);
-#ifdef EXIV2_ENABLE_BMFF
+#ifdef EXV_ENABLE_BMFF
     Exiv2::enableBMFF();
 #endif
 
diff --git a/samples/exifvalue.cpp b/samples/exifvalue.cpp
@@ -30,7 +30,7 @@ int main(int argc, char* const argv[])
 {
     Exiv2::XmpParser::initialize();
     ::atexit(Exiv2::XmpParser::terminate);
-#ifdef EXIV2_ENABLE_BMFF
+#ifdef EXV_ENABLE_BMFF
     Exiv2::enableBMFF();
 #endif
 
diff --git a/samples/exiv2json.cpp b/samples/exiv2json.cpp
@@ -287,7 +287,7 @@ int main(int argc, char* const argv[])
 {
     Exiv2::XmpParser::initialize();
     ::atexit(Exiv2::XmpParser::terminate);
-#ifdef EXIV2_ENABLE_BMFF
+#ifdef EXV_ENABLE_BMFF
     Exiv2::enableBMFF();
 #endif
 
diff --git a/samples/geotag.cpp b/samples/geotag.cpp
@@ -783,7 +783,7 @@ int main(int argc,const char* argv[])
 {
     Exiv2::XmpParser::initialize();
     ::atexit(Exiv2::XmpParser::terminate);
-#ifdef EXIV2_ENABLE_BMFF
+#ifdef EXV_ENABLE_BMFF
     Exiv2::enableBMFF();
 #endif
 
diff --git a/samples/getopt-test.cpp b/samples/getopt-test.cpp
@@ -103,7 +103,7 @@ int main(int argc, char** const argv)
 {
 	Exiv2::XmpParser::initialize();
 	::atexit(Exiv2::XmpParser::terminate);
-#ifdef EXIV2_ENABLE_BMFF
+#ifdef EXV_ENABLE_BMFF
     Exiv2::enableBMFF();
 #endif
 
diff --git a/samples/httptest.cpp b/samples/httptest.cpp
@@ -39,7 +39,7 @@ int main(int argc,const char** argv)
 {
     Exiv2::XmpParser::initialize();
     ::atexit(Exiv2::XmpParser::terminate);
-#ifdef EXIV2_ENABLE_BMFF
+#ifdef EXV_ENABLE_BMFF
     Exiv2::enableBMFF();
 #endif
 
diff --git a/samples/ini-test.cpp b/samples/ini-test.cpp
@@ -34,7 +34,7 @@ int main()
 {
     Exiv2::XmpParser::initialize();
     ::atexit(Exiv2::XmpParser::terminate);
-#ifdef EXIV2_ENABLE_BMFF
+#ifdef EXV_ENABLE_BMFF
     Exiv2::enableBMFF();
 #endif
 
diff --git a/samples/iotest.cpp b/samples/iotest.cpp
@@ -41,7 +41,7 @@ int main(int argc, char* const argv[])
 {
     Exiv2::XmpParser::initialize();
     ::atexit(Exiv2::XmpParser::terminate);
-#ifdef EXIV2_ENABLE_BMFF
+#ifdef EXV_ENABLE_BMFF
     Exiv2::enableBMFF();
 #endif
 
diff --git a/samples/iptceasy.cpp b/samples/iptceasy.cpp
@@ -29,7 +29,7 @@ int main(int argc, char* const argv[])
 try {
     Exiv2::XmpParser::initialize();
     ::atexit(Exiv2::XmpParser::terminate);
-#ifdef EXIV2_ENABLE_BMFF
+#ifdef EXV_ENABLE_BMFF
     Exiv2::enableBMFF();
 #endif
 
diff --git a/samples/iptcprint.cpp b/samples/iptcprint.cpp
@@ -29,7 +29,7 @@ int main(int argc, char* const argv[])
 try {
     Exiv2::XmpParser::initialize();
     ::atexit(Exiv2::XmpParser::terminate);
-#ifdef EXIV2_ENABLE_BMFF
+#ifdef EXV_ENABLE_BMFF
     Exiv2::enableBMFF();
 #endif
 
diff --git a/samples/iptctest.cpp b/samples/iptctest.cpp
@@ -36,7 +36,7 @@ int main(int argc, char* const argv[])
 {
     Exiv2::XmpParser::initialize();
     ::atexit(Exiv2::XmpParser::terminate);
-#ifdef EXIV2_ENABLE_BMFF
+#ifdef EXV_ENABLE_BMFF
     Exiv2::enableBMFF();
 #endif
 
diff --git a/samples/key-test.cpp b/samples/key-test.cpp
@@ -29,7 +29,7 @@ int main()
 {
     Exiv2::XmpParser::initialize();
     ::atexit(Exiv2::XmpParser::terminate);
-#ifdef EXIV2_ENABLE_BMFF
+#ifdef EXV_ENABLE_BMFF
     Exiv2::enableBMFF();
 #endif
 
diff --git a/samples/largeiptc-test.cpp b/samples/largeiptc-test.cpp
@@ -29,7 +29,7 @@ int main(int argc, char* const argv[])
     try {
         Exiv2::XmpParser::initialize();
         ::atexit(Exiv2::XmpParser::terminate);
-#ifdef EXIV2_ENABLE_BMFF
+#ifdef EXV_ENABLE_BMFF
         Exiv2::enableBMFF();
 #endif
 
diff --git a/samples/metacopy.cpp b/samples/metacopy.cpp
@@ -33,7 +33,7 @@ int main(int argc, char* const argv[])
 try {
     Exiv2::XmpParser::initialize();
     ::atexit(Exiv2::XmpParser::terminate);
-#ifdef EXIV2_ENABLE_BMFF
+#ifdef EXV_ENABLE_BMFF
     Exiv2::enableBMFF();
 #endif
 
diff --git a/samples/mmap-test.cpp b/samples/mmap-test.cpp
@@ -30,7 +30,7 @@ int main(int argc, char* const argv[])
 try {
     Exiv2::XmpParser::initialize();
     ::atexit(Exiv2::XmpParser::terminate);
-#ifdef EXIV2_ENABLE_BMFF
+#ifdef EXV_ENABLE_BMFF
     Exiv2::enableBMFF();
 #endif
 
diff --git a/samples/mrwthumb.cpp b/samples/mrwthumb.cpp
@@ -28,7 +28,7 @@ int main(int argc, char* const argv[])
 {
     Exiv2::XmpParser::initialize();
     ::atexit(Exiv2::XmpParser::terminate);
-#ifdef EXIV2_ENABLE_BMFF
+#ifdef EXV_ENABLE_BMFF
     Exiv2::enableBMFF();
 #endif
 
diff --git a/samples/mt-test.cpp b/samples/mt-test.cpp
@@ -82,7 +82,7 @@ int main(int argc,const char* argv[])
 {
 	Exiv2::XmpParser::initialize();
 	::atexit(Exiv2::XmpParser::terminate);
-#ifdef EXIV2_ENABLE_BMFF
+#ifdef EXV_ENABLE_BMFF
     Exiv2::enableBMFF();
 #endif
 
diff --git a/samples/path-test.cpp b/samples/path-test.cpp
@@ -31,7 +31,7 @@ int main(int argc, char* const argv[])
 {
     Exiv2::XmpParser::initialize();
     ::atexit(Exiv2::XmpParser::terminate);
-#ifdef EXIV2_ENABLE_BMFF
+#ifdef EXV_ENABLE_BMFF
     Exiv2::enableBMFF();
 #endif
 
diff --git a/samples/prevtest.cpp b/samples/prevtest.cpp
@@ -29,7 +29,7 @@ int main(int argc, char* const argv[])
 try {
     Exiv2::XmpParser::initialize();
     ::atexit(Exiv2::XmpParser::terminate);
-#ifdef EXIV2_ENABLE_BMFF
+#ifdef EXV_ENABLE_BMFF
     Exiv2::enableBMFF();
 #endif
 
diff --git a/samples/remotetest.cpp b/samples/remotetest.cpp
@@ -31,7 +31,7 @@ int main(int argc, char* const argv[])
 try {
     Exiv2::XmpParser::initialize();
     ::atexit(Exiv2::XmpParser::terminate);
-#ifdef EXIV2_ENABLE_BMFF
+#ifdef EXV_ENABLE_BMFF
     Exiv2::enableBMFF();
 #endif
 
diff --git a/samples/stringto-test.cpp b/samples/stringto-test.cpp
@@ -59,7 +59,7 @@ int main()
 {
     Exiv2::XmpParser::initialize();
     ::atexit(Exiv2::XmpParser::terminate);
-#ifdef EXIV2_ENABLE_BMFF
+#ifdef EXV_ENABLE_BMFF
     Exiv2::enableBMFF();
 #endif
 
diff --git a/samples/taglist.cpp b/samples/taglist.cpp
@@ -29,7 +29,7 @@ int main(int argc, char* argv[])
 {
     Exiv2::XmpParser::initialize();
     ::atexit(Exiv2::XmpParser::terminate);
-#ifdef EXIV2_ENABLE_BMFF
+#ifdef EXV_ENABLE_BMFF
     Exiv2::enableBMFF();
 #endif
 
diff --git a/samples/tiff-test.cpp b/samples/tiff-test.cpp
@@ -40,7 +40,7 @@ int main(int argc, char* const argv[])
 try {
     Exiv2::XmpParser::initialize();
     ::atexit(Exiv2::XmpParser::terminate);
-#ifdef EXIV2_ENABLE_BMFF
+#ifdef EXV_ENABLE_BMFF
     Exiv2::enableBMFF();
 #endif
 
diff --git a/samples/tiffaddpath-test.cpp b/samples/tiffaddpath-test.cpp
@@ -82,7 +82,7 @@ int main(int argc, char* const argv[])
 {
     Exiv2::XmpParser::initialize();
     ::atexit(Exiv2::XmpParser::terminate);
-#ifdef EXIV2_ENABLE_BMFF
+#ifdef EXV_ENABLE_BMFF
     Exiv2::enableBMFF();
 #endif
 
diff --git a/samples/toexv.cpp b/samples/toexv.cpp
@@ -41,7 +41,7 @@ int main(int argc, char* const argv[])
 {
     Exiv2::XmpParser::initialize();
     ::atexit(Exiv2::XmpParser::terminate);
-#ifdef EXIV2_ENABLE_BMFF
+#ifdef EXV_ENABLE_BMFF
     Exiv2::enableBMFF();
 #endif
 
diff --git a/samples/werror-test.cpp b/samples/werror-test.cpp
@@ -29,7 +29,7 @@ int main()
 {
     Exiv2::XmpParser::initialize();
     ::atexit(Exiv2::XmpParser::terminate);
-#ifdef EXIV2_ENABLE_BMFF
+#ifdef EXV_ENABLE_BMFF
     Exiv2::enableBMFF();
 #endif
 
diff --git a/samples/write-test.cpp b/samples/write-test.cpp
@@ -44,7 +44,7 @@ int main(int argc, char* const argv[])
 {
     Exiv2::XmpParser::initialize();
     ::atexit(Exiv2::XmpParser::terminate);
-#ifdef EXIV2_ENABLE_BMFF
+#ifdef EXV_ENABLE_BMFF
     Exiv2::enableBMFF();
 #endif
 
diff --git a/samples/write2-test.cpp b/samples/write2-test.cpp
@@ -33,7 +33,7 @@ int main(int argc, char* const argv[])
 {
     Exiv2::XmpParser::initialize();
     ::atexit(Exiv2::XmpParser::terminate);
-#ifdef EXIV2_ENABLE_BMFF
+#ifdef EXV_ENABLE_BMFF
     Exiv2::enableBMFF();
 #endif
 
diff --git a/samples/xmpdump.cpp b/samples/xmpdump.cpp
@@ -29,7 +29,7 @@ int main(int argc, char* const argv[])
 {
     Exiv2::XmpParser::initialize();
     ::atexit(Exiv2::XmpParser::terminate);
-#ifdef EXIV2_ENABLE_BMFF
+#ifdef EXV_ENABLE_BMFF
     Exiv2::enableBMFF();
 #endif
 
diff --git a/samples/xmpparse.cpp b/samples/xmpparse.cpp
@@ -29,7 +29,7 @@ int main(int argc, char* const argv[])
 try {
     Exiv2::XmpParser::initialize();
     ::atexit(Exiv2::XmpParser::terminate);
-#ifdef EXIV2_ENABLE_BMFF
+#ifdef EXV_ENABLE_BMFF
     Exiv2::enableBMFF();
 #endif
 
diff --git a/samples/xmpparser-test.cpp b/samples/xmpparser-test.cpp
@@ -29,7 +29,7 @@ int main(int argc, char* const argv[])
 try {
     Exiv2::XmpParser::initialize();
     ::atexit(Exiv2::XmpParser::terminate);
-#ifdef EXIV2_ENABLE_BMFF
+#ifdef EXV_ENABLE_BMFF
     Exiv2::enableBMFF();
 #endif
 
diff --git a/samples/xmpprint.cpp b/samples/xmpprint.cpp
@@ -36,7 +36,7 @@ int main(int argc, char** argv)
 {
   Exiv2::XmpParser::initialize();
   ::atexit(Exiv2::XmpParser::terminate);
-#ifdef EXIV2_ENABLE_BMFF
+#ifdef EXV_ENABLE_BMFF
     Exiv2::enableBMFF();
 #endif
 
diff --git a/samples/xmpsample.cpp b/samples/xmpsample.cpp
@@ -39,7 +39,7 @@ int main()
 try {
     Exiv2::XmpParser::initialize();
     ::atexit(Exiv2::XmpParser::terminate);
-#ifdef EXIV2_ENABLE_BMFF
+#ifdef EXV_ENABLE_BMFF
     Exiv2::enableBMFF();
 #endif
 

Original file line number	Diff line number	Diff line change
`@@ -132,7 +132,7 @@ int main(int argc,const char** argv)`
`132`	`132`	`{`
`133`	`133`	`Exiv2::XmpParser::initialize();`
`134`	`134`	`::atexit(Exiv2::XmpParser::terminate);`
`135`		`-#ifdef EXIV2_ENABLE_BMFF`
	`135`	`+#ifdef EXV_ENABLE_BMFF`
`136`	`136`	`Exiv2::enableBMFF();`
`137`	`137`	`#endif`
`138`	`138`
Original file line number	Diff line number	Diff line change
`@@ -171,7 +171,7 @@ int main(int argc,const char* argv[])`
`171`	`171`	`{`
`172`	`172`	`Exiv2::XmpParser::initialize();`
`173`	`173`	`::atexit(Exiv2::XmpParser::terminate);`
`174`		`-#ifdef EXIV2_ENABLE_BMFF`
	`174`	`+#ifdef EXV_ENABLE_BMFF`
`175`	`175`	`Exiv2::enableBMFF();`
`176`	`176`	`#endif`
`177`	`177`
Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ int main(int argc, char* const argv[])`
`30`	`30`	`{`
`31`	`31`	`Exiv2::XmpParser::initialize();`
`32`	`32`	`::atexit(Exiv2::XmpParser::terminate);`
`33`		`-#ifdef EXIV2_ENABLE_BMFF`
	`33`	`+#ifdef EXV_ENABLE_BMFF`
`34`	`34`	`Exiv2::enableBMFF();`
`35`	`35`	`#endif`
`36`	`36`
Original file line number	Diff line number	Diff line change
`@@ -287,7 +287,7 @@ int main(int argc, char* const argv[])`
`287`	`287`	`{`
`288`	`288`	`Exiv2::XmpParser::initialize();`
`289`	`289`	`::atexit(Exiv2::XmpParser::terminate);`
`290`		`-#ifdef EXIV2_ENABLE_BMFF`
	`290`	`+#ifdef EXV_ENABLE_BMFF`
`291`	`291`	`Exiv2::enableBMFF();`
`292`	`292`	`#endif`
`293`	`293`
Original file line number	Diff line number	Diff line change
`@@ -783,7 +783,7 @@ int main(int argc,const char* argv[])`
`783`	`783`	`{`
`784`	`784`	`Exiv2::XmpParser::initialize();`
`785`	`785`	`::atexit(Exiv2::XmpParser::terminate);`
`786`		`-#ifdef EXIV2_ENABLE_BMFF`
	`786`	`+#ifdef EXV_ENABLE_BMFF`
`787`	`787`	`Exiv2::enableBMFF();`
`788`	`788`	`#endif`
`789`	`789`
Original file line number	Diff line number	Diff line change
`@@ -103,7 +103,7 @@ int main(int argc, char** const argv)`
`103`	`103`	`{`
`104`	`104`	`Exiv2::XmpParser::initialize();`
`105`	`105`	`::atexit(Exiv2::XmpParser::terminate);`
`106`		`-#ifdef EXIV2_ENABLE_BMFF`
	`106`	`+#ifdef EXV_ENABLE_BMFF`
`107`	`107`	`Exiv2::enableBMFF();`
`108`	`108`	`#endif`
`109`	`109`
Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ int main(int argc,const char** argv)`
`39`	`39`	`{`
`40`	`40`	`Exiv2::XmpParser::initialize();`
`41`	`41`	`::atexit(Exiv2::XmpParser::terminate);`
`42`		`-#ifdef EXIV2_ENABLE_BMFF`
	`42`	`+#ifdef EXV_ENABLE_BMFF`
`43`	`43`	`Exiv2::enableBMFF();`
`44`	`44`	`#endif`
`45`	`45`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ int main()`
`34`	`34`	`{`
`35`	`35`	`Exiv2::XmpParser::initialize();`
`36`	`36`	`::atexit(Exiv2::XmpParser::terminate);`
`37`		`-#ifdef EXIV2_ENABLE_BMFF`
	`37`	`+#ifdef EXV_ENABLE_BMFF`
`38`	`38`	`Exiv2::enableBMFF();`
`39`	`39`	`#endif`
`40`	`40`
Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ int main(int argc, char* const argv[])`
`41`	`41`	`{`
`42`	`42`	`Exiv2::XmpParser::initialize();`
`43`	`43`	`::atexit(Exiv2::XmpParser::terminate);`
`44`		`-#ifdef EXIV2_ENABLE_BMFF`
	`44`	`+#ifdef EXV_ENABLE_BMFF`
`45`	`45`	`Exiv2::enableBMFF();`
`46`	`46`	`#endif`
`47`	`47`
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ int main(int argc, char* const argv[])`
`36`	`36`	`{`
`37`	`37`	`Exiv2::XmpParser::initialize();`
`38`	`38`	`::atexit(Exiv2::XmpParser::terminate);`
`39`		`-#ifdef EXIV2_ENABLE_BMFF`
	`39`	`+#ifdef EXV_ENABLE_BMFF`
`40`	`40`	`Exiv2::enableBMFF();`
`41`	`41`	`#endif`
`42`	`42`