From 1c28ab460287c0f90646b8f373c6e83ac79db6fd Mon Sep 17 00:00:00 2001 From: Anthony Barbier Date: Wed, 29 Aug 2018 11:22:33 +0100 Subject: COMPMID-1543: Unable to include ImageLoader.h in multiple object files Removed STB_IMAGE_IMPLEMENTATION from the ImageLoader.h header and moved it to utils/Utils.cpp Change-Id: Ic41efd723c0c07d3ede86872fad411f2ffc5f162 Reviewed-on: https://eu-gerrit-1.euhpc.arm.com/145989 Reviewed-by: Georgios Pinitas Tested-by: Jenkins --- utils/ImageLoader.h | 1 - utils/Utils.cpp | 6 ++++++ 2 files changed, 6 insertions(+), 1 deletion(-) (limited to 'utils') diff --git a/utils/ImageLoader.h b/utils/ImageLoader.h index cc9619d3f1..24fcbe179a 100644 --- a/utils/ImageLoader.h +++ b/utils/ImageLoader.h @@ -33,7 +33,6 @@ #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wswitch-default" -#define STB_IMAGE_IMPLEMENTATION #include "stb/stb_image.h" #pragma GCC diagnostic pop diff --git a/utils/Utils.cpp b/utils/Utils.cpp index 057d309b2e..1d086765b3 100644 --- a/utils/Utils.cpp +++ b/utils/Utils.cpp @@ -28,6 +28,12 @@ #include #include +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wswitch-default" +#define STB_IMAGE_IMPLEMENTATION +#include "stb/stb_image.h" +#pragma GCC diagnostic pop + namespace arm_compute { namespace utils -- cgit v1.2.1