# HG changeset patch # User Matti Hamalainen # Date 1558822617 -10800 # Node ID 3fcf1c3a32872d550ded79c074c88093ec800da7 # Parent 9dc2976e9fa373a4af1aef4f792a5795dd516df6 Change decFunction() argument order in DMC64EncDecOp. diff -r 9dc2976e9fa3 -r 3fcf1c3a3287 tools/lib64fmts.c --- a/tools/lib64fmts.c Sat May 25 18:57:37 2019 +0300 +++ b/tools/lib64fmts.c Sun May 26 01:16:57 2019 +0300 @@ -242,7 +242,7 @@ } -static BOOL fmtDrazLaceGetLaceType(DMC64Image *img, const DMC64EncDecOp *op, +static BOOL fmtDrazLaceGetLaceType(const DMC64EncDecOp *op, DMC64Image *img, const DMGrowBuf *buf, const DMC64ImageCommonFormat *fmt) { (void) fmt; @@ -577,7 +577,7 @@ } -static BOOL fmtTruePaintGetLaceType(DMC64Image *img, const DMC64EncDecOp *op, +static BOOL fmtTruePaintGetLaceType(const DMC64EncDecOp *op, DMC64Image *img, const DMGrowBuf *buf, const DMC64ImageCommonFormat *fmt) { (void) op; @@ -961,7 +961,7 @@ } -static BOOL fmtECIGetLaceType(DMC64Image *img, const DMC64EncDecOp *op, +static BOOL fmtECIGetLaceType(const DMC64EncDecOp *op, DMC64Image *img, const DMGrowBuf *buf, const DMC64ImageCommonFormat *fmt) { (void) op; diff -r 9dc2976e9fa3 -r 3fcf1c3a3287 tools/lib64gfx.c --- a/tools/lib64gfx.c Sat May 25 18:57:37 2019 +0300 +++ b/tools/lib64gfx.c Sun May 26 01:16:57 2019 +0300 @@ -1056,7 +1056,7 @@ case DO_FUNC: if (op->decFunction != NULL && - !op->decFunction(img, op, buf, fmt->format)) + !op->decFunction(op, img, buf, fmt->format)) { return dmError(DMERR_INTERNAL, "Decode op custom function failed: op #%d, " diff -r 9dc2976e9fa3 -r 3fcf1c3a3287 tools/lib64gfx.h --- a/tools/lib64gfx.h Sat May 25 18:57:37 2019 +0300 +++ b/tools/lib64gfx.h Sun May 26 01:16:57 2019 +0300 @@ -184,7 +184,7 @@ size_t size; // Size of data (0 for "default") size_t offs2; // Offset in data-block - BOOL (*decFunction)(DMC64Image *img, const struct _DMC64EncDecOp *op, const DMGrowBuf *buf, const DMC64ImageCommonFormat *fmt); + BOOL (*decFunction)(const struct _DMC64EncDecOp *op, DMC64Image *img, const DMGrowBuf *buf, const DMC64ImageCommonFormat *fmt); BOOL (*encFunction)(const struct _DMC64EncDecOp *op, DMGrowBuf *buf, const DMC64Image *img, const DMC64ImageCommonFormat *fmt); } DMC64EncDecOp;