summaryrefslogtreecommitdiff
path: root/src/gd_jpeg.c
diff options
context:
space:
mode:
authorOndřej Surý <ondrej@sury.org>2013-04-23 10:39:47 +0200
committerOndřej Surý <ondrej@sury.org>2013-04-23 10:39:47 +0200
commitbfbbf3c9f26817f436f06ae004e1ab9d47344d8e (patch)
treeb2c1df11037734db881131eabb9f52818e9f3924 /src/gd_jpeg.c
parent0e41ffa6198b4cde634a2b6b83c6bc3a7579c6e5 (diff)
downloadlibgd-bfbbf3c9f26817f436f06ae004e1ab9d47344d8e.tar.gz
Fix E_ERROR -> GD_ERROR in JPEG_DEBUG blocks of gd_jpeg.c
Diffstat (limited to 'src/gd_jpeg.c')
-rw-r--r--src/gd_jpeg.c42
1 files changed, 21 insertions, 21 deletions
diff --git a/src/gd_jpeg.c b/src/gd_jpeg.c
index de3714c..6ea05da 100644
--- a/src/gd_jpeg.c
+++ b/src/gd_jpeg.c
@@ -162,12 +162,12 @@ BGD_DECLARE(void) gdImageJpegCtx(gdImagePtr im, gdIOCtx *outfile, int quality)
char comment[255];
#ifdef JPEG_DEBUG
- gd_error_ex(E_DEBUG, "gd-jpeg: gd JPEG version %s\n", GD_JPEG_VERSION);
- gd_error_ex(E_DEBUG, "gd-jpeg: JPEG library version %d, %d-bit sample values\n", JPEG_LIB_VERSION, BITS_IN_JSAMPLE);
+ gd_error_ex(GD_DEBUG, "gd-jpeg: gd JPEG version %s\n", GD_JPEG_VERSION);
+ gd_error_ex(GD_DEBUG, "gd-jpeg: JPEG library version %d, %d-bit sample values\n", JPEG_LIB_VERSION, BITS_IN_JSAMPLE);
if (!im->trueColor) {
for(i = 0; i < im->colorsTotal; i++) {
if(!im->open[i]) {
- gd_error_ex(E_DEBUG, "gd-jpeg: gd colormap index %d: (%d, %d, %d)\n", i, im->red[i], im->green[i], im->blue[i]);
+ gd_error_ex(GD_DEBUG, "gd-jpeg: gd colormap index %d: (%d, %d, %d)\n", i, im->red[i], im->green[i], im->blue[i]);
}
}
}
@@ -210,7 +210,7 @@ BGD_DECLARE(void) gdImageJpegCtx(gdImagePtr im, gdIOCtx *outfile, int quality)
/* If user requests interlace, translate that to progressive JPEG */
if(gdImageGetInterlaced(im)) {
#ifdef JPEG_DEBUG
- gd_error_ex(E_DEBUG, "gd-jpeg: interlace set, outputting progressive JPEG image\n");
+ gd_error_ex(GD_DEBUG, "gd-jpeg: interlace set, outputting progressive JPEG image\n");
#endif
jpeg_simple_progression(&cinfo);
}
@@ -358,9 +358,9 @@ BGD_DECLARE(gdImagePtr) gdImageCreateFromJpegCtxEx(gdIOCtx *infile, int ignore_w
int inverted = 0;
#ifdef JPEG_DEBUG
- gd_error_ex(E_DEBUG, "gd-jpeg: gd JPEG version %s\n", GD_JPEG_VERSION);
- gd_error_ex(E_DEBUG, "gd-jpeg: JPEG library version %d, %d-bit sample values\n", JPEG_LIB_VERSION, BITS_IN_JSAMPLE);
- gd_error_ex(E_DEBUG, "sizeof: %d\n", sizeof(struct jpeg_decompress_struct));
+ gd_error_ex(GD_DEBUG, "gd-jpeg: gd JPEG version %s\n", GD_JPEG_VERSION);
+ gd_error_ex(GD_DEBUG, "gd-jpeg: JPEG library version %d, %d-bit sample values\n", JPEG_LIB_VERSION, BITS_IN_JSAMPLE);
+ gd_error_ex(GD_DEBUG, "sizeof: %d\n", sizeof(struct jpeg_decompress_struct));
#endif
memset(&cinfo, 0, sizeof(cinfo));
@@ -447,49 +447,49 @@ BGD_DECLARE(gdImagePtr) gdImageCreateFromJpegCtxEx(gdIOCtx *infile, int ignore_w
}
#ifdef JPEG_DEBUG
- gd_error_ex(E_DEBUG, "gd-jpeg: JPEG image information:");
+ gd_error_ex(GD_DEBUG, "gd-jpeg: JPEG image information:");
if(cinfo.saw_JFIF_marker) {
- gd_error_ex(E_DEBUG, " JFIF version %d.%.2d", (int)cinfo.JFIF_major_version, (int)cinfo.JFIF_minor_version);
+ gd_error_ex(GD_DEBUG, " JFIF version %d.%.2d", (int)cinfo.JFIF_major_version, (int)cinfo.JFIF_minor_version);
} else if(cinfo.saw_Adobe_marker) {
- gd_error_ex(E_DEBUG, " Adobe format");
+ gd_error_ex(GD_DEBUG, " Adobe format");
} else {
- gd_error_ex(E_DEBUG, " UNKNOWN format");
+ gd_error_ex(GD_DEBUG, " UNKNOWN format");
}
- gd_error_ex(E_DEBUG, " %ux%u (raw) / %ux%u (scaled) %d-bit", cinfo.image_width,
+ gd_error_ex(GD_DEBUG, " %ux%u (raw) / %ux%u (scaled) %d-bit", cinfo.image_width,
cinfo.image_height, cinfo.output_width,
cinfo.output_height, cinfo.data_precision
);
- gd_error_ex(E_DEBUG, " %s", (cinfo.progressive_mode ? "progressive" : "baseline"));
- gd_error_ex(E_DEBUG, " image, %d quantized colors, ", cinfo.actual_number_of_colors);
+ gd_error_ex(GD_DEBUG, " %s", (cinfo.progressive_mode ? "progressive" : "baseline"));
+ gd_error_ex(GD_DEBUG, " image, %d quantized colors, ", cinfo.actual_number_of_colors);
switch(cinfo.jpeg_color_space) {
case JCS_GRAYSCALE:
- gd_error_ex(E_DEBUG, "grayscale");
+ gd_error_ex(GD_DEBUG, "grayscale");
break;
case JCS_RGB:
- gd_error_ex(E_DEBUG, "RGB");
+ gd_error_ex(GD_DEBUG, "RGB");
break;
case JCS_YCbCr:
- gd_error_ex(E_DEBUG, "YCbCr (a.k.a. YUV)");
+ gd_error_ex(GD_DEBUG, "YCbCr (a.k.a. YUV)");
break;
case JCS_CMYK:
- gd_error_ex(E_DEBUG, "CMYK");
+ gd_error_ex(GD_DEBUG, "CMYK");
break;
case JCS_YCCK:
- gd_error_ex(E_DEBUG, "YCbCrK");
+ gd_error_ex(GD_DEBUG, "YCbCrK");
break;
default:
- gd_error_ex(E_DEBUG, "UNKNOWN (value: %d)", (int)cinfo.jpeg_color_space);
+ gd_error_ex(GD_DEBUG, "UNKNOWN (value: %d)", (int)cinfo.jpeg_color_space);
break;
}
- gd_error_ex(E_DEBUG, " colorspace\n");
+ gd_error_ex(GD_DEBUG, " colorspace\n");
fflush(stdout);
#endif /* JPEG_DEBUG */