Merge from trunk to version ed52f4f469 "Updated make-app-bundle script to use new template for file name"

This commit is contained in:
askvortsov
2010-10-01 10:36:31 -07:00
parent d6d6d6ae23
commit bcd42c3fc2
68 changed files with 2285 additions and 756 deletions

View File

@@ -239,6 +239,13 @@ class EqualizerParamsEdited {
bool c[8];
};
class DirPyrEqualizerParamsEdited {
public:
bool enabled;
bool mult[8];
};
class ExifPairEdited {
public:
@@ -282,6 +289,7 @@ class ParamsEdited {
ResizeParamsEdited resize;
ColorManagementParamsEdited icm;
EqualizerParamsEdited equalizer;
DirPyrEqualizerParamsEdited dirpyrequalizer;
std::vector<ExifPairEdited> exif;
std::vector<IPTCPairEdited> iptc;