diff options
author | Edward Hervey <bilboed@bilboed.com> | 2007-05-16 16:50:23 +0000 |
---|---|---|
committer | Edward Hervey <bilboed@bilboed.com> | 2007-05-16 16:50:23 +0000 |
commit | ee21b60cd7ff15e916462b27c9fb6ed995e2d67a (patch) | |
tree | 618b5246453a3041b68471a5fa92b2649e452e47 | |
parent | 62e85e8f7203a70c3a9d5ac6e9131aa4fccfcb8a (diff) |
ext/libpng/gstpngdec.c: Fix build on macosx.
Original commit message from CVS:
* ext/libpng/gstpngdec.c: (user_endrow_callback), (user_read_data):
Fix build on macosx.
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | ext/libpng/gstpngdec.c | 7 |
2 files changed, 9 insertions, 3 deletions
@@ -1,3 +1,8 @@ +2007-05-16 Edward Hervey <edward@fluendo.com> + + * ext/libpng/gstpngdec.c: (user_endrow_callback), (user_read_data): + Fix build on macosx. + 2007-05-16 Sebastian Dröge <slomo@circular-chaos.org> * ext/raw1394/gstdv1394src.c: (gst_dv1394src_uri_set_uri): diff --git a/ext/libpng/gstpngdec.c b/ext/libpng/gstpngdec.c index e5cab832..f6150e88 100644 --- a/ext/libpng/gstpngdec.c +++ b/ext/libpng/gstpngdec.c @@ -221,8 +221,8 @@ user_endrow_callback (png_structp png_ptr, png_bytep new_row, if (GST_IS_BUFFER (pngdec->buffer_out)) { size_t offset = row_num * GST_ROUND_UP_4 (pngdec->rowbytes); - GST_LOG ("got row %u, copying in buffer %p at offset %d", (guint) row_num, - pngdec->buffer_out, offset); + GST_LOG ("got row %u, copying in buffer %p at offset %" G_GSIZE_FORMAT, + (guint) row_num, pngdec->buffer_out, offset); memcpy (GST_BUFFER_DATA (pngdec->buffer_out) + offset, new_row, pngdec->rowbytes); pngdec->ret = GST_FLOW_OK; @@ -307,7 +307,8 @@ user_read_data (png_structp png_ptr, png_bytep data, png_size_t length) pngdec = GST_PNGDEC (png_ptr->io_ptr); - GST_LOG ("reading %d bytes of data at offset %d", length, pngdec->offset); + GST_LOG ("reading %" G_GSIZE_FORMAT " bytes of data at offset %d", length, + pngdec->offset); ret = gst_pad_pull_range (pngdec->sinkpad, pngdec->offset, length, &buffer); if ((ret != GST_FLOW_OK) || (GST_BUFFER_SIZE (buffer) != length)) |