MirrorSave
/
libcaesium
mirror of https://github.com/Lymphatus/libcaesium.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #10 from yhh2021/master 

Rename display_error to libcaesium_display_error for the sake of name overlapping
This commit is contained in:
Matteo Paonessa 2021-09-01 15:13:04 +02:00 committed by GitHub
parent ecd7c31ba9 e046843dc2
commit 2c1256ebbf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
caesium/caesium.c
View File

@ -13,7 +13,7 @@ bool cs_compress(const char *input_path, const char *output_path, cs_image_pars
int compression_step_result; int compression_step_result;
if ((pInputFile = fopen(input_path, "rb")) == NULL) { if ((pInputFile = fopen(input_path, "rb")) == NULL) {
display_error(ERROR, 104); libcaesium_display_error(ERROR, 104);
*err_n = error_code; *err_n = error_code;
return result; return result;
} }
@ -23,7 +23,7 @@ bool cs_compress(const char *input_path, const char *output_path, cs_image_pars
fclose(pInputFile); fclose(pInputFile);
if (type == UNKN) { if (type == UNKN) {
display_error(WARNING, 103); libcaesium_display_error(WARNING, 103);
} else if (type == CS_JPEG) { } else if (type == CS_JPEG) {
if (options->jpeg.quality != 0) { if (options->jpeg.quality != 0) {
compression_step_result = cs_jpeg_compress(output_path, cs_jpeg_decompress(input_path, &options->jpeg), &options->jpeg); compression_step_result = cs_jpeg_compress(output_path, cs_jpeg_decompress(input_path, &options->jpeg), &options->jpeg);

2
caesium/error.c
View File

@ -5,7 +5,7 @@
int error_code = 0; int error_code = 0;
void display_error(error_level level, int code) { void libcaesium_display_error(error_level level, int code) {
error_code = code; error_code = code;
if (VERBOSE) { if (VERBOSE) {
char *error_level = ((level) ? "[WARNING]" : "[ERROR]"); char *error_level = ((level) ? "[WARNING]" : "[ERROR]");

2
caesium/error.h
View File

@ -5,7 +5,7 @@
extern int error_code; 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); const char *get_error_message(int code);

20
caesium/jpeg.c
View File

@ -23,7 +23,7 @@ struct jpeg_decompress_struct cs_get_markers(const char *input)
//Check for errors //Check for errors
if ((fp = fopen(input, "rb")) == NULL) { if ((fp = fopen(input, "rb")) == NULL) {
display_error(ERROR, 200); libcaesium_display_error(ERROR, 200);
} }
//Create the IO instance for the input file //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 //Check for errors
if ((fp = fopen(input_file, "rb")) == NULL) { if ((fp = fopen(input_file, "rb")) == NULL) {
display_error(ERROR, 201); libcaesium_display_error(ERROR, 201);
} }
//Create the IO instance for the input file //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 //Check for errors
if ((fp = fopen(output_file, "wb")) == NULL) { if ((fp = fopen(output_file, "wb")) == NULL) {
display_error(ERROR, 202); libcaesium_display_error(ERROR, 202);
} }
//CRITICAL - This is the optimization step //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 //Check for errors
if ((fp = fopen(output_file, "wb")) == NULL) { if ((fp = fopen(output_file, "wb")) == NULL) {
display_error(ERROR, 203); libcaesium_display_error(ERROR, 203);
} }
tjCompressHandle = tjInitCompress(); tjCompressHandle = tjInitCompress();
@ -170,7 +170,7 @@ int cs_jpeg_compress(const char *output_file, unsigned char *image_buffer, cs_jp
options->quality, options->quality,
options->dct_method); options->dct_method);
if (result == -1) { if (result == -1) {
display_error(ERROR, 207); libcaesium_display_error(ERROR, 207);
} else { } else {
fwrite(output_buffer, output_size, 1, fp); 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; int fileWidth = 0, fileHeight = 0, jpegSubsamp = 0, colorSpace = 0, result = 0;
if ((fp = fopen(fileName, "rb")) == NULL) { if ((fp = fopen(fileName, "rb")) == NULL) {
display_error(ERROR, 204); libcaesium_display_error(ERROR, 204);
} }
fseek(fp, 0, SEEK_END); fseek(fp, 0, SEEK_END);
sourceJpegBufferSize = ftell(fp); sourceJpegBufferSize = ftell(fp);
if (sourceJpegBufferSize == -1) { if (sourceJpegBufferSize == -1) {
display_error(ERROR, 205); libcaesium_display_error(ERROR, 205);
} }
if (sourceJpegBufferSize > INT_MAX) { if (sourceJpegBufferSize > INT_MAX) {
display_error(ERROR, 206); libcaesium_display_error(ERROR, 206);
} }
sourceJpegBuffer = tjAlloc((int) sourceJpegBufferSize); sourceJpegBuffer = tjAlloc((int) sourceJpegBufferSize);
@ -211,7 +211,7 @@ unsigned char *cs_jpeg_decompress(const char *fileName, cs_jpeg_pars *options)
&jpegSubsamp, &colorSpace); &jpegSubsamp, &colorSpace);
if (colorSpace == 4) { //CMYK if (colorSpace == 4) { //CMYK
display_error(WARNING, 209); libcaesium_display_error(WARNING, 209);
return 0; return 0;
} }
@ -233,7 +233,7 @@ unsigned char *cs_jpeg_decompress(const char *fileName, cs_jpeg_pars *options)
colorSpace, colorSpace,
options->dct_method); options->dct_method);
if (result == -1) { if (result == -1) {
display_error(ERROR, 208); libcaesium_display_error(ERROR, 208);
} }
fclose(fp); fclose(fp);

6
caesium/png.c
View File

@ -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) { if (options->scale_factor > 0.0 && options->scale_factor < 1.0) {
result = cs_png_resize(input, output, options->scale_factor); result = cs_png_resize(input, output, options->scale_factor);
if (!result) { if (!result) {
display_error(ERROR, 304); libcaesium_display_error(ERROR, 304);
return result; return result;
} }
} else if (options->scale_factor != 1.0) { } else if (options->scale_factor != 1.0) {
display_error(ERROR, 305); libcaesium_display_error(ERROR, 305);
return false; return false;
} }
@ -76,7 +76,7 @@ bool cs_png_optimize(const char *input, const char *output, cs_png_pars *options
free(orig_buffer); free(orig_buffer);
free(resultpng); free(resultpng);
if (error_code != 0) { if (error_code != 0) {
display_error(ERROR, error_code); libcaesium_display_error(ERROR, error_code);
} }
return result; return result;
} }

2
caesium/utils.c
View File

@ -9,7 +9,7 @@ image_type detect_image_type(FILE *pFile)
unsigned char buffer[2]; unsigned char buffer[2];
if (pFile == NULL) { if (pFile == NULL) {
display_error(WARNING, 101); libcaesium_display_error(WARNING, 101);
return UNKN; return UNKN;
} }