Description: Don't run a loop which causes unaligned access (SIGBUS) on armhf
Author: Iain Lane <iain.lane@canonical.com>
Forwarded: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=846094

--- cpl-7.0.orig/cplcore/cpl_mask.c
+++ cpl-7.0/cplcore/cpl_mask.c
@@ -1127,7 +1127,7 @@ cpl_size cpl_mask_count_window(const cpl
 
     for (j = lly - 1; j < ury; j++, pi += self->nx) {
         i = llx - 1;
-#ifdef CPL_MASK_WORD
+#if defined (CPL_MASK_WORD) && !defined(__arm__)
         /* FIXME: Should really ensure byte-wise iteration to word-boundary */
         for (; i < llx - 1 + CPL_MASK_PAD2WORD2(llx - 1); i++) {
             if (pi[i] != CPL_BINARY_0) count++;
