X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=images%2Fio-libungif.c;h=7e6038945627a9ed47e3ed62d00c3b7814fb3577;hb=3bf8dcea45ce5f185788a798e576276831b6432d;hp=b3e8960a39fc6b1d3adff9c3df675425df65774d;hpb=c6a03087444567c0d0b1be4d62b5f8d7d725bef6;p=libucw.git diff --git a/images/io-libungif.c b/images/io-libungif.c index b3e8960a..7e603894 100644 --- a/images/io-libungif.c +++ b/images/io-libungif.c @@ -9,13 +9,13 @@ #undef LOCAL_DEBUG -#include "lib/lib.h" -#include "lib/mempool.h" -#include "lib/fastbuf.h" -#include "images/images.h" -#include "images/error.h" -#include "images/color.h" -#include "images/io-main.h" +#include +#include +#include +#include +#include +#include +#include #include @@ -190,8 +190,8 @@ libungif_read_data(struct image_io *io) return 0; } # define DO_ROW_END do{ \ - walk_row_start += dein_step; \ - while (walk_row_start >= img_end) \ + walk_row_start += dein_step; \ + while (walk_row_start >= img_end) \ { uns n = dein_next >> 1; walk_row_start = rdi.image->pixels + n, dein_step = dein_next; dein_next = n; } \ }while(0) # define IMAGE_WALK_PREFIX(x) walk_##x @@ -202,7 +202,7 @@ libungif_read_data(struct image_io *io) # define IMAGE_WALK_ROW_STEP 0 # define IMAGE_WALK_DO_STEP do{ *walk_pos = pal[*pixels++]; }while(0) # define IMAGE_WALK_DO_ROW_END DO_ROW_END -# include "images/image-walk.h" +# include break; } case 2: @@ -225,7 +225,7 @@ libungif_read_data(struct image_io *io) # define IMAGE_WALK_ROW_STEP 0 # define IMAGE_WALK_DO_STEP do{ *(u16 *)walk_pos = ((u16 *)pal)[*pixels++]; }while(0) # define IMAGE_WALK_DO_ROW_END DO_ROW_END -# include "images/image-walk.h" +# include break; } case 3: @@ -253,7 +253,7 @@ libungif_read_data(struct image_io *io) # define IMAGE_WALK_ROW_STEP 0 # define IMAGE_WALK_DO_STEP do{ byte *p = pal + 4 * (*pixels++); walk_pos[0] = p[0]; walk_pos[1] = p[1]; walk_pos[2] = p[2]; }while(0) # define IMAGE_WALK_DO_ROW_END DO_ROW_END -# include "images/image-walk.h" +# include break; } case 4: @@ -278,7 +278,7 @@ libungif_read_data(struct image_io *io) # define IMAGE_WALK_ROW_STEP 0 # define IMAGE_WALK_DO_STEP do{ *(u32 *)walk_pos = ((u32 *)pal)[*pixels++]; }while(0) # define IMAGE_WALK_DO_ROW_END DO_ROW_END -# include "images/image-walk.h" +# include break; } default: