comparison gui/util/bitmap.c @ 33114:5ad451a5ebec

Remove useless warning message. Instead, add debug message and return whether conversion was successful or not and use the return code to issue an appropriate error message.

33113:cc6d4af87b99

{
    free(bf->Image);
    memset(bf, 0, sizeof(*bf));
}

void Convert32to1(txSample *in, txSample *out, int adaptivlimit)
{
    out->Width     = in->Width;
    out->Height    = in->Height;
    out->BPP       = 1;
    out->ImageSize = (out->Width * out->Height + 7) / 8;

    out->Image = calloc(1, out->ImageSize);

    if (out->Image == NULL)
        mp_msg(MSGT_GPLAYER, MSGL_WARN, MSGTR_NotEnoughMemoryC32To1);
    else {
        int i, b, c = 0;
        unsigned int *buf = NULL;
        unsigned char tmp = 0;
        int nothaveshape  = 1;

        if (nothaveshape) {
            free(out->Image);
            out->Image = NULL;
        }
    }
}

33114:5ad451a5ebec

{
    free(bf->Image);
    memset(bf, 0, sizeof(*bf));
}

int Convert32to1(txSample *in, txSample *out, int adaptivlimit)
{
    out->Width     = in->Width;
    out->Height    = in->Height;
    out->BPP       = 1;
    out->ImageSize = (out->Width * out->Height + 7) / 8;

    out->Image = calloc(1, out->ImageSize);

    if (out->Image == NULL) {
        mp_dbg(MSGT_GPLAYER, MSGL_DBG2, "[bitmap] not enough memory: %lu\n", out->ImageSize);
        return 0;
    } else {
        int i, b, c = 0;
        unsigned int *buf = NULL;
        unsigned char tmp = 0;
        int nothaveshape  = 1;

        if (nothaveshape) {
            free(out->Image);
            out->Image = NULL;
        }
    }

    return 1;
}