cassdlcm/mediapipe
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Switch CHECK to a status in resource handling code. Expand error message.

Browse Source 
PiperOrigin-RevId: 483438131
This commit is contained in:
MediaPipe Team 2022-10-24 11:25:18 -07:00 committed by Copybara-Service
parent 2cf9523468
commit 3d88b1797a
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
mediapipe/util/resource_util_android.cc
View File

@ -82,7 +82,8 @@ absl::StatusOr<std::string> PathToResourceAsFile(const std::string& path) {
// If that fails, assume it was a relative path, and try just the base name. // If that fails, assume it was a relative path, and try just the base name.
{ {
const size_t last_slash_idx = path.find_last_of("\\/"); const size_t last_slash_idx = path.find_last_of("\\/");
CHECK_NE(last_slash_idx, std::string::npos); // Make sure it's a path. RET_CHECK(last_slash_idx != std::string::npos)
<< path << " doesn't have a slash in it"; // Make sure it's a path.
auto base_name = path.substr(last_slash_idx + 1); auto base_name = path.substr(last_slash_idx + 1);
auto status_or_path = PathToResourceAsFileInternal(base_name); auto status_or_path = PathToResourceAsFileInternal(base_name);
if (status_or_path.ok()) { if (status_or_path.ok()) {

3
mediapipe/util/resource_util_apple.cc
View File

@ -71,7 +71,8 @@ absl::StatusOr<std::string> PathToResourceAsFile(const std::string& path) {
// If that fails, assume it was a relative path, and try just the base name. // If that fails, assume it was a relative path, and try just the base name.
{ {
const size_t last_slash_idx = path.find_last_of("\\/"); const size_t last_slash_idx = path.find_last_of("\\/");
CHECK_NE(last_slash_idx, std::string::npos); // Make sure it's a path. RET_CHECK(last_slash_idx != std::string::npos)
<< path << " doesn't have a slash in it"; // Make sure it's a path.
auto base_name = path.substr(last_slash_idx + 1); auto base_name = path.substr(last_slash_idx + 1);
auto status_or_path = PathToResourceAsFileInternal(base_name); auto status_or_path = PathToResourceAsFileInternal(base_name);
if (status_or_path.ok()) { if (status_or_path.ok()) {