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

Merge pull request #7056 from sgotti/dcp_use_std_unique_ptr_to_automatically_close_file_descriptor

Browse Source 
dcp: use std::unique_ptr to automatically close file descriptor
This commit is contained in:
Floessie 2024-04-24 14:22:02 +02:00 committed by GitHub
commit 95f85d50f5
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
rtengine/dcp.cc
View File

@ -1124,17 +1124,20 @@ DCPProfile::DCPProfile(const Glib::ustring& filename) :
1.00000f
};
FILE* const file = g_fopen(filename.c_str(), "rb");
const std::unique_ptr<std::FILE, std::function<void(std::FILE *)>> file(
g_fopen(filename.c_str(), "rb"),
[](std::FILE *file) {
std::fclose(file);
});
if (file == nullptr) {
printf ("Unable to load DCP profile '%s' !", filename.c_str());
return;
}
DCPMetadata md(file);
DCPMetadata md(file.get());
if (!md.parse()) {
printf ("Unable to load DCP profile '%s'.", filename.c_str());
fclose(file);
return;
}
@ -1175,7 +1178,6 @@ DCPProfile::DCPProfile(const Glib::ustring& filename) :
// Color Matrix (one is always there)
if (!md.find(TAG_KEY_COLOR_MATRIX_1)) {
std::cerr << "DCP '" << filename << "' is missing 'ColorMatrix1'. Skipped." << std::endl;
fclose(file);
return;
}
@ -1352,10 +1354,6 @@ DCPProfile::DCPProfile(const Glib::ustring& filename) :
}
}
if (file) {
fclose(file);
}
valid = true;
}