Formatted all .cc and .h code in rtengine, rtexif and rtgui using astyle
This commit is contained in:
DrSlony
@@ -7,7 +7,7 @@
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation, either version 3 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
*
|
||||
* RawTherapee is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
@@ -24,108 +24,190 @@
|
||||
#include "version.h"
|
||||
#include <locale.h>
|
||||
|
||||
CacheImageData::CacheImageData ()
|
||||
CacheImageData::CacheImageData ()
|
||||
: md5(""), supported(false), format(FT_Invalid), rankOld(-1), inTrashOld(false), recentlySaved(false),
|
||||
timeValid(false), exifValid(false), redAWBMul(-1.0), greenAWBMul(-1.0), blueAWBMul(-1.0), thumbImgType(0) {
|
||||
timeValid(false), exifValid(false), redAWBMul(-1.0), greenAWBMul(-1.0), blueAWBMul(-1.0), thumbImgType(0)
|
||||
{
|
||||
}
|
||||
|
||||
/*
|
||||
* Load the General, DateTime, ExifInfo, File info and ExtraRawInfo sections of the image data file
|
||||
*/
|
||||
int CacheImageData::load (const Glib::ustring& fname) {
|
||||
int CacheImageData::load (const Glib::ustring& fname)
|
||||
{
|
||||
setlocale(LC_NUMERIC, "C"); // to set decimal point to "."
|
||||
rtengine::SafeKeyFile keyFile;
|
||||
|
||||
|
||||
try {
|
||||
if (keyFile.load_from_file (fname)) {
|
||||
|
||||
if (keyFile.has_group ("General")) {
|
||||
if (keyFile.has_key ("General", "MD5")) md5 = keyFile.get_string ("General", "MD5");
|
||||
if (keyFile.has_key ("General", "Version")) version = keyFile.get_string ("General", "Version");
|
||||
if (keyFile.has_key ("General", "Supported")) supported = keyFile.get_boolean ("General", "Supported");
|
||||
if (keyFile.has_key ("General", "Format")) format = (ThFileType)keyFile.get_integer ("General", "Format");
|
||||
if (keyFile.has_key ("General", "Rank")) rankOld = keyFile.get_integer ("General", "Rank");
|
||||
if (keyFile.has_key ("General", "InTrash")) inTrashOld = keyFile.get_boolean ("General", "InTrash");
|
||||
if (keyFile.has_key ("General", "RecentlySaved")) recentlySaved = keyFile.get_boolean ("General", "RecentlySaved");
|
||||
if (keyFile.has_key ("General", "MD5")) {
|
||||
md5 = keyFile.get_string ("General", "MD5");
|
||||
}
|
||||
|
||||
if (keyFile.has_key ("General", "Version")) {
|
||||
version = keyFile.get_string ("General", "Version");
|
||||
}
|
||||
|
||||
if (keyFile.has_key ("General", "Supported")) {
|
||||
supported = keyFile.get_boolean ("General", "Supported");
|
||||
}
|
||||
|
||||
if (keyFile.has_key ("General", "Format")) {
|
||||
format = (ThFileType)keyFile.get_integer ("General", "Format");
|
||||
}
|
||||
|
||||
if (keyFile.has_key ("General", "Rank")) {
|
||||
rankOld = keyFile.get_integer ("General", "Rank");
|
||||
}
|
||||
|
||||
if (keyFile.has_key ("General", "InTrash")) {
|
||||
inTrashOld = keyFile.get_boolean ("General", "InTrash");
|
||||
}
|
||||
|
||||
if (keyFile.has_key ("General", "RecentlySaved")) {
|
||||
recentlySaved = keyFile.get_boolean ("General", "RecentlySaved");
|
||||
}
|
||||
}
|
||||
|
||||
timeValid = keyFile.has_group ("DateTime");
|
||||
|
||||
if (timeValid) {
|
||||
if (keyFile.has_key ("DateTime", "Year")) year = keyFile.get_integer ("DateTime", "Year");
|
||||
if (keyFile.has_key ("DateTime", "Month")) month = keyFile.get_integer ("DateTime", "Month");
|
||||
if (keyFile.has_key ("DateTime", "Day")) day = keyFile.get_integer ("DateTime", "Day");
|
||||
if (keyFile.has_key ("DateTime", "Hour")) hour = keyFile.get_integer ("DateTime", "Hour");
|
||||
if (keyFile.has_key ("DateTime", "Min")) min = keyFile.get_integer ("DateTime", "Min");
|
||||
if (keyFile.has_key ("DateTime", "Sec")) sec = keyFile.get_integer ("DateTime", "Sec");
|
||||
if (keyFile.has_key ("DateTime", "Year")) {
|
||||
year = keyFile.get_integer ("DateTime", "Year");
|
||||
}
|
||||
|
||||
if (keyFile.has_key ("DateTime", "Month")) {
|
||||
month = keyFile.get_integer ("DateTime", "Month");
|
||||
}
|
||||
|
||||
if (keyFile.has_key ("DateTime", "Day")) {
|
||||
day = keyFile.get_integer ("DateTime", "Day");
|
||||
}
|
||||
|
||||
if (keyFile.has_key ("DateTime", "Hour")) {
|
||||
hour = keyFile.get_integer ("DateTime", "Hour");
|
||||
}
|
||||
|
||||
if (keyFile.has_key ("DateTime", "Min")) {
|
||||
min = keyFile.get_integer ("DateTime", "Min");
|
||||
}
|
||||
|
||||
if (keyFile.has_key ("DateTime", "Sec")) {
|
||||
sec = keyFile.get_integer ("DateTime", "Sec");
|
||||
}
|
||||
}
|
||||
|
||||
exifValid = false;
|
||||
|
||||
if (keyFile.has_group ("ExifInfo")) {
|
||||
exifValid = true;
|
||||
if (keyFile.has_key ("ExifInfo", "Valid")) exifValid = keyFile.get_boolean ("ExifInfo", "Valid");
|
||||
|
||||
if (keyFile.has_key ("ExifInfo", "Valid")) {
|
||||
exifValid = keyFile.get_boolean ("ExifInfo", "Valid");
|
||||
}
|
||||
|
||||
if (exifValid) {
|
||||
if (keyFile.has_key ("ExifInfo", "FNumber")) fnumber = keyFile.get_double ("ExifInfo", "FNumber");
|
||||
if (keyFile.has_key ("ExifInfo", "Shutter")) shutter = keyFile.get_double ("ExifInfo", "Shutter");
|
||||
if (keyFile.has_key ("ExifInfo", "FocalLen")) focalLen = keyFile.get_double ("ExifInfo", "FocalLen");
|
||||
if (keyFile.has_key ("ExifInfo", "FocalLen35mm")) focalLen35mm = keyFile.get_double ("ExifInfo", "FocalLen35mm");
|
||||
else focalLen35mm=focalLen; // prevent crashes on old files
|
||||
if (keyFile.has_key ("ExifInfo", "FocusDist")) focusDist = keyFile.get_double ("ExifInfo", "FocusDist");
|
||||
else focusDist=0;
|
||||
if (keyFile.has_key ("ExifInfo", "ISO")) iso = keyFile.get_integer ("ExifInfo", "ISO");
|
||||
if (keyFile.has_key ("ExifInfo", "ExpComp")) expcomp = keyFile.get_string ("ExifInfo", "ExpComp");
|
||||
if (keyFile.has_key ("ExifInfo", "FNumber")) {
|
||||
fnumber = keyFile.get_double ("ExifInfo", "FNumber");
|
||||
}
|
||||
|
||||
if (keyFile.has_key ("ExifInfo", "Shutter")) {
|
||||
shutter = keyFile.get_double ("ExifInfo", "Shutter");
|
||||
}
|
||||
|
||||
if (keyFile.has_key ("ExifInfo", "FocalLen")) {
|
||||
focalLen = keyFile.get_double ("ExifInfo", "FocalLen");
|
||||
}
|
||||
|
||||
if (keyFile.has_key ("ExifInfo", "FocalLen35mm")) {
|
||||
focalLen35mm = keyFile.get_double ("ExifInfo", "FocalLen35mm");
|
||||
} else {
|
||||
focalLen35mm = focalLen; // prevent crashes on old files
|
||||
}
|
||||
|
||||
if (keyFile.has_key ("ExifInfo", "FocusDist")) {
|
||||
focusDist = keyFile.get_double ("ExifInfo", "FocusDist");
|
||||
} else {
|
||||
focusDist = 0;
|
||||
}
|
||||
|
||||
if (keyFile.has_key ("ExifInfo", "ISO")) {
|
||||
iso = keyFile.get_integer ("ExifInfo", "ISO");
|
||||
}
|
||||
|
||||
if (keyFile.has_key ("ExifInfo", "ExpComp")) {
|
||||
expcomp = keyFile.get_string ("ExifInfo", "ExpComp");
|
||||
}
|
||||
}
|
||||
|
||||
if (keyFile.has_key ("ExifInfo", "Lens")) {
|
||||
lens = keyFile.get_string ("ExifInfo", "Lens");
|
||||
}
|
||||
|
||||
if (keyFile.has_key ("ExifInfo", "CameraMake")) {
|
||||
camMake = keyFile.get_string ("ExifInfo", "CameraMake");
|
||||
}
|
||||
|
||||
if (keyFile.has_key ("ExifInfo", "CameraModel")) {
|
||||
camModel = keyFile.get_string ("ExifInfo", "CameraModel");
|
||||
}
|
||||
if (keyFile.has_key ("ExifInfo", "Lens")) lens = keyFile.get_string ("ExifInfo", "Lens");
|
||||
if (keyFile.has_key ("ExifInfo", "CameraMake")) camMake = keyFile.get_string ("ExifInfo", "CameraMake");
|
||||
if (keyFile.has_key ("ExifInfo", "CameraModel")) camModel = keyFile.get_string ("ExifInfo", "CameraModel");
|
||||
}
|
||||
|
||||
if (keyFile.has_group ("FileInfo")) {
|
||||
if (keyFile.has_key ("FileInfo", "Filetype")) filetype = keyFile.get_string ("FileInfo", "Filetype");
|
||||
if (keyFile.has_key ("FileInfo", "Filetype")) {
|
||||
filetype = keyFile.get_string ("FileInfo", "Filetype");
|
||||
}
|
||||
}
|
||||
|
||||
if (format==FT_Raw && keyFile.has_group ("ExtraRawInfo")) {
|
||||
if (keyFile.has_key ("ExtraRawInfo", "ThumbImageType")) thumbImgType = keyFile.get_integer ("ExtraRawInfo", "ThumbImageType");
|
||||
if (keyFile.has_key ("ExtraRawInfo", "ThumbImageOffset")) thumbOffset = keyFile.get_integer ("ExtraRawInfo", "ThumbImageOffset");
|
||||
}
|
||||
else {
|
||||
if (format == FT_Raw && keyFile.has_group ("ExtraRawInfo")) {
|
||||
if (keyFile.has_key ("ExtraRawInfo", "ThumbImageType")) {
|
||||
thumbImgType = keyFile.get_integer ("ExtraRawInfo", "ThumbImageType");
|
||||
}
|
||||
|
||||
if (keyFile.has_key ("ExtraRawInfo", "ThumbImageOffset")) {
|
||||
thumbOffset = keyFile.get_integer ("ExtraRawInfo", "ThumbImageOffset");
|
||||
}
|
||||
} else {
|
||||
rotate = 0;
|
||||
thumbImgType = 0;
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
catch (Glib::Error &err) {
|
||||
if (options.rtSettings.verbose)
|
||||
} catch (Glib::Error &err) {
|
||||
if (options.rtSettings.verbose) {
|
||||
printf("CacheImageData::load / Error code %d while reading values from \"%s\":\n%s\n", err.code(), fname.c_str(), err.what().c_str());
|
||||
}
|
||||
catch (...) {
|
||||
if (options.rtSettings.verbose)
|
||||
}
|
||||
} catch (...) {
|
||||
if (options.rtSettings.verbose) {
|
||||
printf("CacheImageData::load / Unknown exception while trying to load \"%s\"!\n", fname.c_str());
|
||||
}
|
||||
}
|
||||
|
||||
return 1;
|
||||
}
|
||||
|
||||
/*
|
||||
* Save the General, DateTime, ExifInfo, File info and ExtraRawInfo sections of the image data file
|
||||
*/
|
||||
int CacheImageData::save (const Glib::ustring& fname) {
|
||||
int CacheImageData::save (const Glib::ustring& fname)
|
||||
{
|
||||
|
||||
rtengine::SafeKeyFile keyFile;
|
||||
|
||||
if (safe_file_test(fname,Glib::FILE_TEST_EXISTS)) {
|
||||
|
||||
if (safe_file_test(fname, Glib::FILE_TEST_EXISTS)) {
|
||||
try {
|
||||
keyFile.load_from_file (fname);
|
||||
}
|
||||
catch (Glib::Error &err) {
|
||||
if (options.rtSettings.verbose)
|
||||
} catch (Glib::Error &err) {
|
||||
if (options.rtSettings.verbose) {
|
||||
printf("CacheImageData::save / Error code %d while reading values from \"%s\":\n%s\n", err.code(), fname.c_str(), err.what().c_str());
|
||||
}
|
||||
catch (...) {
|
||||
if (options.rtSettings.verbose)
|
||||
}
|
||||
} catch (...) {
|
||||
if (options.rtSettings.verbose) {
|
||||
printf("CacheImageData::save / Unknown exception while trying to save \"%s\"!\n", fname.c_str());
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -136,8 +218,13 @@ int CacheImageData::save (const Glib::ustring& fname) {
|
||||
keyFile.set_boolean ("General", "RecentlySaved", recentlySaved);
|
||||
|
||||
// remove the old implementation of Rank and InTrash from cache
|
||||
if (keyFile.has_key ("General", "Rank")) keyFile.remove_key("General", "Rank");
|
||||
if (keyFile.has_key ("General", "InTrash")) keyFile.remove_key("General", "InTrash");
|
||||
if (keyFile.has_key ("General", "Rank")) {
|
||||
keyFile.remove_key("General", "Rank");
|
||||
}
|
||||
|
||||
if (keyFile.has_key ("General", "InTrash")) {
|
||||
keyFile.remove_key("General", "InTrash");
|
||||
}
|
||||
|
||||
if (timeValid) {
|
||||
keyFile.set_integer ("DateTime", "Year", year);
|
||||
@@ -149,6 +236,7 @@ int CacheImageData::save (const Glib::ustring& fname) {
|
||||
}
|
||||
|
||||
keyFile.set_boolean ("ExifInfo", "Valid", exifValid);
|
||||
|
||||
if (exifValid) {
|
||||
keyFile.set_double ("ExifInfo", "FNumber", fnumber);
|
||||
keyFile.set_double ("ExifInfo", "Shutter", shutter);
|
||||
@@ -158,23 +246,26 @@ int CacheImageData::save (const Glib::ustring& fname) {
|
||||
keyFile.set_integer ("ExifInfo", "ISO", iso);
|
||||
keyFile.set_string ("ExifInfo", "ExpComp", expcomp);
|
||||
}
|
||||
|
||||
keyFile.set_string ("ExifInfo", "Lens", lens);
|
||||
keyFile.set_string ("ExifInfo", "CameraMake", camMake);
|
||||
keyFile.set_string ("ExifInfo", "CameraModel", camModel);
|
||||
keyFile.set_string ("FileInfo", "Filetype", filetype);
|
||||
|
||||
if (format==FT_Raw) {
|
||||
if (format == FT_Raw) {
|
||||
keyFile.set_integer ("ExtraRawInfo", "ThumbImageType", thumbImgType);
|
||||
keyFile.set_integer ("ExtraRawInfo", "ThumbImageOffset", thumbOffset);
|
||||
}
|
||||
|
||||
FILE *f = safe_g_fopen (fname, "wt");
|
||||
|
||||
if (!f) {
|
||||
if (options.rtSettings.verbose)
|
||||
if (options.rtSettings.verbose) {
|
||||
printf("CacheImageData::save / Error: unable to open file \"%s\" with write access!\n", fname.c_str());
|
||||
}
|
||||
|
||||
return 1;
|
||||
}
|
||||
else {
|
||||
} else {
|
||||
fprintf (f, "%s", keyFile.to_data().c_str());
|
||||
fclose (f);
|
||||
return 0;
|
||||
|
||||
Reference in New Issue
Block a user