Skip to content

[IMPROVEMENT] Fix some warnings (#896 ) #897

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
cfsmp3 merged 3 commits into from
Jan 12, 2018
Merged

[IMPROVEMENT] Fix some warnings (#896 ) #897

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fbeabaf
Fix some warnings
harrynull Jan 12, 2018
b1bece2
Fix more warnings
harrynull Jan 12, 2018
e5396dd
Fix more warnings
harrynull Jan 12, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions src/lib_ccx/ccx_encoders_common.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,6 +207,9 @@ int write_cc_bitmap_as_spupng (struct cc_subtitle *sub, struct encoder_
int write_cc_bitmap_as_transcript (struct cc_subtitle *sub, struct encoder_ctx *context);
int write_cc_bitmap_as_libcurl (struct cc_subtitle *sub, struct encoder_ctx *context);

void write_spumux_header(struct encoder_ctx *ctx, struct ccx_s_write *out);
void write_spumux_footer(struct ccx_s_write *out);

struct cc_subtitle * reformat_cc_bitmap_through_sentence_buffer (struct cc_subtitle *sub, struct encoder_ctx *context);

void set_encoder_last_displayed_subs_ms(struct encoder_ctx *ctx, LLONG last_displayed_subs_ms);
Expand Down
3 changes: 3 additions & 0 deletions src/lib_ccx/ccx_encoders_helpers.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
#include "ccx_decoders_structs.h"
#include "ccx_decoders_608.h"
#include "ccx_encoders_common.h"
#include "png.h"

extern char **spell_lower;
extern char **spell_correct;
Expand Down Expand Up @@ -40,4 +41,6 @@ void shell_sort(void *base, int nb, size_t size, int(*compar)(const void*p1, con

void ccx_encoders_helpers_perform_shellsort_words(void);
void ccx_encoders_helpers_setup(enum ccx_encoding_type encoding, int no_font_color, int no_type_setting, int trim_subs);

int mapclut_paletee(png_color *palette, png_byte *alpha, uint32_t *clut, uint8_t depth);
#endif
4 changes: 2 additions & 2 deletions src/lib_ccx/ccx_encoders_spupng.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -799,11 +799,11 @@ uint32_t* utf8_to_utf32(char* src) {
len_src = strlen(src);
len_dst = (len_src + 2) * 4; // one for FEFF and one for \0

char* string_utf32 = (char *)calloc(len_dst, 1);
uint32_t* string_utf32 = (uint32_t *) calloc(len_dst, 1);
size_t inbufbytesleft = len_src;
size_t outbufbytesleft = len_dst;
char* inbuf = src;
char* outbuf = string_utf32;
char* outbuf = (char*) string_utf32;

iconv_t cd = iconv_open("UTF-32", "UTF-8");
int result = iconv(cd, &inbuf, &inbufbytesleft, &outbuf, &outbufbytesleft);
Expand Down
1 change: 1 addition & 0 deletions src/lib_ccx/ccx_encoders_transcript.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
#include "ccx_decoders_708_output.h"
#include "ccx_encoders_xds.h"
#include "ccx_encoders_helpers.h"
#include "lib_ccx.h"

#ifdef ENABLE_SHARING
#include "ccx_share.h"
Expand Down
1 change: 0 additions & 1 deletion src/lib_ccx/ffmpeg_intgr.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
#include <libavutil/log.h>
#include <libavutil/error.h>

#include "lib_ccx.h"
struct ffmpeg_ctx
{
AVFormatContext *ifmt;
Expand Down
1 change: 1 addition & 0 deletions src/lib_ccx/ffmpeg_intgr.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#ifndef _FFMPEG_INTIGRATION
#define _FFMPEG_INTIGRATION

#include "lib_ccx.h"
#ifdef ENABLE_FFMPEG
#include "libavutil/common.h"
#include "libavutil/error.h"
Expand Down
2 changes: 1 addition & 1 deletion src/lib_ccx/general_loop.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1194,7 +1194,7 @@ int rcwt_loop(struct lib_ccx_ctx *ctx)
int caps = 0;
LLONG result;
struct encoder_ctx *enc_ctx = update_encoder_list(ctx);
struct Teletext *telctx;
struct TeletextCtx *telctx;
// As BUFSIZE is a macro this is just a reminder
if (BUFSIZE < (3*0xFFFF + 10))
fatal (CCX_COMMON_EXIT_BUG_BUG, "In rcwt_loop: BUFSIZE too small for RCWT caption block.\n");
Expand Down