diff options
Diffstat (limited to 'util')
| -rwxr-xr-x | util/cairo-api-update | 2 | ||||
| -rw-r--r-- | util/cairo-script/cairo-script-hash.c | 2 | ||||
| -rw-r--r-- | util/cairo-trace/trace.c | 25 |
3 files changed, 7 insertions, 22 deletions
diff --git a/util/cairo-api-update b/util/cairo-api-update index e16df43fd..cff33317b 100755 --- a/util/cairo-api-update +++ b/util/cairo-api-update @@ -3,7 +3,7 @@ set -e if [ $# -lt 1 ]; then argv0=`basename $0` - echo "$argv0: Update source code to the lastest Cairo API" >&2 + echo "$argv0: Update source code to the latest Cairo API" >&2 echo "" >&2 echo "Usage: $argv0 file [...]" >&2 exit 1 diff --git a/util/cairo-script/cairo-script-hash.c b/util/cairo-script/cairo-script-hash.c index 58786fcd0..dbda407bc 100644 --- a/util/cairo-script/cairo-script-hash.c +++ b/util/cairo-script/cairo-script-hash.c @@ -153,7 +153,7 @@ _csi_hash_table_init (csi_hash_table_t *hash_table, * _csi_hash_table_destroy is called. It is a fatal error otherwise, * and this function will halt. The rationale for this behavior is to * avoid memory leaks and to avoid needless complication of the API - * with destroy notifiy callbacks. + * with destroy notify callbacks. * * WARNING: The hash_table must have no running iterators in it when * _csi_hash_table_destroy is called. It is a fatal error otherwise, 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; |