From 0fbccf4b0f16d3f0ec17051faa63a2365dbe6b38 Mon Sep 17 00:00:00 2001 From: Jonah Friedman Date: Tue, 25 Sep 2018 17:13:37 -0400 Subject: [PATCH] Fixed build in linux (casting AtString to std::string makes gcc unhappy) --- cryptomatte/cryptomatte.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/cryptomatte/cryptomatte.h b/cryptomatte/cryptomatte.h index 708e2f8..5428229 100644 --- a/cryptomatte/cryptomatte.h +++ b/cryptomatte/cryptomatte.h @@ -1098,7 +1098,7 @@ struct CryptomatteData { } } - string output_str = output_string; + string updated_output = output_string.c_str(); if (crypto_aovs && check_driver(driver)) { create_AOV_array(aov_name_tok, filter_tok, camera_tok, driver, crypto_aovs, outputs_new); @@ -1107,11 +1107,11 @@ struct CryptomatteData { half_modified_drivers.insert(driver); } if (!option_exr_preview_channels) - output_str = noop_output_str(camera_tok, aov_name_tok, aov_type_tok, driver, - half_tok_present); + updated_output = noop_output_str(camera_tok, aov_name_tok, aov_type_tok, driver, + half_tok_present); } - outputs_orig[i] = output_str; + outputs_orig[i] = updated_output; outputs_flagged_half[i] = half_tok_present; outputs_drivers[i] = driver; }