Some API policing

include/exiv2/exiv2.hpp

@@ -68,6 +68,4 @@
 #include "xmp.hpp"
 #include "xmpsidecar.hpp"
 
-#include <vector>
-
 #endif                                  // #ifndef EXIV2_HPP_

include/exiv2/futils.hpp

@@ -35,8 +35,6 @@
 #include "config.h"
 #include "types.hpp"
 
-#define UNUSED(x) (void)(x)
-
 #ifdef EXV_HAVE_STDINT_H
 # include <stdint.h>                     // for uint8_t
 #endif

include/exiv2/types.hpp

@@ -96,7 +96,7 @@ namespace Exiv2 {
     typedef std::pair<int32_t, int32_t> Rational;
 
     //! Type to express the byte order (little or big endian)
-    enum ByteOrder { invalidByteOrder, littleEndian, bigEndian,asciiBytes };
+    enum ByteOrder { invalidByteOrder, littleEndian, bigEndian };
 
     //! Type to indicate write method used by TIFF parsers
     enum WriteMethod { wmIntrusive, wmNonIntrusive };

samples/geotag.cpp

@@ -58,6 +58,8 @@ char*    realpath(const char* file,char* path);
 #define _MAX_PATH 1024
 #endif
 
+#define UNUSED(x) (void)(x)
+
 // prototypes
 class Options;
 int getFileType(const char* path ,Options& options);

src/cr2image.cpp

@@ -275,7 +275,6 @@ namespace Exiv2 {
             buf.pData_[0] = 0x4d;
             buf.pData_[1] = 0x4d;
             break;
-        case asciiBytes:
         case invalidByteOrder:
             assert(false);
             break;

src/image.cpp

@@ -446,7 +446,7 @@ namespace Exiv2 {
 
         return BasicIo::AutoPtr(new FileIo(path));
 
-        UNUSED(useCurl);
+        (void)(useCurl);
     } // ImageFactory::createIo
 
 #ifdef EXV_UNICODE_PATH

src/orfimage.cpp

@@ -272,7 +272,6 @@ namespace Exiv2 {
             buf.pData_[0] = 0x4d;
             buf.pData_[1] = 0x4d;
             break;
-        case asciiBytes:
         case invalidByteOrder:
             assert(false);
             break;

src/tiffimage.cpp

@@ -2292,7 +2292,6 @@ namespace Exiv2 {
             buf.pData_[0] = 0x4d;
             buf.pData_[1] = 0x4d;
             break;
-        case asciiBytes:
         case invalidByteOrder:
             assert(false);
             break;
@@ -2313,7 +2312,6 @@ namespace Exiv2 {
         switch (byteOrder_) {
         case littleEndian:     os << ", " << _("little endian encoded"); break;
         case bigEndian:        os << ", " << _("big endian encoded");    break;
-        case asciiBytes:       os << ", " << _("ascii bytes");           break;
         case invalidByteOrder: break;
         }
         os << "\n";

src/tiffvisitor.cpp

@@ -358,7 +358,6 @@ namespace Exiv2 {
         case bigEndian:
             exifData_["Exif.MakerNote.ByteOrder"] = "MM";
             break;
-        case asciiBytes:
         case invalidByteOrder:
             assert(object->byteOrder() != invalidByteOrder);
             break;