Skip to content

Commit 84fd386

Browse files
committed
refactor: update includes in ExifStrategy and glue for improved clarity and organization
1 parent ce605a0 commit 84fd386

File tree

7 files changed

+41
-10
lines changed

7 files changed

+41
-10
lines changed

src/py3exiv2bind/core/glue/ExifStrategy.cpp

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,10 @@
44

55
#include "ExifStrategy.h"
66
#include "make_dictionary.h"
7-
#include <iostream>
7+
#include <string>
8+
#include <unordered_map>
9+
10+
#include <exiv2/image.hpp>
811

912
std::unordered_map<std::string, std::string> ExifStrategy::load(const Exiv2::Image &image){
1013
return make_dictionary(image.exifData());

src/py3exiv2bind/core/glue/IPTC_Strategy.cpp

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,12 @@
44

55
#include "IPTC_Strategy.h"
66
#include "make_dictionary.h"
7-
#include <exiv2/error.hpp>
8-
#include <iostream>
7+
8+
#include <exiv2/image.hpp>
9+
10+
#include <string>
11+
#include <unordered_map>
12+
913

1014
std::unordered_map<std::string, std::string> IPTC_Strategy::load(const Exiv2::Image &image){
1115
return make_dictionary(image.iptcData());

src/py3exiv2bind/core/glue/Image.cpp

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,22 @@
33
//
44

55
#include "Image.h"
6-
#include "MetadataProcessor.h"
7-
#include "glue.h"
86
#include "glue_execeptions.h"
9-
#include <cassert>
7+
#include "MetadataProcessor.h"
8+
#include "MetadataStrategies.h"
9+
1010
#include <exiv2/error.hpp>
11+
#include <exiv2/image.hpp>
12+
#include <exiv2/types.hpp>
13+
14+
#include <cassert>
1115
#include <iostream>
16+
#include <list>
17+
#include <memory>
1218
#include <sstream>
19+
#include <stdexcept>
1320
#include <string>
21+
#include <unordered_map>
1422

1523
std::ostringstream warning_log;
1624
std::ostringstream error_log;

src/py3exiv2bind/core/glue/MetadataProcessor.cpp

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,18 @@
22
// Created by hborcher on 10/11/2017.
33
//
44

5-
#include "MetadataProcessor.h"
65
#include "ExifStrategy.h"
76
#include "IPTC_Strategy.h"
7+
#include "MetadataProcessor.h"
8+
#include "MetadataStrategies.h"
89
#include "XmpStrategy.h"
910

11+
#include <exiv2/image.hpp>
12+
13+
#include <memory>
14+
#include <string>
15+
#include <unordered_map>
16+
1017
const std::unordered_map<std::string, std::string> &MetadataProcessor::getMetadata() const {
1118
return metadata;
1219
}

src/py3exiv2bind/core/glue/XmpStrategy.cpp

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,12 @@
44

55
#include "XmpStrategy.h"
66
#include "make_dictionary.h"
7-
#include <iostream>
7+
8+
#include <exiv2/image.hpp>
9+
10+
#include <string>
11+
#include <unordered_map>
12+
813
std::unordered_map<std::string, std::string> XmpStrategy::load(const Exiv2::Image &image){
914
return make_dictionary(image.xmpData());
1015
}

src/py3exiv2bind/core/glue/glue.cpp

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,11 @@
22
// Created by hborcher on 10/4/2017.
33
//
44
#include "glue.h"
5-
#include <exiv2/exiv2.hpp>
5+
6+
#include <string>
7+
8+
#include <exiv2/image.hpp>
9+
#include <exiv2/version.hpp>
610
using Exiv2::Image;
711
using Exiv2::ImageFactory;
812
std::string exiv2_version() {

src/py3exiv2bind/core/glue/glue.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
#ifndef SUPERBUILD_GLUE_H
66
#define SUPERBUILD_GLUE_H
77

8-
#include <string>
98
#include <map>
9+
#include <string>
1010

1111
struct metadata_chunk {
1212

0 commit comments

Comments
 (0)