merge with dev

This commit is contained in:
Desmis
2017-03-12 16:53:50 +01:00
70 changed files with 2305 additions and 488 deletions

View File

@@ -39,11 +39,22 @@
#define DEFPROFILE_IMG "Neutral"
// Profile name to use for internal values' profile
#define DEFPROFILE_INTERNAL "Neutral"
// Special name for the Dynamic profile
#define DEFPROFILE_DYNAMIC "Dynamic"
class SaveFormat
{
struct SaveFormat {
SaveFormat() :
format ("jpg"),
pngBits (8),
pngCompression (6),
jpegQuality (90),
jpegSubSamp (2),
tiffBits (8),
tiffUncompressed (true),
saveParams (true)
{
}
public:
Glib::ustring format;
int pngBits;
int pngCompression;
@@ -52,7 +63,6 @@ public:
int tiffBits;
bool tiffUncompressed;
bool saveParams;
SaveFormat () : format ("jpg"), pngBits (8), pngCompression (6), jpegQuality (90), jpegSubSamp (2), tiffBits (8), tiffUncompressed (true), saveParams (true) {};
};
enum ThFileType {FT_Invalid = -1, FT_None = 0, FT_Raw = 1, FT_Jpeg = 2, FT_Tiff = 3, FT_Png = 4, FT_Custom = 5, FT_Tiff16 = 6, FT_Png16 = 7, FT_Custom16 = 8};