From b4d5b6c4ed5ca74966de9bcc9d9c1c34a712622b Mon Sep 17 00:00:00 2001 From: konn Date: Thu, 15 Jun 2006 13:58:57 +0000 Subject: [PATCH] * change source format git-svn-id: svn+ssh://svn.sourceforge.jp/svnroot/modchxj/mod_chxj/trunk@658 1a406e8e-add9-4483-a2c8-d8cac5b7c224 --- src/chxj_img_conv_format.c | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/src/chxj_img_conv_format.c b/src/chxj_img_conv_format.c index 03dda47b..a9140b2a 100644 --- a/src/chxj_img_conv_format.c +++ b/src/chxj_img_conv_format.c @@ -478,30 +478,27 @@ s_create_cache_file(request_rec* r, DBG(r,"convert to jpg"); } else - if (spec->available_png == 1) { - status = MagickSetImageCompression(magick_wand,ZipCompression); - if (status == MagickFalse) { + if (spec->available_png) { + if (MagickSetImageCompression(magick_wand,ZipCompression) == MagickFalse) { EXIT_MAGICK_ERROR(); return HTTP_NOT_FOUND; } - status = MagickSetImageFormat(magick_wand, "png"); - if (status == MagickFalse) { + + if (MagickSetImageFormat(magick_wand, "png") == MagickFalse) { EXIT_MAGICK_ERROR(); return HTTP_NOT_FOUND; } - status = MagickStripImage(magick_wand); - if (status == MagickFalse) { + if (MagickStripImage(magick_wand) == MagickFalse) { EXIT_MAGICK_ERROR(); return HTTP_NOT_FOUND; } - magick_wand = s_img_down_sizing(magick_wand, r, spec); - if (magick_wand == NULL) { + + if ((magick_wand = s_img_down_sizing(magick_wand, r, spec)) == NULL) return HTTP_NOT_FOUND; - } r->content_type = apr_psprintf(r->pool, "image/png"); - ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r,"convert to png"); + DBG(r, "convert to png"); } else if (spec->available_gif == 1) { -- 2.11.0