* Config merge rewrite, part 1 Signed-off-by: Doug Walker <doug.walker@autodesk.com> (cherry picked from commit 08a3adf15308ee1a629a29ce8ff94b53f9e7de70) Signed-off-by: Doug Walker <doug.walker@autodesk.com> * Add API for config and colorspace merge Signed-off-by: Doug Walker <doug.walker@autodesk.com> (cherry picked from commit fadef86510ecbf10d991c61983c91e860358f78f) Signed-off-by: Doug Walker <doug.walker@autodesk.com> * Prototype of merge avoid duplicates feature Signed-off-by: Doug Walker <doug.walker@autodesk.com> (cherry picked from commit 008ad27467f3a02411a89082ec4e3477286c0a2c) Signed-off-by: Doug Walker <doug.walker@autodesk.com> * Unit test fix Signed-off-by: Doug Walker <doug.walker@autodesk.com> (cherry picked from commit cbc0f0ec96c8456ceb73f2b6a11b209084613d3f) Signed-off-by: Doug Walker <doug.walker@autodesk.com> * Improve duplicates detection Signed-off-by: Doug Walker <doug.walker@autodesk.com> (cherry picked from commit 9871ef4fc9e131d29bf68f5716098a64d9818f9d) Signed-off-by: Doug Walker <doug.walker@autodesk.com> * Fix unit test Signed-off-by: Doug Walker <doug.walker@autodesk.com> (cherry picked from commit 914b2f036baeba2b49c35b64790c4ffa47853f0d) Signed-off-by: Doug Walker <doug.walker@autodesk.com> * Various merge fixes Signed-off-by: Doug Walker <doug.walker@autodesk.com> (cherry picked from commit f60e990a7288d2a9790cab16ac7475630f6662eb) Signed-off-by: Doug Walker <doug.walker@autodesk.com> * Add more tests and clean-up Signed-off-by: Doug Walker <doug.walker@autodesk.com> * Improve comments Signed-off-by: Doug Walker <doug.walker@autodesk.com> * Remove CreateFromFile support Signed-off-by: Doug Walker <doug.walker@autodesk.com> * Add Python binding Signed-off-by: Doug Walker <doug.walker@autodesk.com> * Improve view transform comparison Signed-off-by: Doug Walker <doug.walker@autodesk.com> * Address Remi's comments Signed-off-by: Doug Walker <doug.walker@autodesk.com> * Fix build breaks Signed-off-by: Doug Walker <doug.walker@autodesk.com> --------- Signed-off-by: Doug Walker <doug.walker@autodesk.com>