Skip to content

Commit

Permalink
Fixed build in linux (casting AtString to std::string makes gcc unhappy)
Browse files Browse the repository at this point in the history
  • Loading branch information
jonahf committed Sep 25, 2018
1 parent 6529333 commit 0fbccf4
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions cryptomatte/cryptomatte.h
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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;
}
Expand Down

0 comments on commit 0fbccf4

Please sign in to comment.