liz/rawTherapee
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Adding Floessie's patch to use std::unique_ptr (issue #4008)

Browse Source
This commit is contained in:
Hombre57
2017-08-12 19:21:29 +02:00
parent 1a296b763f
commit d5e4980c08
10 changed files with 71 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
rtexif/rtexif.h
View File

@@ -19,14 +19,16 @@
#ifndef _MEXIF3_
#define _MEXIF3_
#include <cstdio>
#include <vector>
#include <map>
#include <string>
#include <sstream>
#include <iomanip>
#include <cstdlib>
#include <cmath>
#include <cstdio>
#include <cstdlib>
#include <iomanip>
#include <map>
#include <memory>
#include <sstream>
#include <string>
#include <vector>
#include <glibmm.h>
#include "../rtengine/procparams.h"
@@ -316,14 +318,14 @@ class ExifManager
public:
FILE* f;
rtengine::RawMetaDataLocation *rml;
std::unique_ptr<rtengine::RawMetaDataLocation> rml;
ByteOrder order;
bool onlyFirst; // Only first IFD
unsigned int IFDOffset;
unsigned int nextIFDOffset;
ExifManager (FILE* fHandle, rtengine::RawMetaDataLocation *rml, bool onlyFirstIFD)
: f(fHandle), rml(rml), order(UNKNOWN), onlyFirst(onlyFirstIFD),
ExifManager (FILE* fHandle, std::unique_ptr<rtengine::RawMetaDataLocation> _rml, bool onlyFirstIFD)
: f(fHandle), rml(std::move(_rml)), order(UNKNOWN), onlyFirst(onlyFirstIFD),
IFDOffset(0), nextIFDOffset(0) {}
void setIFDOffset(unsigned int offset)