X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=images%2Fimage-walk.h;h=96bfd5cbaced84b054694e65859128fbe229d834;hb=0db6e10eac28f38bfc3b325b13ad95107c58ce1e;hp=a276b08e9bd9e8f47a502e621a4719bc6ae97cdc;hpb=b7ae681630e44b0a6d28ed441c2514dac80004e6;p=libucw.git

diff --git a/images/image-walk.h b/images/image-walk.h
index a276b08e..96bfd5cb 100644
--- a/images/image-walk.h
+++ b/images/image-walk.h
@@ -7,51 +7,59 @@
  *	of the GNU Lesser General Public License.
  */
 
-#if !defined(IMAGE_WALK_INLINE) && !defined(IMAGE_WALK_STATIC)
-#  error Missing IMAGE_WALK_INLINE or IMAGE_WALK_STATIC
+#ifndef IMAGE_WALK_PREFIX
+#  error Undefined IMAGE_WALK_PREFIX
 #endif
 
+#define P(x) IMAGE_WALK_PREFIX(x)
+
 #if !defined(IMAGE_WALK_UNROLL)
 #  define IMAGE_WALK_UNROLL 1
 #elif IMAGE_WALK_UNROLL != 1 && IMAGE_WALK_UNROLL != 2 && IMAGE_WALK_UNROLL != 4
 #  error IMAGE_WALK_UNROLL must be 1, 2 or 4
 #endif
 
+#ifndef IMAGE_WALK_IMAGE
+#  define IMAGE_WALK_IMAGE P(img)
+#endif
 #ifndef IMAGE_WALK_PIXELS
-#  define IMAGE_WALK_PIXELS (img->pixels)
+#  define IMAGE_WALK_PIXELS (IMAGE_WALK_IMAGE->pixels)
 #endif
 #ifndef IMAGE_WALK_COLS
-#  define IMAGE_WALK_COLS (img->cols)
+#  define IMAGE_WALK_COLS (IMAGE_WALK_IMAGE->cols)
 #endif
 #ifndef IMAGE_WALK_ROWS
-#  define IMAGE_WALK_ROWS (img->rows)
+#  define IMAGE_WALK_ROWS (IMAGE_WALK_IMAGE->rows)
 #endif
 #ifndef IMAGE_WALK_COL_STEP
-#  define IMAGE_WALK_COL_STEP (img->pixel_size)
+#  define IMAGE_WALK_COL_STEP (IMAGE_WALK_IMAGE->pixel_size)
 #endif
 #ifndef IMAGE_WALK_ROW_STEP
-#  define IMAGE_WALK_ROW_STEP (img->row_size)
+#  define IMAGE_WALK_ROW_STEP (IMAGE_WALK_IMAGE->row_size)
 #endif
 
 #ifdef IMAGE_WALK_DOUBLE
+#  ifndef IMAGE_WALK_SEC_IMAGE
+#    define IMAGE_WALK_SEC_IMAGE P(sec_img)
+#  endif
 #  ifndef IMAGE_WALK_SEC_PIXELS
-#    define IMAGE_WALK_SEC_PIXELS (sec_img->pixels)
+#    define IMAGE_WALK_SEC_PIXELS (IMAGE_WALK_SEC_IMAGE->pixels)
 #  endif
 #  ifndef IMAGE_WALK_SEC_COLS
-#    define IMAGE_WALK_SEC_COLS (sec_img->cols)
+#    define IMAGE_WALK_SEC_COLS (IMAGE_WALK_SEC_IMAGE->cols)
 #  endif
 #  ifndef IMAGE_WALK_SEC_ROWS
-#    define IMAGE_WALK_SEC_ROWS (sec_img->rows)
+#    define IMAGE_WALK_SEC_ROWS (IMAGE_WALK_SEC_IMAGE->rows)
 #  endif
 #  ifndef IMAGE_WALK_SEC_COL_STEP
-#    define IMAGE_WALK_SEC_COL_STEP (sec_img->pixel_size)
+#    define IMAGE_WALK_SEC_COL_STEP (IMAGE_WALK_SEC_IMAGE->pixel_size)
 #  endif
 #  ifndef IMAGE_WALK_SEC_ROW_STEP
-#    define IMAGE_WALK_SEC_ROW_STEP (sec_img->row_size)
+#    define IMAGE_WALK_SEC_ROW_STEP (IMAGE_WALK_SEC_IMAGE->row_size)
 #  endif
-#  define STEP IMAGE_WALK_DO_STEP; pos += col_step; sec_pos += sec_col_step
+#  define IMAGE_WALK__STEP IMAGE_WALK_DO_STEP; P(pos) += P(col_step); P(sec_pos) += P(sec_col_step)
 #else
-#  define STEP IMAGE_WALK_DO_STEP; pos += col_step
+#  define IMAGE_WALK__STEP IMAGE_WALK_DO_STEP; P(pos) += P(col_step)
 #endif
 
 #ifndef IMAGE_WALK_DO_START
@@ -75,10 +83,15 @@
 #endif
 
 #ifndef IMAGE_WALK_INLINE
