From 7cbf198db8e565bb7c0baca637664dce86f67031 Mon Sep 17 00:00:00 2001
From: George Hilliard <thirtythreeforty@gmail.com>
Date: Wed, 7 Nov 2018 11:55:02 -0600
Subject: [PATCH] Revert "Fix mismatched malloc/delete leak"

This reverts commit 77eccdf13df8f1190d13d854f5dfd12daca09011.
---
 rtengine/dcp.cc | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/rtengine/dcp.cc b/rtengine/dcp.cc
index a1b0db323..c18ee8915 100644
--- a/rtengine/dcp.cc
+++ b/rtengine/dcp.cc
@@ -393,13 +393,6 @@ double xyCoordToTemperature(const std::array<double, 2>& white_xy)
     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)
 {
     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;
 
     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 (settings->verbose) {
             std::cout << "Could not parse 'camera_model_aliases.json' file." << std::endl;