From d606a1d4f1e77eea3c3f8d272ba9b4a0483a6070 Mon Sep 17 00:00:00 2001 From: konn Date: Thu, 15 Jun 2006 13:15:17 +0000 Subject: [PATCH] * change source format git-svn-id: svn+ssh://svn.sourceforge.jp/svnroot/modchxj/mod_chxj/trunk@636 1a406e8e-add9-4483-a2c8-d8cac5b7c224 --- src/chxj_img_conv_format.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/chxj_img_conv_format.c b/src/chxj_img_conv_format.c index 288e0566..7b684f11 100644 --- a/src/chxj_img_conv_format.c +++ b/src/chxj_img_conv_format.c @@ -367,7 +367,8 @@ s_create_cache_file(request_rec* r, MagickBooleanType status; MagickWand* magick_wand; - if (strcasecmp(r->handler, "chxj-qrcode") == 0) { + if ((*r->handler == 'c' || *r->handler == 'C') + && strcasecmp(r->handler, "chxj-qrcode") == 0) { /*------------------------------------------------------------------------*/ /* QRCODEÍѤΥե¡¥¤¥ë¤Î¾ì¹ç */ /*------------------------------------------------------------------------*/ @@ -379,7 +380,7 @@ s_create_cache_file(request_rec* r, memset(&doc, 0, sizeof(Doc)); memset(&qrcode, 0, sizeof(qr_code_t)); doc.r = r; - doc.parse_mode = PARSE_MODE_CHTML; + doc.parse_mode = PARSE_MODE_CHTML; qrcode.doc = &doc; qrcode.r = r; @@ -395,11 +396,10 @@ s_create_cache_file(request_rec* r, return sts; } } - else - /*--------------------------------------------------------------------------*/ - /* Ä̾ï¤Î¥¤¥á¡¼¥¸¥Õ¥¡¥¤¥ë¤Î¾ì¹ç */ - /*--------------------------------------------------------------------------*/ - { + else { + /*------------------------------------------------------------------------*/ + /* Ä̾ï¤Î¥¤¥á¡¼¥¸¥Õ¥¡¥¤¥ë¤Î¾ì¹ç */ + /*------------------------------------------------------------------------*/ rv = apr_file_open(&fin, r->filename, APR_READ|APR_BINARY , -- 2.11.0