bytereader, bytewriter: fix up inline functions to make g++ happy

gstbytereader.h: In function ‘guint8* gst_byte_reader_dup_data_unchecked(GstByteReader*, guint)’:
gstbytereader.h:249:75: error: invalid conversion from ‘void*’ to ‘guint8*’
gstbytewriter.h: In function ‘gboolean _gst_byte_writer_ensure_free_space_inline(GstByteWriter*, guint)’:
gstbytewriter.h:196:75: error: invalid conversion from ‘void*’ to ‘guint8*’

https://bugzilla.gnome.org/show_bug.cgi?id=645595

diff --git a/libs/gst/base/gstbytereader.h b/libs/gst/base/gstbytereader.h
index f25c3b5..8ce76df 100644 (file)
--- a/libs/gst/base/gstbytereader.h
+++ b/libs/gst/base/gstbytereader.h
@@ -246,7 +246,8 @@ gst_byte_reader_get_data_unchecked (GstByteReader * reader, guint size)
 static inline guint8 *
 gst_byte_reader_dup_data_unchecked (GstByteReader * reader, guint size)
 {
-  return g_memdup (gst_byte_reader_get_data_unchecked (reader, size), size);
+  gconstpointer data = gst_byte_reader_get_data_unchecked (reader, size);
+  return (guint8 *) g_memdup (data, size);
 }
 
 /* Unchecked variants that should not be used */

diff --git a/libs/gst/base/gstbytewriter.h b/libs/gst/base/gstbytewriter.h
index 186480d..8fcd53d 100644 (file)
--- a/libs/gst/base/gstbytewriter.h
+++ b/libs/gst/base/gstbytewriter.h
@@ -183,7 +183,7 @@ _gst_byte_writer_next_pow2 (guint n)
 static inline gboolean
 _gst_byte_writer_ensure_free_space_inline (GstByteWriter * writer, guint size)
 {
-  guint8 *data;
+  gpointer data;
 
   if (G_LIKELY (size <= writer->alloc_size - writer->parent.byte))
     return TRUE;
@@ -197,7 +197,7 @@ _gst_byte_writer_ensure_free_space_inline (GstByteWriter * writer, guint size)
   if (G_UNLIKELY (data == NULL))
     return FALSE;
 
-  writer->parent.data = data;
+  writer->parent.data = (guint8 *) data;
 
   return TRUE;
 }