diff options
| author | Uli Schlachter <psychon@znc.in> | 2020-12-26 15:55:20 +0000 |
|---|---|---|
| committer | Uli Schlachter <psychon@znc.in> | 2020-12-26 15:55:20 +0000 |
| commit | 2a48955a331e48e40bce0bcf886b41fd83ea4c6f (patch) | |
| tree | 7ffe15b04bc1e55fbfbb7c491e05cce0ac55ee41 /util/cairo-trace/trace.c | |
| parent | 1d99f816b3804f2568ee4669cd0fe57f66ab319d (diff) | |
| parent | 2eb12d3fbc7ba727a6af5ef0893f9822ecd2d7d3 (diff) | |
| download | cairo-1.16.tar.gz | |
Merge branch 'backport-fixes' into '1.16'1.16
Cherry-pick fixes from master into 1.16
See merge request cairo/cairo!20
Diffstat (limited to 'util/cairo-trace/trace.c')
| -rw-r--r-- | util/cairo-trace/trace.c | 25 |
1 files changed, 5 insertions, 20 deletions
diff --git a/util/cairo-trace/trace.c b/util/cairo-trace/trace.c index 1fe130bba..7ce903b11 100644 --- a/util/cairo-trace/trace.c +++ b/util/cairo-trace/trace.c @@ -1680,24 +1680,6 @@ _emit_image (cairo_surface_t *image, #ifdef WORDS_BIGENDIAN switch (format) { - case CAIRO_FORMAT_A1: - for (row = height; row--; ) { - _write_data (&stream, data, (width+7)/8); - data += stride; - } - break; - case CAIRO_FORMAT_A8: - for (row = height; row--; ) { - _write_data (&stream, data, width); - data += stride; - } - break; - case CAIRO_FORMAT_RGB16_565: - for (row = height; row--; ) { - _write_data (&stream, data, 2*width); - data += stride; - } - break; case CAIRO_FORMAT_RGB24: for (row = height; row--; ) { int col; @@ -1709,10 +1691,13 @@ _emit_image (cairo_surface_t *image, data += stride; } break; + case CAIRO_FORMAT_A1: + case CAIRO_FORMAT_A8: + case CAIRO_FORMAT_RGB16_565: case CAIRO_FORMAT_RGB30: case CAIRO_FORMAT_ARGB32: for (row = height; row--; ) { - _write_data (&stream, data, 4*width); + _write_data (&stream, data, len); data += stride; } break; @@ -1777,7 +1762,7 @@ _emit_image (cairo_surface_t *image, int col; for (col = 0; col < width; col++) dst[col] = bswap_32 (src[col]); - _write_data (&stream, rowdata, 4*width); + _write_data (&stream, rowdata, len); data += stride; } break; |