aboutsummaryrefslogtreecommitdiff
path: root/utils/ImageLoader.h
diff options
context:
space:
mode:
authorMichalis Spyrou <michalis.spyrou@arm.com>2019-10-10 14:33:47 +0100
committerMichalis Spyrou <michalis.spyrou@arm.com>2019-10-16 12:04:25 +0000
commit7c60c990fbed62aab1369c0e4462c4081dc3cfeb (patch)
tree94329c7a6214b1385b15bc5225c198fd77cec5c9 /utils/ImageLoader.h
parenta07ce151674e28a3e755f1c48785b599f1d34827 (diff)
downloadComputeLibrary-7c60c990fbed62aab1369c0e4462c4081dc3cfeb.tar.gz
COMPMID-2486: Remove disabled compiler warnings
Removed the following flags: -Wno-format-nonliteral: This had a side effect on Error.h that resulted in rewriting most of the macros. Since I was at it I removed all the va_args in order to comply with DCL50-CPP. -Wno-deprecated-increment-bool -Wno-vla-extension -Wno-mismatched-tags -Wno-redundant-move Change-Id: I7c593854ecc3b7d595b8edcbd6a86d3c2563c6bd Signed-off-by: Michalis Spyrou <michalis.spyrou@arm.com> Reviewed-on: https://review.mlplatform.org/c/2069 Comments-Addressed: Arm Jenkins <bsgcomp@arm.com> Tested-by: Arm Jenkins <bsgcomp@arm.com> Reviewed-by: Georgios Pinitas <georgios.pinitas@arm.com>
Diffstat (limited to 'utils/ImageLoader.h')
-rw-r--r--utils/ImageLoader.h12
1 files changed, 6 insertions, 6 deletions
diff --git a/utils/ImageLoader.h b/utils/ImageLoader.h
index 5a2825ebc3..f37ffa2820 100644
--- a/utils/ImageLoader.h
+++ b/utils/ImageLoader.h
@@ -242,7 +242,7 @@ public:
}
catch(const std::ifstream::failure &e)
{
- ARM_COMPUTE_ERROR("Loading image file: %s", e.what());
+ ARM_COMPUTE_ERROR_VAR("Loading image file: %s", e.what());
}
}
/** Fill a tensor with 3 planes (one for each channel) with the content of the currently open image file.
@@ -344,7 +344,7 @@ public:
}
catch(const std::ifstream::failure &e)
{
- ARM_COMPUTE_ERROR("Loading image file: %s", e.what());
+ ARM_COMPUTE_ERROR_VAR("Loading image file: %s", e.what());
}
}
@@ -387,14 +387,14 @@ public:
unsigned int max_val = 0;
std::tie(_width, _height, max_val) = parse_ppm_header(_fs);
- ARM_COMPUTE_ERROR_ON_MSG(max_val >= 256, "2 bytes per colour channel not supported in file %s",
- filename.c_str());
+ ARM_COMPUTE_ERROR_ON_MSG_VAR(max_val >= 256, "2 bytes per colour channel not supported in file %s",
+ filename.c_str());
_feeder = support::cpp14::make_unique<FileImageFeeder>(_fs);
}
catch(std::runtime_error &e)
{
- ARM_COMPUTE_ERROR("Accessing %s: %s", filename.c_str(), e.what());
+ ARM_COMPUTE_ERROR_VAR("Accessing %s: %s", filename.c_str(), e.what());
}
}
void close() override
@@ -457,7 +457,7 @@ public:
uint8_t *rgb_image = stbi_load(filename.c_str(), &width, &height, &bpp, 3);
if(rgb_image == NULL)
{
- ARM_COMPUTE_ERROR("Accessing %s failed", filename.c_str());
+ ARM_COMPUTE_ERROR_VAR("Accessing %s failed", filename.c_str());
}
else
{