-static void IMAGE_WALK_STATIC
-    (struct image *img
+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 *sec_img
+    , struct image *P(sec_img)
 #   endif
 #   ifdef IMAGE_WALK_EXTRA_ARGS
     , IMAGE_WALK_EXTRA_ARGS
@@ -86,64 +99,67 @@ static void IMAGE_WALK_STATIC
     )
 #endif
 {
-  uns cols = IMAGE_WALK_COLS;
-  uns rows = IMAGE_WALK_ROWS;
+  uns P(cols) = IMAGE_WALK_COLS;
+  uns P(rows) = IMAGE_WALK_ROWS;
 # if IMAGE_WALK_UNROLL > 1
-  uns cols_unroll_block_count = cols / IMAGE_WALK_UNROLL;
-  uns cols_unroll_end_count = cols % IMAGE_WALK_UNROLL;
+  uns P(cols_unroll_block_count) = P(cols) / IMAGE_WALK_UNROLL;
+  uns P(cols_unroll_end_count) = P(cols) % IMAGE_WALK_UNROLL;
 # endif
-  byte *pos = IMAGE_WALK_PIXELS, *row_start = pos;
-  int col_step = IMAGE_WALK_COL_STEP;
-  int row_step = IMAGE_WALK_ROW_STEP;
+  byte *P(pos) = IMAGE_WALK_PIXELS, *P(row_start) = P(pos);
+  int P(col_step) = IMAGE_WALK_COL_STEP;
+  int P(row_step) = IMAGE_WALK_ROW_STEP;
 # ifdef IMAGE_WALK_DOUBLE
-  byte *sec_pos = IMAGE_WALK_SEC_PIXELS, *sec_row_start = sec_pos;
-  int sec_col_step = IMAGE_WALK_SEC_COL_STEP;
-  int sec_row_step = IMAGE_WALK_SEC_ROW_STEP;
+  byte *P(sec_pos) = IMAGE_WALK_SEC_PIXELS, *P(sec_row_start) = P(sec_pos);
+  int P(sec_col_step) = IMAGE_WALK_SEC_COL_STEP;
+  int P(sec_row_step) = IMAGE_WALK_SEC_ROW_STEP;
 # endif
   IMAGE_WALK_DO_START;
-  while (rows--)
+  while (P(rows)--)
     {
       IMAGE_WALK_DO_ROW_START;
 #     if IMAGE_WALK_UNROLL == 1
-      for (uns i = cols; i--; )
+      for (uns P(_i) = P(cols); P(_i)--; )
 #     else
-      for (uns i = cols_unroll_block_count; i--; )
+      for (uns P(_i) = P(cols_unroll_block_count); P(_i)--; )
 #     endif
         {
 #         if IMAGE_WALK_UNROLL >= 4
-	  STEP;
-	  STEP;
+	  IMAGE_WALK__STEP;
+	  IMAGE_WALK__STEP;
 #         endif
 #         if IMAGE_WALK_UNROLL >= 2
-	  STEP;
+	  IMAGE_WALK__STEP;
 #         endif
-	  STEP;
+	  IMAGE_WALK__STEP;
 	}
 #     if IMAGE_WALK_UNROLL > 1
-      for (uns i = cols_unroll_end_count; i--; )
+      for (uns P(_i) = P(cols_unroll_end_count); P(_i)--; )
         {
-	  STEP;
+	  IMAGE_WALK__STEP;
 	}
 #     endif
       IMAGE_WALK_DO_ROW_END;
-      pos = (row_start += row_step);
+      P(pos) = (P(row_start) += P(row_step));
 #     ifdef IMAGE_WALK_DOUBLE
-      sec_pos = (sec_row_start += sec_row_step);
+      P(sec_pos) = (P(sec_row_start) += P(sec_row_step));
 #     endif
     }
   IMAGE_WALK_DO_END;
 }
 
+#undef IMAGE_WALK_PREFIX
+#undef IMAGE_WALK_FUNC_NAME
 #undef IMAGE_WALK_INLINE
-#undef IMAGE_WALK_STATIC
 #undef IMAGE_WALK_UNROLL
 #undef IMAGE_WALK_DOUBLE
 #undef IMAGE_WALK_EXTRA_ARGS
+#undef IMAGE_WALK_IMAGE
 #undef IMAGE_WALK_PIXELS
 #undef IMAGE_WALK_COLS
 #undef IMAGE_WALK_ROWS
 #undef IMAGE_WALK_COL_STEP
 #undef IMAGE_WALK_ROW_STEP
+#undef IMAGE_WALK_SEC_IMAGE
 #undef IMAGE_WALK_SEC_PIXELS
 #undef IMAGE_WALK_SEC_COLS
 #undef IMAGE_WALK_SEC_ROWS
@@ -154,4 +170,5 @@ static void IMAGE_WALK_STATIC
 #undef IMAGE_WALK_DO_ROW_START
 #undef IMAGE_WALK_DO_ROW_END
 #undef IMAGE_WALK_DO_STEP
-#undef STEP
+#undef IMAGE_WALK__STEP
+#undef P