X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=images%2Fimage-walk.h;h=1cdbbf261a80784ee76c651f24e6bb5cb35c8d7f;hb=1bc3bb66e47ec02003658fb3040aef0ffd7b7540;hp=dfc72a1926a33b741ca825b40eb798856416c223;hpb=f079adbc69c1521039ee8c6b3aaac5eb209889cd;p=libucw.git

diff --git a/images/image-walk.h b/images/image-walk.h
index dfc72a19..1cdbbf26 100644
--- a/images/image-walk.h
+++ b/images/image-walk.h
@@ -83,7 +83,12 @@
 #endif
 
 #ifndef IMAGE_WALK_INLINE
-static void P(walk)
+static void
+#ifdef IMAGE_WALK_FUNC_NAME
+IMAGE_WALK_FUNC_NAME
+#else
+P(walk)
+#endif
     (struct image *P(img)
 #   ifdef IMAGE_WALK_DOUBLE
     , struct image *P(sec_img)
@@ -94,11 +99,11 @@ static void P(walk)
     )
 #endif
 {
-  uns P(cols) = IMAGE_WALK_COLS;
-  uns P(rows) = IMAGE_WALK_ROWS;
+  uint P(cols) = IMAGE_WALK_COLS;
+  uint P(rows) = IMAGE_WALK_ROWS;
 # if IMAGE_WALK_UNROLL > 1
-  uns P(cols_unroll_block_count) = P(cols) / IMAGE_WALK_UNROLL;
-  uns P(cols_unroll_end_count) = P(cols) % IMAGE_WALK_UNROLL;
+  uint P(cols_unroll_block_count) = P(cols) / IMAGE_WALK_UNROLL;
+  uint P(cols_unroll_end_count) = P(cols) % IMAGE_WALK_UNROLL;
 # endif
   byte *P(pos) = IMAGE_WALK_PIXELS, *P(row_start) = P(pos);
   int P(col_step) = IMAGE_WALK_COL_STEP;
@@ -113,9 +118,9 @@ static void P(walk)
     {
       IMAGE_WALK_DO_ROW_START;
 #     if IMAGE_WALK_UNROLL == 1
-      for (uns P(_i) = P(cols); P(_i)--; )
+      for (uint P(_i) = P(cols); P(_i)--; )
 #     else
-      for (uns P(_i) = P(cols_unroll_block_count); P(_i)--; )
+      for (uint P(_i) = P(cols_unroll_block_count); P(_i)--; )
 #     endif
         {
 #         if IMAGE_WALK_UNROLL >= 4
@@ -128,7 +133,7 @@ static void P(walk)
 	  IMAGE_WALK__STEP;
 	}
 #     if IMAGE_WALK_UNROLL > 1
-      for (uns P(_i) = P(cols_unroll_end_count); P(_i)--; )
+      for (uint P(_i) = P(cols_unroll_end_count); P(_i)--; )
         {
 	  IMAGE_WALK__STEP;
 	}
@@ -143,6 +148,7 @@ static void P(walk)
 }
 
 #undef IMAGE_WALK_PREFIX
+#undef IMAGE_WALK_FUNC_NAME
 #undef IMAGE_WALK_INLINE
 #undef IMAGE_WALK_UNROLL
 #undef IMAGE_WALK_DOUBLE