[libbluray-devel] Fix type

hpi1 git at videolan.org
Sun Feb 15 22:45:58 CET 2015


libbluray | branch: master | hpi1 <hpi1 at anonymous.org> | Sun Feb 15 22:42:31 2015 +0200| [a10abcc6cd4821685220cdab79e54d44c1eb113a] | committer: hpi1

Fix type

> http://git.videolan.org/gitweb.cgi/libbluray.git/?a=commit;h=a10abcc6cd4821685220cdab79e54d44c1eb113a
---

 src/libbluray/decoders/graphics_controller.c |    2 +-
 src/libbluray/decoders/graphics_controller.h |    3 ++-
 src/libbluray/decoders/textst_render.c       |    2 +-
 src/libbluray/decoders/textst_render.h       |    2 +-
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/libbluray/decoders/graphics_controller.c b/src/libbluray/decoders/graphics_controller.c
index 1a30aed..a034506 100644
--- a/src/libbluray/decoders/graphics_controller.c
+++ b/src/libbluray/decoders/graphics_controller.c
@@ -929,7 +929,7 @@ static int _textst_style_select(GRAPHICS_CONTROLLER *p, int user_style_idx)
     return -1;
 }
 
-int gc_add_font(GRAPHICS_CONTROLLER *p, void *data, int64_t size)
+int gc_add_font(GRAPHICS_CONTROLLER *p, void *data, size_t size)
 {
     if (!p) {
         return -1;
diff --git a/src/libbluray/decoders/graphics_controller.h b/src/libbluray/decoders/graphics_controller.h
index a01bf35..dca6d4a 100644
--- a/src/libbluray/decoders/graphics_controller.h
+++ b/src/libbluray/decoders/graphics_controller.h
@@ -25,6 +25,7 @@
 #include "libbluray/bdnav/uo_mask_table.h"
 
 #include <stdint.h>
+#include <stddef.h> /* size_t */
 
 /*
  *
@@ -131,6 +132,6 @@ BD_PRIVATE int                  gc_run(GRAPHICS_CONTROLLER *p,
  */
 
 BD_PRIVATE int                  gc_add_font(GRAPHICS_CONTROLLER *p,
-                                            void *data, int64_t size);
+                                            void *data, size_t size);
 
 #endif // _GRAPHICS_CONTROLLER_H_
diff --git a/src/libbluray/decoders/textst_render.c b/src/libbluray/decoders/textst_render.c
index 8fda7db..d90e787 100644
--- a/src/libbluray/decoders/textst_render.c
+++ b/src/libbluray/decoders/textst_render.c
@@ -110,7 +110,7 @@ void textst_render_free(TEXTST_RENDER **pp)
  * settings
  */
 
-int textst_render_add_font(TEXTST_RENDER *p, void *data, int64_t size)
+int textst_render_add_font(TEXTST_RENDER *p, void *data, size_t size)
 {
 #ifdef HAVE_FT2
     FONT_DATA *tmp = realloc(p->font, sizeof(*(p->font)) * (p->font_count + 1));
diff --git a/src/libbluray/decoders/textst_render.h b/src/libbluray/decoders/textst_render.h
index 784a328..526bf7b 100644
--- a/src/libbluray/decoders/textst_render.h
+++ b/src/libbluray/decoders/textst_render.h
@@ -52,7 +52,7 @@ BD_PRIVATE void           textst_render_free(TEXTST_RENDER **pp);
  *
  */
 
-BD_PRIVATE int textst_render_add_font(TEXTST_RENDER *p, void *data, int64_t size);
+BD_PRIVATE int textst_render_add_font(TEXTST_RENDER *p, void *data, size_t size);
 BD_PRIVATE int textst_render_set_char_code(TEXTST_RENDER *p, int char_code);
 BD_PRIVATE int textst_render(TEXTST_RENDER *p,
                              TEXTST_BITMAP *bmp,



More information about the libbluray-devel mailing list