commit c132263129e63ddabaa4d4725804a9609b092557
author android-build-team Robot <android-build-team-robot@google.com> Thu Feb 25 02:10:44 2021 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Thu Feb 25 02:10:44 2021 +0000
tree 711b33483fe6b3e4d894b1d9a948ebbffa79d8b7
parent e1bac0e2273bd3af76f18cdcdd271da45d0f0271
parent c2a1825c569adf2b8f0afdb44b758924fae7fa34

Snap for 7168754 from c2a1825c569adf2b8f0afdb44b758924fae7fa34 to sc-v2-release

Change-Id: I5b815c44db865e8ae7c15c0198fab397cc3a5472

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);