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

Merge branch 'dev' of https://github.com/t0pu/RawTherapee into t0pu-dev

Browse Source
This commit is contained in:
Morgan Hardwood
2017-04-18 21:49:48 +02:00
parent 2c40a4aa50 f2b0efecce
commit 22875bed9d
5 changed files with 185 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
rtexif/rtexif.h
View File

@@ -312,7 +312,7 @@ class ExifManager
static Tag* saveCIFFMNTag (FILE* f, TagDirectory* root, int len, const char* name);
public:
static TagDirectory* parse (FILE*f, int base, bool skipIgnored = true);
static TagDirectory* parseJPEG (FILE*f);
static TagDirectory* parseJPEG (FILE*f, int offset = 0); // offset: to extract exif data from a embedded preview/thumbnail
static TagDirectory* parseTIFF (FILE*f, bool skipIgnored = true);
static TagDirectory* parseCIFF (FILE* f, int base, int length);
static void parseCIFF (FILE* f, int base, int length, TagDirectory* root);
@@ -629,5 +629,7 @@ extern const TagAttrib sonyCameraSettingsAttribs3[];
extern const TagAttrib olympusAttribs[];
extern const TagAttrib kodakIfdAttribs[];
void parseKodakIfdTextualInfo (Tag *textualInfo, Tag* exif);
extern const TagAttrib panasonicAttribs[];
extern const TagAttrib panasonicRawAttribs[];
}
#endif