commit 8b5503b219c8cc2e144943a2c847a2e56affafb3
author Kevin DuBois <kevindubois@google.com> Wed Feb 24 04:49:56 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Feb 24 04:49:56 2021 +0000
tree 711b33483fe6b3e4d894b1d9a948ebbffa79d8b7
parent bb8b0c23c770cf38435e70b0f8a493791fbc26bc
parent c2a1825c569adf2b8f0afdb44b758924fae7fa34

ComputeLibrary: fix incorrect format specifier am: c2a1825c56

Original change: https://googleplex-android-review.googlesource.com/c/platform/external/ComputeLibrary/+/13680869

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I78825b4ec2f92f9149349a7c94dbd58070cb9148

utils/GraphUtils.cpp

diff --git a/utils/GraphUtils.cpp b/utils/GraphUtils.cpp
index e543cab..1d18fb5 100644
--- a/utils/GraphUtils.cpp
+++ b/utils/GraphUtils.cpp
@@ -273,15 +273,9 @@
             std::tie(permuted_shape, perm) = compute_permutation_parameters(tensor.info()->tensor_shape(), tensor.info()->data_layout());
         }
 
-#ifdef __arm__
         ARM_COMPUTE_EXIT_ON_MSG_VAR(image_loader->width() != permuted_shape.x() || image_loader->height() != permuted_shape.y(),
-                                    "Failed to load image file: dimensions [%d,%d] not correct, expected [%" PRIu32 ",%" PRIu32 "].",
+                                    "Failed to load image file: dimensions [%d,%d] not correct, expected [%zu ,%zu ].",
                                     image_loader->width(), image_loader->height(), permuted_shape.x(), permuted_shape.y());
-#else  // __arm__
-        ARM_COMPUTE_EXIT_ON_MSG_VAR(image_loader->width() != permuted_shape.x() || image_loader->height() != permuted_shape.y(),
-                                    "Failed to load image file: dimensions [%d,%d] not correct, expected [%" PRIu64 ",%" PRIu64 "].",
-                                    image_loader->width(), image_loader->height(), permuted_shape.x(), permuted_shape.y());
-#endif // __arm__
 
         // Fill the tensor with the PPM content (BGR)
         image_loader->fill_planar_tensor(tensor, _bgr);
@@ -356,15 +350,9 @@
                                                                             tensor.info()->data_layout());
         }
 
-#ifdef __arm__
         ARM_COMPUTE_EXIT_ON_MSG_VAR(jpeg.width() != permuted_shape.x() || jpeg.height() != permuted_shape.y(),
-                                    "Failed to load image file: dimensions [%d,%d] not correct, expected [%" PRIu32 ",%" PRIu32 "].",
+                                    "Failed to load image file: dimensions [%d,%d] not correct, expected [%zu,%zu ].",
                                     jpeg.width(), jpeg.height(), permuted_shape.x(), permuted_shape.y());
-#else  // __arm__
-        ARM_COMPUTE_EXIT_ON_MSG_VAR(jpeg.width() != permuted_shape.x() || jpeg.height() != permuted_shape.y(),
-                                    "Failed to load image file: dimensions [%d,%d] not correct, expected [%" PRIu64 ",%" PRIu64 "].",
-                                    jpeg.width(), jpeg.height(), permuted_shape.x(), permuted_shape.y());
-#endif // __arm__
 
         // Fill the tensor with the JPEG content (BGR)
         jpeg.fill_planar_tensor(tensor, _bgr);