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

Revert "Fix mismatched malloc/delete leak"

Browse Source 
This reverts commit 77eccdf13d.
This commit is contained in:
George Hilliard
2018-11-07 11:55:02 -06:00
parent ec814dbf05
commit 7cbf198db8
1 changed files with 1 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
rtengine/dcp.cc
View File

@@ -393,13 +393,6 @@ double xyCoordToTemperature(const std::array<double, 2>& white_xy)
return res; return res;
} }
struct cJSON_deleter {
template<typename T>
void operator()(T *t) {
cJSON_Delete(const_cast<typename std::remove_const<T>::type*>(t));
}
};
std::map<std::string, std::string> getAliases(const Glib::ustring& profile_dir) std::map<std::string, std::string> getAliases(const Glib::ustring& profile_dir)
{ {
const std::unique_ptr<std::FILE, std::function<void (std::FILE*)>> file( const std::unique_ptr<std::FILE, std::function<void (std::FILE*)>> file(
@@ -426,7 +419,7 @@ std::map<std::string, std::string> getAliases(const Glib::ustring& profile_dir)
buffer[read] = 0; buffer[read] = 0;
cJSON_Minify(buffer.get()); cJSON_Minify(buffer.get());
const std::unique_ptr<cJSON, cJSON_deleter> root(cJSON_Parse(buffer.get())); const std::unique_ptr<cJSON> root(cJSON_Parse(buffer.get()));
if (!root || !root->child) { if (!root || !root->child) {
if (settings->verbose) { if (settings->verbose) {
std::cout << "Could not parse 'camera_model_aliases.json' file." << std::endl; std::cout << "Could not parse 'camera_model_aliases.json' file." << std::endl;