comparison sub/font_load_ft.c @ 36602:5964549c821f

Fix handling of option 'subfont-encoding'. prepare_charset_unicode() is supposed to work without iconv which it does indeed. So, move the function definition out of the '#ifdef CONFIG_ICONV' block. As a result, charset_size can be uninitialized and charmap may be unused. Fix them both.

36601:63661fc7b53b

	return -1;
    }

    return charset_size;
}

static int prepare_charset_unicode(FT_Face face, FT_ULong *charset, FT_ULong *charcodes) {
#ifdef HAVE_FREETYPE21
    FT_ULong  charcode;
#else

#endif
    mp_msg(MSGT_OSD, MSGL_V, "Unicode font: %d glyphs.\n", i);

    return i;
}
#endif

static font_desc_t* init_font_desc(void)
{
    font_desc_t *desc = calloc(1, sizeof(*desc));
    if(!desc) return NULL;

    FT_Face face;

    FT_ULong *my_charset = malloc(MAX_CHARSET_SIZE * sizeof(FT_ULong)); /* characters we want to render; Unicode */
    FT_ULong *my_charcodes = malloc(MAX_CHARSET_SIZE * sizeof(FT_ULong)); /* character codes in 'encoding' */

    char *charmap = "ucs-4";
    int err;
    int charset_size;
    int i, j;
    int unicode;

    float movie_size;

	mp_msg(MSGT_OSD, MSGL_WARN, MSGTR_LIBVO_FONT_LOAD_FT_SubFaceFailed);
	goto gen_osd;
    }
    desc->face_cnt++;

#ifdef CONFIG_ICONV
    if (unicode)
	charset_size = prepare_charset_unicode(face, my_charset, my_charcodes);
    else
	charset_size = prepare_charset(charmap, subtitle_font_encoding, my_charset, my_charcodes);

    if (charset_size < 0) {
	mp_msg(MSGT_OSD, MSGL_ERR, MSGTR_LIBVO_FONT_LOAD_FT_SubFontCharsetFailed);
	goto err_out;
    }
#else
    goto err_out;
#endif

//    fprintf(stderr, "fg: prepare t = %f\n", GetTimer()-t);

    err = prepare_font(desc, face, subtitle_font_ppem, desc->face_cnt-1,
		       charset_size, my_charset, my_charcodes, unicode,

36602:5964549c821f

	return -1;
    }

    return charset_size;
}
#endif

static int prepare_charset_unicode(FT_Face face, FT_ULong *charset, FT_ULong *charcodes) {
#ifdef HAVE_FREETYPE21
    FT_ULong  charcode;
#else

#endif
    mp_msg(MSGT_OSD, MSGL_V, "Unicode font: %d glyphs.\n", i);

    return i;
}

static font_desc_t* init_font_desc(void)
{
    font_desc_t *desc = calloc(1, sizeof(*desc));
    if(!desc) return NULL;

    FT_Face face;

    FT_ULong *my_charset = malloc(MAX_CHARSET_SIZE * sizeof(FT_ULong)); /* characters we want to render; Unicode */
    FT_ULong *my_charcodes = malloc(MAX_CHARSET_SIZE * sizeof(FT_ULong)); /* character codes in 'encoding' */

    int err;
    int charset_size = -1;
    int i, j;
    int unicode;

    float movie_size;

	mp_msg(MSGT_OSD, MSGL_WARN, MSGTR_LIBVO_FONT_LOAD_FT_SubFaceFailed);
	goto gen_osd;
    }
    desc->face_cnt++;

    if (unicode)
	charset_size = prepare_charset_unicode(face, my_charset, my_charcodes);
#ifdef CONFIG_ICONV
    else
	charset_size = prepare_charset("ucs-4", subtitle_font_encoding, my_charset, my_charcodes);
#endif

    if (charset_size < 0) {
	mp_msg(MSGT_OSD, MSGL_ERR, MSGTR_LIBVO_FONT_LOAD_FT_SubFontCharsetFailed);
	goto err_out;
    }

//    fprintf(stderr, "fg: prepare t = %f\n", GetTimer()-t);

    err = prepare_font(desc, face, subtitle_font_ppem, desc->face_cnt-1,
		       charset_size, my_charset, my_charcodes, unicode,