* change source format

git-svn-id: svn+ssh://svn.sourceforge.jp/svnroot/modchxj/mod_chxj/trunk@661 1a406e8e-add9-4483-a2c8-d8cac5b7c224

diff --git a/src/chxj_img_conv_format.c b/src/chxj_img_conv_format.c
index fb555c1..bc0569e 100644 (file)
--- a/src/chxj_img_conv_format.c
+++ b/src/chxj_img_conv_format.c
@@ -539,18 +539,17 @@ s_create_cache_file(request_rec*       r,
       return HTTP_NOT_FOUND;
     }
 
-    if if (MagickStripImage(magick_wand) == 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/bmp");
-    ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r,"convert to bmp(unsupported)");
+
+    DBG(r, "convert to bmp(unsupported)");
   }
   /*--------------------------------------------------------------------------*/
   /* Add Comment (Copyright and so on.)                                       */