src/video/SDL_blit_1.c
changeset 2262 bee005ace1bf
parent 2257 340942cfda48
child 2267 c785543d1843
     1.1 --- a/src/video/SDL_blit_1.c	Fri Aug 17 03:22:03 2007 +0000
     1.2 +++ b/src/video/SDL_blit_1.c	Fri Aug 17 06:21:58 2007 +0000
     1.3 @@ -39,12 +39,12 @@
     1.4      int srcskip, dstskip;
     1.5  
     1.6      /* Set up some basic variables */
     1.7 -    width = info->d_width;
     1.8 -    height = info->d_height;
     1.9 -    src = info->s_pixels;
    1.10 +    width = info->dst_w;
    1.11 +    height = info->dst_h;
    1.12 +    src = info->src;
    1.13      srcskip = info->s_skip;
    1.14 -    dst = info->d_pixels;
    1.15 -    dstskip = info->d_skip;
    1.16 +    dst = info->dst;
    1.17 +    dstskip = info->dst_pitch;
    1.18      map = info->table;
    1.19  
    1.20      while (height--) {
    1.21 @@ -90,12 +90,12 @@
    1.22      int srcskip, dstskip;
    1.23  
    1.24      /* Set up some basic variables */
    1.25 -    width = info->d_width;
    1.26 -    height = info->d_height;
    1.27 -    src = info->s_pixels;
    1.28 +    width = info->dst_w;
    1.29 +    height = info->dst_h;
    1.30 +    src = info->src;
    1.31      srcskip = info->s_skip;
    1.32 -    dst = info->d_pixels;
    1.33 -    dstskip = info->d_skip;
    1.34 +    dst = info->dst;
    1.35 +    dstskip = info->dst_pitch;
    1.36      map = (Uint16 *) info->table;
    1.37  
    1.38  #ifdef USE_DUFFS_LOOP
    1.39 @@ -196,12 +196,12 @@
    1.40      int srcskip, dstskip;
    1.41  
    1.42      /* Set up some basic variables */
    1.43 -    width = info->d_width;
    1.44 -    height = info->d_height;
    1.45 -    src = info->s_pixels;
    1.46 +    width = info->dst_w;
    1.47 +    height = info->dst_h;
    1.48 +    src = info->src;
    1.49      srcskip = info->s_skip;
    1.50 -    dst = info->d_pixels;
    1.51 -    dstskip = info->d_skip;
    1.52 +    dst = info->dst;
    1.53 +    dstskip = info->dst_pitch;
    1.54      map = info->table;
    1.55  
    1.56      while (height--) {
    1.57 @@ -244,12 +244,12 @@
    1.58      int srcskip, dstskip;
    1.59  
    1.60      /* Set up some basic variables */
    1.61 -    width = info->d_width;
    1.62 -    height = info->d_height;
    1.63 -    src = info->s_pixels;
    1.64 +    width = info->dst_w;
    1.65 +    height = info->dst_h;
    1.66 +    src = info->src;
    1.67      srcskip = info->s_skip;
    1.68 -    dst = (Uint32 *) info->d_pixels;
    1.69 -    dstskip = info->d_skip / 4;
    1.70 +    dst = (Uint32 *) info->dst;
    1.71 +    dstskip = info->dst_pitch / 4;
    1.72      map = (Uint32 *) info->table;
    1.73  
    1.74      while (height--) {
    1.75 @@ -283,12 +283,12 @@
    1.76  static void
    1.77  Blit1to1Key(SDL_BlitInfo * info)
    1.78  {
    1.79 -    int width = info->d_width;
    1.80 -    int height = info->d_height;
    1.81 -    Uint8 *src = info->s_pixels;
    1.82 +    int width = info->dst_w;
    1.83 +    int height = info->dst_h;
    1.84 +    Uint8 *src = info->src;
    1.85      int srcskip = info->s_skip;
    1.86 -    Uint8 *dst = info->d_pixels;
    1.87 -    int dstskip = info->d_skip;
    1.88 +    Uint8 *dst = info->dst;
    1.89 +    int dstskip = info->dst_pitch;
    1.90      Uint8 *palmap = info->table;
    1.91      Uint32 ckey = info->ckey;
    1.92  
    1.93 @@ -330,12 +330,12 @@
    1.94  static void
    1.95  Blit1to2Key(SDL_BlitInfo * info)
    1.96  {
    1.97 -    int width = info->d_width;
    1.98 -    int height = info->d_height;
    1.99 -    Uint8 *src = info->s_pixels;
   1.100 +    int width = info->dst_w;
   1.101 +    int height = info->dst_h;
   1.102 +    Uint8 *src = info->src;
   1.103      int srcskip = info->s_skip;
   1.104 -    Uint16 *dstp = (Uint16 *) info->d_pixels;
   1.105 -    int dstskip = info->d_skip;
   1.106 +    Uint16 *dstp = (Uint16 *) info->dst;
   1.107 +    int dstskip = info->dst_pitch;
   1.108      Uint16 *palmap = (Uint16 *) info->table;
   1.109      Uint32 ckey = info->ckey;
   1.110  
   1.111 @@ -362,12 +362,12 @@
   1.112  static void
   1.113  Blit1to3Key(SDL_BlitInfo * info)
   1.114  {
   1.115 -    int width = info->d_width;
   1.116 -    int height = info->d_height;
   1.117 -    Uint8 *src = info->s_pixels;
   1.118 +    int width = info->dst_w;
   1.119 +    int height = info->dst_h;
   1.120 +    Uint8 *src = info->src;
   1.121      int srcskip = info->s_skip;
   1.122 -    Uint8 *dst = info->d_pixels;
   1.123 -    int dstskip = info->d_skip;
   1.124 +    Uint8 *dst = info->dst;
   1.125 +    int dstskip = info->dst_pitch;
   1.126      Uint8 *palmap = info->table;
   1.127      Uint32 ckey = info->ckey;
   1.128      int o;
   1.129 @@ -395,12 +395,12 @@
   1.130  static void
   1.131  Blit1to4Key(SDL_BlitInfo * info)
   1.132  {
   1.133 -    int width = info->d_width;
   1.134 -    int height = info->d_height;
   1.135 -    Uint8 *src = info->s_pixels;
   1.136 +    int width = info->dst_w;
   1.137 +    int height = info->dst_h;
   1.138 +    Uint8 *src = info->src;
   1.139      int srcskip = info->s_skip;
   1.140 -    Uint32 *dstp = (Uint32 *) info->d_pixels;
   1.141 -    int dstskip = info->d_skip;
   1.142 +    Uint32 *dstp = (Uint32 *) info->dst;
   1.143 +    int dstskip = info->dst_pitch;
   1.144      Uint32 *palmap = (Uint32 *) info->table;
   1.145      Uint32 ckey = info->ckey;
   1.146  
   1.147 @@ -427,12 +427,12 @@
   1.148  static void
   1.149  Blit1toNAlpha(SDL_BlitInfo * info)
   1.150  {
   1.151 -    int width = info->d_width;
   1.152 -    int height = info->d_height;
   1.153 -    Uint8 *src = info->s_pixels;
   1.154 +    int width = info->dst_w;
   1.155 +    int height = info->dst_h;
   1.156 +    Uint8 *src = info->src;
   1.157      int srcskip = info->s_skip;
   1.158 -    Uint8 *dst = info->d_pixels;
   1.159 -    int dstskip = info->d_skip;
   1.160 +    Uint8 *dst = info->dst;
   1.161 +    int dstskip = info->dst_pitch;
   1.162      SDL_PixelFormat *dstfmt = info->dst;
   1.163      const SDL_Color *srcpal = info->src->palette->colors;
   1.164      int dstbpp;
   1.165 @@ -468,12 +468,12 @@
   1.166  static void
   1.167  Blit1toNAlphaKey(SDL_BlitInfo * info)
   1.168  {
   1.169 -    int width = info->d_width;
   1.170 -    int height = info->d_height;
   1.171 -    Uint8 *src = info->s_pixels;
   1.172 +    int width = info->dst_w;
   1.173 +    int height = info->dst_h;
   1.174 +    Uint8 *src = info->src;
   1.175      int srcskip = info->s_skip;
   1.176 -    Uint8 *dst = info->d_pixels;
   1.177 -    int dstskip = info->d_skip;
   1.178 +    Uint8 *dst = info->dst;
   1.179 +    int dstskip = info->dst_pitch;
   1.180      SDL_PixelFormat *srcfmt = info->src;
   1.181      SDL_PixelFormat *dstfmt = info->dst;
   1.182      const SDL_Color *srcpal = info->src->palette->colors;