#include <wand/magick_wand.h>
+#if !defined(LONG_LONG_MAX) && defined(LLONG_MAX)
+# define LONG_LONG_MAX LLONG_MAX
+#endif
+
#define EXIT_MAGICK_ERROR() \
do { \
char *description; ExceptionType severity; \
description=MagickGetException(magick_wand,&severity); \
- ap_log_rerror(APLOG_MARK,APLOG_DEBUG, 0, r,"%s %s %d %s\n",__FILE__,(__func__),__LINE__,description); \
+ ap_log_rerror(APLOG_MARK,APLOG_ERR, 0, r,"%s %s %d %s\n",__FILE__,(__func__),__LINE__,description); \
description=(char *) MagickRelinquishMemory(description); \
DestroyMagickWand(magick_wand); \
} while(0)
/*----------------------------------------------------------------------------*/
static device_table v_ignore_spec = {
NULL,
+ 0,
"IGN",
"IGN",
CHXJ_SPEC_HTML,
96,
65536,
NULL,
+ "Shift_JIS"
};
/*----------------------------------------------------------------------------*/
query_string_param_t *qsp,
mod_chxj_config *conf);
-static apr_status_t s_send_cache_file(device_table *spec,
+static apr_status_t s_send_cache_file(mod_chxj_config *conf,
+ device_table *spec,
query_string_param_t *query_string,
request_rec *r,
const char *tmpfile);
static int s_convert_to_png(MagickWand *maigck_wand, request_rec *r, device_table *spec);
static int s_convert_to_gif(MagickWand *magick_wand, request_rec *r, device_table *spec);
static int s_convert_to_bmp(MagickWand *magick_wand, request_rec *r, device_table *spec);
+static int s_chxj_trans_name2(request_rec *r);
+static char *s_add_comment_to_png(request_rec *r, char *data, apr_size_t *len);
char *user_agent;
device_table *spec;
chxjconvrule_entry *entryp;
+ int rtn;
+
+ DBG(r, "REQ[%X] start chxj_img_conv_format_handler()", (unsigned int)(apr_size_t)r);
- DBG(r, "start chxj_img_conv_format_handler()");
+ s_chxj_trans_name2(r);
- if (r->handler && !STRCASEEQ('c','C',"chxj-picture",r->handler) && !STRCASEEQ('c','C',"chxj-qrcode",r->handler)) {
- DBG(r, "end chxj_img_conv_format_handler()");
+ if (! r->handler ||
+ (r->handler && !STRCASEEQ('c','C',"chxj-picture",r->handler) && !STRCASEEQ('c','C',"chxj-qrcode",r->handler))) {
+ DBG(r, "REQ[%X] Response Code:[%d]", (unsigned int)(apr_size_t)r, r->status);
+ DBG(r, "REQ[%X] end chxj_img_conv_format_handler() r->handler is[%s]", TO_ADDR(r), r->handler);
return DECLINED;
}
qsp = s_get_query_string_param(r);
conf = chxj_get_module_config(r->per_dir_config, &chxj_module);
if (conf == NULL) {
- DBG(r, "end chxj_img_conv_format_handler() conf is null");
+ DBG(r, "REQ[%X] end chxj_img_conv_format_handler() conf is null",TO_ADDR(r));
return DECLINED;
}
if (STRCASEEQ('c','C',"chxj-qrcode",r->handler) && conf->image == CHXJ_IMG_OFF) {
+ DBG(r, "REQ[%X] end chxj_img_conv_format_handler() chxj-qrcode and ImageEngineOff", (unsigned int)(apr_size_t)r);
return DECLINED;
}
else
spec = chxj_specified_device(r, user_agent);
- DBG(r,"found device_name=[%s]", spec->device_name);
- DBG(r,"User-Agent=[%s]", user_agent);
+ DBG(r,"REQ[%X] found device_name=[%s]", (unsigned int)(apr_size_t)r, spec->device_name);
+ DBG(r,"REQ[%X] User-Agent=[%s]", (unsigned int)(apr_size_t)r, user_agent);
- return s_img_conv_format_from_file(r, conf, user_agent, qsp, spec);
+ rtn = s_img_conv_format_from_file(r, conf, user_agent, qsp, spec);
+ DBG(r, "REQ[%X] end chxj_img_conv_format_handler()", (unsigned int)(apr_size_t)r);
+ return rtn;
}
char *conv_check;
chxjconvrule_entry *entryp;
- DBG(r, "start chxj_convert_image()");
+ DBG(r, "REQ[%X] start chxj_convert_image()",(unsigned int)(apr_size_t)r);
conv_check = (char*)apr_table_get(r->headers_in, "CHXJ_IMG_CONV");
if (conv_check) {
- DBG(r, "end chxj_exchnage_image() already convert.");
+ DBG(r, "REQ[%X] end chxj_convert_image() already convert.", (unsigned int)(apr_size_t)r);
return NULL;
}
qsp = s_get_query_string_param(r);
conf = chxj_get_module_config(r->per_dir_config, &chxj_module);
if (conf == NULL) {
- DBG(r, "end chxj_convert_image()");
+ DBG(r, "REQ[%X] end chxj_convert_image()", (unsigned int)(apr_size_t)r);
return NULL;
}
DBG(r,"found device_name=[%s]", spec->device_name);
DBG(r, "User-Agent=[%s]", user_agent);
- if (spec->width == 0 || spec->heigh == 0)
+ if (spec->width == 0 || spec->heigh == 0) {
+ DBG(r, "REQ[%X] end chxj_convert_image() not convert (width or height is 0)", (unsigned int)(apr_size_t)r);
return NULL;
+ }
dst = s_create_blob_data(r, spec, qsp, (char*)*src, len);
if (dst == NULL)
*len = 0;
- DBG(r, "end chxj_convert_image()");
+ DBG(r, "REQ[%X] end chxj_convert_image()", (unsigned int)(apr_size_t)r);
return dst;
}
/* Create Workfile Name */
/*--------------------------------------------------------------------------*/
tmpfile = s_create_workfile_name(r, conf, user_agent, qsp);
- DBG(r,"workfile=[%s]", tmpfile);
+ DBG(r,"REQ[%X] workfile=[%s]", TO_ADDR(r), tmpfile);
rv = apr_stat(&st, r->filename, APR_FINFO_MIN, r->pool);
if (rv != APR_SUCCESS)
return rv;
}
- DBG(r,"color=[%d]", spec->color);
+ DBG(r,"REQ[%X] color=[%d]", TO_ADDR(r), spec->color);
if (! r->header_only) {
- rv = s_send_cache_file(spec, qsp,r, tmpfile);
+ rv = s_send_cache_file(conf, spec, qsp,r, tmpfile);
}
else {
rv = s_header_only_cache_file(spec, qsp, r, tmpfile);
/*------------------------------------------------------------------------*/
rv = apr_file_open(&fin,
r->filename,
- APR_READ|APR_BINARY ,
+ APR_FOPEN_READ | APR_FOPEN_BINARY | APR_FOPEN_BUFFERED | APR_FOPEN_SHARELOCK | APR_FOPEN_SENDFILE_ENABLED,
APR_OS_DEFAULT,
r->pool);
if (rv != APR_SUCCESS) {
readdata = apr_palloc(r->pool, st->size);
rv = apr_file_read_full(fin, (void*)readdata, st->size, &readbyte);
if (rv != APR_SUCCESS || readbyte != st->size) {
- DBG(r,"file read failed.[%s]", r->filename);
+ DBG(r,"REQ[%X] file read failed.[%s]", TO_ADDR(r), r->filename);
apr_file_close(fin);
return HTTP_NOT_FOUND;
}
}
- DBG(r,"start img convert");
+ DBG(r,"REQ[%X] start img convert", TO_ADDR(r));
magick_wand = NewMagickWand();
EXIT_MAGICK_ERROR();
return HTTP_NOT_FOUND;
}
+ {
+ MagickWand *magick_wand2;
+ if ((magick_wand2 = MagickCoalesceImages(magick_wand)) == NULL) {
+ EXIT_MAGICK_ERROR();
+ return HTTP_NOT_FOUND;
+ }
+ DestroyMagickWand(magick_wand);
+ magick_wand = magick_wand2;
+ }
if (spec->html_spec_type != CHXJ_SPEC_UNKNOWN) {
int oldw = MagickGetImageWidth(magick_wand);
/*
* The size of the image is changed.
*/
- DBG(r,"call s_fixup_size()");
+ DBG(r,"REQ[%X] call s_fixup_size()", TO_ADDR(r));
if ((magick_wand = s_fixup_size(magick_wand, r, spec, qsp)) == NULL)
return HTTP_NOT_FOUND;
/*
* The colors of the image is changed.
*/
- DBG(r,"call s_fixup_color()");
+ DBG(r,"REQ[%X] call s_fixup_color()", TO_ADDR(r));
if ((magick_wand = s_fixup_color(magick_wand, r,spec, mode)) == NULL)
return HTTP_NOT_FOUND;
/*
* DEPTH of the image is changed.
*/
- DBG(r,"call s_fixup_depth()");
+ DBG(r,"REQ[%X] call s_fixup_depth()", TO_ADDR(r));
if ((magick_wand = s_fixup_depth(magick_wand, r, spec)) == NULL)
return HTTP_NOT_FOUND;
/*
* The size of the image is changed.
*/
- DBG(r,"call s_fixup_size()");
+ DBG(r,"REQ[%X] call s_fixup_size()", TO_ADDR(r));
if ((magick_wand = s_fixup_size(magick_wand, r, spec, qsp)) == NULL)
return HTTP_NOT_FOUND;
}
fixFormatFlag = 1;
}
}
+ else if (STRCASEEQ('b','B',"bmp",nowFormat)) {
+ if (spec->available_bmp4 || spec->available_bmp2) {
+ if (s_convert_to_bmp(magick_wand, r, spec)) {
+ return HTTP_NOT_FOUND;
+ }
+ fixFormatFlag = 1;
+ }
+ }
}
- DBG(r,"start convert and compression");
+ DBG(r,"REQ[%X] start convert and compression", TO_ADDR(r));
if (! fixFormatFlag) {
if (spec->available_jpeg) {
}
}
- writedata = (char*)MagickGetImageBlob(magick_wand, &writebyte);
+ char *sv_writedata;
+ sv_writedata = writedata = (char*)MagickGetImageBlob(magick_wand, &writebyte);
if (! writebyte) {
DestroyMagickWand(magick_wand);
return HTTP_INTERNAL_SERVER_ERROR;
}
+ writedata = apr_palloc(r->pool, writebyte);
+ memcpy(writedata, sv_writedata, writebyte);
DBG(r, "end convert and compression");
+
+ /* Added PNG Comment if type is image/png. */
+ if (r->content_type && strcmp(r->content_type, "image/png") == 0) {
+ if ((writedata = s_add_comment_to_png(r, writedata, &writebyte)) == NULL) {
+ DBG(r, "REQ[%X] Add comment to PNG failure.",(unsigned int)(apr_size_t)r);
+ DestroyMagickWand(magick_wand);
+ if (sv_writedata) free(sv_writedata);
+ return HTTP_INTERNAL_SERVER_ERROR;
+ }
+ }
/* check limit */
rv = apr_stat(&cache_dir_st, conf->image_cache_dir, APR_FINFO_MIN, r->pool);
if (rv != APR_SUCCESS) {
DestroyMagickWand(magick_wand);
ERR(r,"dir stat error.[%s]", conf->image_cache_dir);
- if (writedata) free(writedata);
+ if (sv_writedata) free(sv_writedata);
return HTTP_INTERNAL_SERVER_ERROR;
}
if (rv != APR_SUCCESS) {
DestroyMagickWand(magick_wand);
ERR(r,"dir open error.[%s]", conf->image_cache_dir);
- if (writedata) free(writedata);
+ if (sv_writedata) free(sv_writedata);
return HTTP_INTERNAL_SERVER_ERROR;
}
memset(&dcf, 0, sizeof(apr_finfo_t));
ERR(r, "At least the same size as %luByte is necessary for me.", (unsigned long)writebyte);
ERR(r, "Please specify the ChxjImageCacheLimit that is larger than now value. ");
ERR(r, "==========================================");
- if (writedata) free(writedata);
+ if (sv_writedata) free(sv_writedata);
return HTTP_INTERNAL_SERVER_ERROR;
}
DBG(r, "Image Cache dir is full. total_size:[%lu] max_size:[%lu]", total_size + writebyte, max_size);
rv = apr_file_remove(delete_file_name, r->pool);
if (rv != APR_SUCCESS) {
ERR(r, "cache file delete failure.[%s]", delete_file_name);
- if (writedata) free(writedata);
+ if (sv_writedata) free(sv_writedata);
return HTTP_INTERNAL_SERVER_ERROR;
}
DBG(r, "deleted image cache target:[%s]", delete_file_name);
/* to cache */
rv = apr_file_open(&fout, tmpfile,
- APR_WRITE| APR_CREATE | APR_BINARY | APR_SHARELOCK ,APR_OS_DEFAULT,
+ APR_FOPEN_WRITE| APR_FOPEN_CREATE | APR_FOPEN_BINARY | APR_SHARELOCK ,
+ APR_OS_DEFAULT,
r->pool);
if (rv != APR_SUCCESS) {
DestroyMagickWand(magick_wand);
- ERR(r,"file open error.[%s]", tmpfile);
- if (writedata) free(writedata);
+ ERR(r,"REQ[%X] file open error.[%s]", TO_ADDR(r), tmpfile);
+ if (sv_writedata) free(sv_writedata);
return HTTP_INTERNAL_SERVER_ERROR;
}
if (rv != APR_SUCCESS) {
DestroyMagickWand(magick_wand);
apr_file_close(fout);
- if (writedata) free(writedata);
+ if (sv_writedata) free(sv_writedata);
return HTTP_INTERNAL_SERVER_ERROR;
}
rv = apr_file_putc((crc >> 8) & 0xff, fout);
if (rv != APR_SUCCESS) {
DestroyMagickWand(magick_wand);
- if (writedata) free(writedata);
+ if (sv_writedata) free(sv_writedata);
return HTTP_INTERNAL_SERVER_ERROR;
}
rv = apr_file_putc( crc & 0xff, fout);
if (rv != APR_SUCCESS) {
DestroyMagickWand(magick_wand);
- if (writedata) free(writedata);
+ if (sv_writedata) free(sv_writedata);
return HTTP_INTERNAL_SERVER_ERROR;
}
}
DestroyMagickWand(magick_wand);
- if (writedata) free(writedata);
+ if (sv_writedata) free(sv_writedata);
rv = apr_file_close(fout);
if (rv != APR_SUCCESS) {
apr_size_t writebyte = 0;
char *writedata;
apr_size_t prev_size = 0;
- int revers_flag = 0;
char *fmt;
int fmt_type = 0;
}
writedata = (char*)MagickGetImageBlob(magick_wand, &writebyte);
- if (writebyte >= prev_size || revers_flag) {
+ if (writebyte >= prev_size) {
DBG(r, "quality=[%ld] size=[%d]", (long)quality, (int)writebyte);
- revers_flag = 1;
- quality += 10;
+ quality += 5;
if (quality > 100) {
if (MagickSetImageCompression(magick_wand,NoCompression) == MagickFalse) {
EXIT_MAGICK_ERROR();
}
break;
}
- prev_size = writebyte;
- continue;
+ if (MagickSetImageCompressionQuality(magick_wand, quality) == MagickFalse) {
+ EXIT_MAGICK_ERROR();
+ return NULL;
+ }
+ break;
}
DBG(r, "quality=[%ld] size=[%d]", (long)quality, (int)writebyte);
if (writebyte <= (unsigned int)spec->cache)
break;
- quality -= 10;
+ quality -= 5;
if (quality == 0 || quality > 100)
break;
static apr_status_t
-s_send_cache_file(device_table *UNUSED(spec), query_string_param_t *query_string, request_rec *r, const char *tmpfile)
+s_send_cache_file(
+ mod_chxj_config *conf,
+ device_table *spec,
+ query_string_param_t *query_string,
+ request_rec *r,
+ const char *tmpfile)
{
apr_status_t rv;
apr_finfo_t st;
if (rv != APR_SUCCESS)
return HTTP_NOT_FOUND;
- DBG(r, "mode:[%d]", query_string->mode);
- DBG(r, "name:[%s]", query_string->name);
- DBG(r, "offset:[%ld]", query_string->offset);
- DBG(r, "count:[%ld]", query_string->count);
+ DBG(r, "REQ[%X] mode:[%d]", TO_ADDR(r), query_string->mode);
+ DBG(r, "REQ[%X] name:[%s]", TO_ADDR(r), query_string->name);
+ DBG(r, "REQ[%X] offset:[%ld]", TO_ADDR(r), query_string->offset);
+ DBG(r, "REQ[%X] count:[%ld]", TO_ADDR(r), query_string->count);
+
+ /* for mod_cache */
+ {
+ apr_table_setn(r->headers_out, "Vary", "User-Agent");
+ apr_table_setn(r->err_headers_out, "Vary", "User-Agent");
+ ap_update_mtime(r, st.mtime);
+ ap_set_last_modified(r);
+ }
if (query_string->mode != IMG_CONV_MODE_EZGET && query_string->name == NULL) {
contentLength = apr_psprintf(r->pool, "%d", (int)st.size);
return HTTP_NOT_FOUND;
}
}
+ if (conf->image_copyright) {
+ DBG(r, "REQ[%X] Add COPYRIGHT Header for SoftBank [%s]", TO_ADDR(r), conf->image_copyright);
+ if (spec->html_spec_type == CHXJ_SPEC_Jhtml || spec->html_spec_type == CHXJ_SPEC_Jxhtml) {
+ apr_table_setn(r->headers_out, "x-jphone-copyright", "no-transfer");
+ }
+ }
rv = apr_file_open(&fout, tmpfile,
- APR_READ | APR_BINARY, APR_OS_DEFAULT, r->pool);
+ APR_FOPEN_READ | APR_FOPEN_BINARY | APR_FOPEN_BUFFERED | APR_FOPEN_SHARELOCK | APR_FOPEN_SENDFILE_ENABLED,
+ APR_OS_DEFAULT, r->pool);
if (rv != APR_SUCCESS) {
DBG(r, "cache file open failed[%s]", tmpfile);
return HTTP_NOT_FOUND;
ap_send_fd(fout, r, 0, st.size, &sendbyte);
apr_file_close(fout);
ap_rflush(r);
- DBG(r, "send file data[%d]byte", (int)sendbyte);
+ DBG(r, "REQ[%X] send file data[%d]byte", TO_ADDR(r), (int)sendbyte);
}
else
if (query_string->mode == IMG_CONV_MODE_EZGET) {
DBG(r, "Content-Length:[%d]", (int)st.size);
rv = apr_file_open(&fout, tmpfile,
- APR_READ | APR_BINARY, APR_OS_DEFAULT, r->pool);
+ APR_FOPEN_READ | APR_FOPEN_BINARY | APR_FOPEN_BUFFERED | APR_FOPEN_SHARELOCK | APR_FOPEN_SENDFILE_ENABLED,
+ APR_OS_DEFAULT, r->pool);
if (rv != APR_SUCCESS) {
DBG(r,"tmpfile open failed[%s]", tmpfile);
if (rv != APR_SUCCESS)
return HTTP_NOT_FOUND;
+ /* for mod_cache */
+ {
+ apr_table_setn(r->headers_out, "Vary", "User-Agent");
+ apr_table_setn(r->err_headers_out, "Vary", "User-Agent");
+ ap_update_mtime(r, st.mtime);
+ ap_set_last_modified(r);
+ }
+
rv = apr_file_open(&fout, originalfile,
- APR_READ | APR_BINARY, APR_OS_DEFAULT, r->pool);
+ APR_FOPEN_READ | APR_FOPEN_BINARY | APR_FOPEN_BUFFERED | APR_FOPEN_SHARELOCK | APR_FOPEN_SENDFILE_ENABLED,
+ APR_OS_DEFAULT, r->pool);
if (rv != APR_SUCCESS) {
DBG(r, "originalfile open failed[%s]", originalfile);
return HTTP_NOT_FOUND;
static apr_status_t
-s_header_only_cache_file(device_table *UNUSED(spec), query_string_param_t *query_string, request_rec *r, const char *tmpfile)
+s_header_only_cache_file(device_table *spec, query_string_param_t *query_string, request_rec *r, const char *tmpfile)
{
apr_status_t rv;
apr_finfo_t st;
char *contentLength;
+ mod_chxj_config *conf = ap_get_module_config(r->per_dir_config, &chxj_module);
+
+ DBG(r, "REQ[%X] start s_header_only_cache_file()", TO_ADDR(r));
rv = apr_stat(&st, tmpfile, APR_FINFO_MIN, r->pool);
- if (rv != APR_SUCCESS)
+ if (rv != APR_SUCCESS) {
+ DBG(r, "REQ[%X] end s_header_only_cache_file()", TO_ADDR(r));
return HTTP_NOT_FOUND;
+ }
- DBG(r, "mode:[%d]", query_string->mode);
- DBG(r, "name:[%s]", query_string->name);
- DBG(r, "offset:[%ld]", query_string->offset);
- DBG(r, "count:[%ld]", query_string->count);
+ DBG(r, "REQ[%X] mode:[%d]", TO_ADDR(r), query_string->mode);
+ DBG(r, "REQ[%X] name:[%s]", TO_ADDR(r), query_string->name);
+ DBG(r, "REQ[%X] offset:[%ld]", TO_ADDR(r), query_string->offset);
+ DBG(r, "REQ[%X] count:[%ld]", TO_ADDR(r), query_string->count);
if (query_string->mode != IMG_CONV_MODE_EZGET && query_string->name == NULL) {
contentLength = apr_psprintf(r->pool, "%d", (int)st.size);
ap_set_content_type(r, "image/bmp");
}
else {
- ERR(r, "detect unknown file");
+ ERR(r, "REQ[%X] detect unknown file", TO_ADDR(r));
return HTTP_NOT_FOUND;
}
}
contentLength = apr_psprintf(r->pool, "%ld", query_string->count);
apr_table_setn(r->headers_out, "Content-Length", (const char*)contentLength);
- DBG(r, "Content-Length:[%d]", (int)st.size);
+ DBG(r, "REQ[%X] Content-Length:[%d]", TO_ADDR(r), (int)st.size);
+ }
+ }
+ if (conf->image_copyright) {
+ DBG(r, "REQ[%X] Add COPYRIGHT Header for SoftBank [%s]", TO_ADDR(r), conf->image_copyright);
+ if (spec->html_spec_type == CHXJ_SPEC_Jhtml || spec->html_spec_type == CHXJ_SPEC_Jxhtml) {
+ apr_table_setn(r->headers_out, "x-jphone-copyright", "no-transfer");
}
}
+ DBG(r, "REQ[%X] end s_header_only_cache_file()", TO_ADDR(r));
return OK;
}
v_docomo_serial_pattern3 = chxj_compile_for_preg_replace(p, ";icc[^;\\)]+");
}
if (!v_softbank_serial_pattern1) {
- v_softbank_serial_pattern1 = chxj_compile_for_preg_replace(p, "/SN[0-9a-zA-Z][0-9a-zA-Z][0-9a-zA-Z][0-9a-zA-Z][0-9a-zA-Z][0-9a-zA-Z][0-9a-zA-Z][0-9a-zA-Z][0-9a-zA-Z][0-9a-zA-Z][0-9a-zA-Z] ");
+ v_softbank_serial_pattern1 = chxj_compile_for_preg_replace(p, "/SN[0-9a-zA-Z]+ ");
}
}
int ii;
char *ext[] = {
"jpg",
+ "JPG",
"jpeg",
+ "JPEG",
"png",
+ "PNG",
"bmp",
+ "BMP",
"gif",
+ "GIF",
"qrc", /* QRCode出力用ファイルの拡張子 */
"",
};
DBG(r,"URI[%s]", filename_sv);
do_ext_check = TRUE;
- for (ii=0; ii<7-1; ii++) {
+ for (ii=0; ii<(int)(sizeof(ext)/sizeof(ext[0])); ii++) {
char* pos = strrchr(filename_sv, '.');
if (pos && pos++) {
if (strcasecmp(pos, ext[ii]) == 0) {
}
if (do_ext_check) {
- for (ii=0; ii<7; ii++) {
+ for (ii=0; ii<(int)(sizeof(ext)/sizeof(ext[0])); ii++) {
if (strlen(ext[ii]) == 0) {
fname = apr_psprintf(r->pool, "%s", filename_sv);
}
DBG(r,"NotFound [%s]", r->filename);
return DECLINED;
}
- for (ii=0; ii<7-1; ii++) {
+ for (ii=0; ii<(int)(sizeof(ext)/sizeof(ext[0])); ii++) {
char* pos = strrchr(fname, '.');
if (pos && pos++) {
if (strcasecmp(pos, ext[ii]) == 0) {
+static int
+s_chxj_trans_name2(request_rec *r)
+{
+ apr_finfo_t st;
+ apr_status_t rv;
+ mod_chxj_config *conf;
+ int ii;
+ char *ext[] = {
+ "jpg",
+ "JPG",
+ "jpeg",
+ "JPEG",
+ "png",
+ "PNG",
+ "bmp",
+ "BMP",
+ "gif",
+ "GIF",
+ "qrc", /* QRCode出力用ファイルの拡張子 */
+ "",
+ };
+ char *fname = NULL;
+ char *filename_sv;
+ int do_ext_check = TRUE;
+ int next_ok = FALSE;
+
+ DBG(r, "REQ[%X] start chxj_trans_name2()", (unsigned int)(apr_size_t)r);
+
+ conf = chxj_get_module_config(r->per_dir_config, &chxj_module);
+
+ if (conf == NULL) {
+ DBG(r, "REQ[%X] end chxj_trans_name2() conf is null[%s]", (unsigned int)(apr_size_t)r, r->uri);
+ return DECLINED;
+ }
+
+ if (conf->image != CHXJ_IMG_ON) {
+ DBG(r, "REQ[%X] end chxj_trans_name2() ImageEngineOff", (unsigned int)(apr_size_t)r);
+ return DECLINED;
+ }
+
+
+ DBG(r,"Match URI[%s]", r->uri);
+
+ if (r->filename == NULL) {
+ DBG(r, "REQ[%X] end chxj_trans_name2() r->filename is null", (unsigned int)(apr_size_t)r);
+ return DECLINED;
+ }
+
+ filename_sv = r->filename;
+
+ DBG(r,"REQ[%x] r->filename[%s]", (unsigned int)(apr_size_t)r, filename_sv);
+
+ do_ext_check = TRUE;
+ for (ii=0; ii<(int)(sizeof(ext)/sizeof(ext[0])); ii++) {
+ char* pos = strrchr(filename_sv, '.');
+ if (pos && pos++) {
+ if (strcasecmp(pos, ext[ii]) == 0) {
+ do_ext_check = FALSE;
+ fname = apr_psprintf(r->pool, "%s", filename_sv);
+ break;
+ }
+ }
+ }
+
+ if (do_ext_check) {
+ for (ii=0; ii<(int)(sizeof(ext)/sizeof(ext[0])); ii++) {
+ if (strlen(ext[ii]) == 0) {
+ fname = apr_psprintf(r->pool, "%s", filename_sv);
+ }
+ else
+ fname = apr_psprintf(r->pool, "%s.%s", filename_sv, ext[ii]);
+
+ DBG(r,"search [%s]", fname);
+
+ rv = apr_stat(&st, fname, APR_FINFO_MIN, r->pool);
+ if (rv == APR_SUCCESS) {
+ if (st.filetype != APR_DIR)
+ break;
+ }
+
+ fname = NULL;
+ }
+ }
+ if (fname == NULL) {
+ DBG(r,"NotFound [%s]", r->filename);
+ return DECLINED;
+ }
+ for (ii=0; ii<(int)(sizeof(ext)/sizeof(ext[0])); ii++) {
+ char* pos = strrchr(fname, '.');
+ if (pos && pos++) {
+ if (strcasecmp(pos, ext[ii]) == 0) {
+ next_ok = TRUE;
+ break;
+ }
+ }
+ }
+
+ if (! next_ok) {
+ DBG(r,"NotFound [%s]", r->filename);
+ return DECLINED;
+ }
+
+ if (r->handler == NULL || strcasecmp(r->handler, "chxj-qrcode") != 0) {
+ DBG(r,"Found [%s]", fname);
+
+ r->filename = apr_psprintf(r->pool, "%s", fname);
+
+ if (strcasecmp("qrc", ext[ii]) == 0)
+ r->handler = apr_psprintf(r->pool, "chxj-qrcode");
+ else
+ r->handler = apr_psprintf(r->pool, "chxj-picture");
+ }
+ DBG(r, "REQ[%X] end chxj_trans_name()", (unsigned int)(apr_size_t)r);
+ return OK;
+}
+
+
+
/**
* It converts it from QUERYSTRING.
*
return param;
}
+
+
+static char *
+s_add_comment_to_png(request_rec *r, char *data, apr_size_t *len)
+{
+ char *result = NULL;
+#define PNG_COPYRIGHT_KEY "Copyright"
+#define PNG_COPYRIGHT_VAL "kddi_copyright=on,copy=NO"
+#define PNG_SIG_AND_IHDR_SZ (33)
+ char *key = PNG_COPYRIGHT_KEY;
+ apr_size_t klen = sizeof(PNG_COPYRIGHT_KEY)-1;
+ char *val = PNG_COPYRIGHT_VAL;
+ apr_size_t vlen = sizeof(PNG_COPYRIGHT_VAL)-1;
+ apr_pool_t *pool;
+ apr_size_t total_tEXt_size;
+ apr_size_t tEXt_data_size;
+ apr_size_t pos;
+ apr_size_t ii;
+ char *buf;
+ char *valbuf;
+ uint32_t crc;
+ mod_chxj_config *conf = chxj_get_module_config(r->per_dir_config, &chxj_module);
+
+ DBG(r, "REQ[%X] start s_add_comment_to_png()",(unsigned int)(apr_size_t)r);
+ if (conf->image_copyright) {
+ apr_pool_create(&pool, r->pool);
+
+ valbuf = apr_psprintf(pool, "%s,%s", val, conf->image_copyright);
+ vlen = strlen(valbuf);
+
+ /* total_size = length + "tEXt" + "Copyright" + '\0' + val + crc */
+ total_tEXt_size = 4 + 4 + klen + vlen + 1 + 4;
+ result = apr_palloc(pool, total_tEXt_size + *len);
+ if (!result) {
+ DBG(r, "REQ[%X] memory allocation error.", (unsigned int)(apr_size_t)r);
+ return NULL;
+ }
+ pos = PNG_SIG_AND_IHDR_SZ;
+ memcpy(result, data, pos); /* 33 = SIGNATURE + IHDR */
+ tEXt_data_size = klen + 1 + vlen;
+ result[pos + 0] = tEXt_data_size >> 24;
+ result[pos + 1] = tEXt_data_size >> 16;
+ result[pos + 2] = tEXt_data_size >> 8;
+ result[pos + 3] = tEXt_data_size;
+ pos += 4;
+ buf = apr_palloc(pool, 4 + klen + 1 + vlen);
+ memcpy(&buf[0], "tEXt", 4);
+ memcpy(&buf[4], key, klen);
+ buf[4+klen] = 0;
+ memcpy(&buf[4+klen+1], valbuf, vlen);
+
+
+ DBG(r, "REQ[%X] buf:[%s]", (unsigned int)(apr_size_t)r, buf);
+
+ crc = 0xffffffff;
+ for (ii = 0; ii < 4 + tEXt_data_size; ii++) {
+ crc = AU_CRC_TBL[(crc ^ buf[ii]) & 0xff] ^ (crc >> 8);
+ }
+ crc ^= 0xffffffff;
+ memcpy(&result[pos], buf, 4 + klen + 1 + vlen);
+ pos += (4 + klen + 1 + vlen);
+ result[pos + 0] = crc >> 24;
+ result[pos + 1] = crc >> 16;
+ result[pos + 2] = crc >> 8;
+ result[pos + 3] = crc;
+ pos += 4;
+ memcpy(&result[pos], &data[PNG_SIG_AND_IHDR_SZ] , *len - PNG_SIG_AND_IHDR_SZ);
+ *len = *len + total_tEXt_size;
+ DBG(r, "REQ[%X] writebyte:[%d]", (unsigned int)(apr_size_t)r, (unsigned int)*len);
+ }
+ else {
+ result = data;
+ }
+ DBG(r, "REQ[%X] end s_add_comment_to_png()",(unsigned int)(apr_size_t)r);
+#undef PNG_SIG_AND_IHDR_SZ
+#undef PNG_COPYRIGHT_KEY
+#undef PNG_COPYRIGHT_VAL
+ return result;
+}
/*
* vim:ts=2 et
*/
OSDN Git Service
