← Back to branch summary

~peter-pearse/ubuntu/natty/pixman/prop001

« back to all changes in this revision

Viewing changes to pixman/pixman-compose.c

  • Committer: Bazaar Package Importer
  • Author(s): Julien Cristau
  • Date: 2007-11-25 00:41:31 UTC
  • mfrom: (1.1.2 upstream)
  • Revision ID: james.westby@ubuntu.com-20071125004131-7qre336ftz7eb95l
Tags: 0.9.6-1
http://bugs.debian.org/452734
* New upstream release (closes: #452734).
  + 02_no-sse.diff: remove, fix included upstream;
  + 03_fbFetchTransformed_64bit_fix.diff: remove, 64bit issues should be
    fixed too.

Show diffs side-by-side

added added

removed removed

Lines of Context:
pixman/pixman-compose.c
23
23
 * SOFTWARE.
24
24
 */
25
25
 
 
26
#ifdef HAVE_CONFIG_H
26
27
#include <config.h>
 
28
#endif
27
29
 
28
30
#include <stdlib.h>
29
31
#include <string.h>
2878
2880
static void fbFetch(bits_image_t * pict, int x, int y, int width, uint32_t *buffer, uint32_t *mask, uint32_t maskBits)
2879
2881
{
2880
2882
    uint32_t *bits;
2881
 
    uint32_t stride;
 
2883
    int32_t stride;
2882
2884
    fetchProc fetch = fetchProcForPicture(pict);
2883
2885
    const pixman_indexed_t * indexed = pict->indexed;
2884
2886
    
3558
3560
static void fbFetchTransformed(bits_image_t * pict, int x, int y, int width, uint32_t *buffer, uint32_t *mask, uint32_t maskBits)
3559
3561
{
3560
3562
    uint32_t     *bits;
3561
 
    uint32_t    stride;
 
3563
    int32_t    stride;
3562
3564
    fetchPixelProc   fetch;
3563
3565
    pixman_vector_t     v;
3564
3566
    pixman_vector_t  unit;
4091
4093
static void fbStore(bits_image_t * pict, int x, int y, int width, uint32_t *buffer)
4092
4094
{
4093
4095
    uint32_t *bits;
4094
 
    uint32_t stride;
 
4096
    int32_t stride;
4095
4097
    storeProc store = storeProcForPicture(pict);
4096
4098
    const pixman_indexed_t * indexed = pict->indexed;
4097
4099
    
4105
4107
static void fbStoreExternalAlpha(bits_image_t * pict, int x, int y, int width, uint32_t *buffer)
4106
4108
{
4107
4109
    uint32_t *bits, *alpha_bits;
4108
 
    uint32_t stride, astride;
 
4110
    int32_t stride, astride;
4109
4111
    int ax, ay;
4110
4112
    storeProc store;
4111
4113
    storeProc astore;
4161
4163
    unsigned int srcClass = SOURCE_IMAGE_CLASS_UNKNOWN;
4162
4164
    unsigned int maskClass = SOURCE_IMAGE_CLASS_UNKNOWN;
4163
4165
    uint32_t *bits;
4164
 
    uint32_t stride;
 
4166
    int32_t stride;
4165
4167
    int xoff, yoff;
4166
4168
    
4167
4169
    if (data->op == PIXMAN_OP_CLEAR)