From e046843dc2d71911f734c2876f476b55a1174009 Mon Sep 17 00:00:00 2001 From: yhh2021 Date: Wed, 1 Sep 2021 19:56:51 +0800 Subject: [PATCH] Rename display_error to libcaesium_display_error for the sake of name overlapping. --- caesium/caesium.c | 4 ++-- caesium/error.c | 2 +- caesium/error.h | 2 +- caesium/jpeg.c | 20 ++++++++++---------- caesium/png.c | 6 +++--- caesium/utils.c | 2 +- 6 files changed, 18 insertions(+), 18 deletions(-) diff --git a/caesium/caesium.c b/caesium/caesium.c index f48e8bc..57e64fe 100644 --- a/caesium/caesium.c +++ b/caesium/caesium.c @@ -13,7 +13,7 @@ bool cs_compress(const char *input_path, const char *output_path, cs_image_pars int compression_step_result; if ((pInputFile = fopen(input_path, "rb")) == NULL) { - display_error(ERROR, 104); + libcaesium_display_error(ERROR, 104); *err_n = error_code; return result; } @@ -23,7 +23,7 @@ bool cs_compress(const char *input_path, const char *output_path, cs_image_pars fclose(pInputFile); if (type == UNKN) { - display_error(WARNING, 103); + libcaesium_display_error(WARNING, 103); } else if (type == CS_JPEG) { if (options->jpeg.quality != 0) { compression_step_result = cs_jpeg_compress(output_path, cs_jpeg_decompress(input_path, &options->jpeg), &options->jpeg); diff --git a/caesium/error.c b/caesium/error.c index b365eb1..b5fce9a 100644 --- a/caesium/error.c +++ b/caesium/error.c @@ -5,7 +5,7 @@ int error_code = 0; -void display_error(error_level level, int code) { +void libcaesium_display_error(error_level level, int code) { error_code = code; if (VERBOSE) { char *error_level = ((level) ? "[WARNING]" : "[ERROR]"); diff --git a/caesium/error.h b/caesium/error.h index c45f1b2..5c40568 100644 --- a/caesium/error.h +++ b/caesium/error.h @@ -5,7 +5,7 @@ extern int error_code; -void display_error(error_level level, int code); +void libcaesium_display_error(error_level level, int code); const char *get_error_message(int code); diff --git a/caesium/jpeg.c b/caesium/jpeg.c index 987d8c5..fe5cc65 100644 --- a/caesium/jpeg.c +++ b/caesium/jpeg.c @@ -23,7 +23,7 @@ struct jpeg_decompress_struct cs_get_markers(const char *input) //Check for errors if ((fp = fopen(input, "rb")) == NULL) { - display_error(ERROR, 200); + libcaesium_display_error(ERROR, 200); } //Create the IO instance for the input file @@ -71,7 +71,7 @@ bool cs_jpeg_optimize(const char *input_file, const char *output_file, cs_jpeg_p //Check for errors if ((fp = fopen(input_file, "rb")) == NULL) { - display_error(ERROR, 201); + libcaesium_display_error(ERROR, 201); } //Create the IO instance for the input file @@ -103,7 +103,7 @@ bool cs_jpeg_optimize(const char *input_file, const char *output_file, cs_jpeg_p //Check for errors if ((fp = fopen(output_file, "wb")) == NULL) { - display_error(ERROR, 202); + libcaesium_display_error(ERROR, 202); } //CRITICAL - This is the optimization step @@ -153,7 +153,7 @@ int cs_jpeg_compress(const char *output_file, unsigned char *image_buffer, cs_jp //Check for errors if ((fp = fopen(output_file, "wb")) == NULL) { - display_error(ERROR, 203); + libcaesium_display_error(ERROR, 203); } tjCompressHandle = tjInitCompress(); @@ -170,7 +170,7 @@ int cs_jpeg_compress(const char *output_file, unsigned char *image_buffer, cs_jp options->quality, options->dct_method); if (result == -1) { - display_error(ERROR, 207); + libcaesium_display_error(ERROR, 207); } else { fwrite(output_buffer, output_size, 1, fp); } @@ -192,15 +192,15 @@ unsigned char *cs_jpeg_decompress(const char *fileName, cs_jpeg_pars *options) int fileWidth = 0, fileHeight = 0, jpegSubsamp = 0, colorSpace = 0, result = 0; if ((fp = fopen(fileName, "rb")) == NULL) { - display_error(ERROR, 204); + libcaesium_display_error(ERROR, 204); } fseek(fp, 0, SEEK_END); sourceJpegBufferSize = ftell(fp); if (sourceJpegBufferSize == -1) { - display_error(ERROR, 205); + libcaesium_display_error(ERROR, 205); } if (sourceJpegBufferSize > INT_MAX) { - display_error(ERROR, 206); + libcaesium_display_error(ERROR, 206); } sourceJpegBuffer = tjAlloc((int) sourceJpegBufferSize); @@ -211,7 +211,7 @@ unsigned char *cs_jpeg_decompress(const char *fileName, cs_jpeg_pars *options) &jpegSubsamp, &colorSpace); if (colorSpace == 4) { //CMYK - display_error(WARNING, 209); + libcaesium_display_error(WARNING, 209); return 0; } @@ -233,7 +233,7 @@ unsigned char *cs_jpeg_decompress(const char *fileName, cs_jpeg_pars *options) colorSpace, options->dct_method); if (result == -1) { - display_error(ERROR, 208); + libcaesium_display_error(ERROR, 208); } fclose(fp); diff --git a/caesium/png.c b/caesium/png.c index 003a923..0efec62 100644 --- a/caesium/png.c +++ b/caesium/png.c @@ -23,11 +23,11 @@ bool cs_png_optimize(const char *input, const char *output, cs_png_pars *options if (options->scale_factor > 0.0 && options->scale_factor < 1.0) { result = cs_png_resize(input, output, options->scale_factor); if (!result) { - display_error(ERROR, 304); + libcaesium_display_error(ERROR, 304); return result; } } else if (options->scale_factor != 1.0) { - display_error(ERROR, 305); + libcaesium_display_error(ERROR, 305); return false; } @@ -76,7 +76,7 @@ bool cs_png_optimize(const char *input, const char *output, cs_png_pars *options free(orig_buffer); free(resultpng); if (error_code != 0) { - display_error(ERROR, error_code); + libcaesium_display_error(ERROR, error_code); } return result; } diff --git a/caesium/utils.c b/caesium/utils.c index 79b185e..2b017d2 100644 --- a/caesium/utils.c +++ b/caesium/utils.c @@ -9,7 +9,7 @@ image_type detect_image_type(FILE *pFile) unsigned char buffer[2]; if (pFile == NULL) { - display_error(WARNING, 101); + libcaesium_display_error(WARNING, 101); return UNKN; }