From 5208d7a146ca84f6eaf9077ffd570534d9dbe2b6 Mon Sep 17 00:00:00 2001
From: Tuomas Virtanen <katajakasa@gmail.com>
Date: Sat, 2 May 2020 03:05:16 +0300
Subject: Capitalize label names and add more consts

---
 src/internal/subtitle/renderers/kitsubimage.c | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

(limited to 'src/internal/subtitle/renderers/kitsubimage.c')

diff --git a/src/internal/subtitle/renderers/kitsubimage.c b/src/internal/subtitle/renderers/kitsubimage.c
index b9a8e48..25da545 100644
--- a/src/internal/subtitle/renderers/kitsubimage.c
+++ b/src/internal/subtitle/renderers/kitsubimage.c
@@ -21,7 +21,7 @@ static void ren_render_image_cb(Kit_SubtitleRenderer *ren, void *sub_src, double
     assert(ren != NULL);
     assert(sub_src != NULL);
 
-    AVSubtitle *sub = sub_src;
+    const AVSubtitle *sub = sub_src;
     SDL_Surface *dst = NULL;
     SDL_Surface *src = NULL;
     double start_pts = pts + start;
@@ -35,8 +35,9 @@ static void ren_render_image_cb(Kit_SubtitleRenderer *ren, void *sub_src, double
     }
 
     // Convert subtitle images from paletted to RGBA8888
+    const AVSubtitleRect *r = NULL;
     for(int n = 0; n < sub->num_rects; n++) {
-        AVSubtitleRect *r = sub->rects[n];
+        r = sub->rects[n];
         if(r->type != SUBTITLE_BITMAP)
             continue;
 
@@ -60,7 +61,7 @@ static void ren_render_image_cb(Kit_SubtitleRenderer *ren, void *sub_src, double
 }
 
 static int ren_get_img_data_cb(Kit_SubtitleRenderer *ren, Kit_TextureAtlas *atlas, SDL_Texture *texture, double current_pts) {
-    Kit_ImageSubtitleRenderer *img_ren = ren->userdata;
+    const Kit_ImageSubtitleRenderer *img_ren = ren->userdata;
     Kit_SubtitlePacket *packet = NULL;
 
     Kit_CheckAtlasTextureSize(atlas, texture);
@@ -117,14 +118,14 @@ Kit_SubtitleRenderer* Kit_CreateImageSubtitleRenderer(Kit_Decoder *dec, int vide
     // Allocate a new renderer
     Kit_SubtitleRenderer *ren = Kit_CreateSubtitleRenderer(dec);
     if(ren == NULL) {
-        goto exit_0;
+        goto EXIT_0;
     }
 
     // Allocate image renderer internal context
     Kit_ImageSubtitleRenderer *img_ren = calloc(1, sizeof(Kit_ImageSubtitleRenderer));
     if(img_ren == NULL) {
         Kit_SetError("Unable to allocate image subtitle renderer");
-        goto exit_1;
+        goto EXIT_1;
     }
 
     // Only renderer required, no other data.
@@ -139,8 +140,8 @@ Kit_SubtitleRenderer* Kit_CreateImageSubtitleRenderer(Kit_Decoder *dec, int vide
     ren->userdata = img_ren;
     return ren;
 
-exit_1:
+EXIT_1:
     Kit_CloseSubtitleRenderer(ren);
-exit_0:
+EXIT_0:
     return NULL;
 }
-- 
cgit v1.2.3