/*
- * Copyright (C) 2005-2008 Atsushi Konno All rights reserved.
+ * Copyright (C) 2005-2009 Atsushi Konno All rights reserved.
* Copyright (C) 2005 QSDN,Inc. All rights reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License");
if (rv != APR_SUCCESS)
return HTTP_NOT_FOUND;
+ apr_table_setn(r->headers_in, "CHXJ_IMG_CONV", "done");
try_count = CACHE_RETRY_COUNT;
do {
rv = apr_stat(&cache_st, tmpfile, APR_FINFO_MIN, r->pool);
WRN(r, "cache retry failure....");
WRN(r, "cache file was deleted...");
}
- apr_table_setn(r->headers_in, "CHXJ_IMG_CONV", "done");
DBG(r,"end chxj_img_conv_format");
apr_finfo_t cache_dir_st;
MagickWand *magick_wand;
+ int img_count;
if (STRCASEEQ('c','C',"chxj-qrcode",r->handler)) {
/*------------------------------------------------------------------------*/
EXIT_MAGICK_ERROR();
return HTTP_NOT_FOUND;
}
+
+ /*------------------*/
+ /* for AnimationGIF */
+ /*------------------*/
+ img_count = MagickGetNumberImages(magick_wand);
+ DBG(r, "REQ[%X] img_count is [%d]", (unsigned int)(apr_size_t)r, img_count);
+ if (img_count > 1) {
+ MagickSetImageIndex(magick_wand, 0);
+ MagickWand *magick_wand2 = MagickGetImage(magick_wand);
+ DestroyMagickWand(magick_wand);
+ magick_wand = magick_wand2;
+ }
+
if (MagickStripImage(magick_wand) == MagickFalse) {
ERR(r, "mod_chxj: strip image failure.");
EXIT_MAGICK_ERROR();
return HTTP_NOT_FOUND;
}
}
- else
- if (spec->available_png) {
- if (s_convert_to_png(magick_wand, r, spec)) {
+ else if (spec->available_gif) {
+ if (s_convert_to_gif(magick_wand, r, spec)) {
return HTTP_NOT_FOUND;
}
-
}
- else
- if (spec->available_gif) {
- if (s_convert_to_gif(magick_wand, r, spec)) {
+ else if (spec->available_png) {
+ if (s_convert_to_png(magick_wand, r, spec)) {
return HTTP_NOT_FOUND;
}
+
}
else
if (spec->available_bmp2 || spec->available_bmp4) {
return -1;
r->content_type = apr_psprintf(r->pool, "image/jpeg");
+ ap_set_content_type(r, "image/jpeg");
DBG(r,"convert to jpg");
return 0;
}
return -1;
r->content_type = apr_psprintf(r->pool, "image/png");
+ ap_set_content_type(r, "image/png");
DBG(r, "convert to png");
return 0;
}
return -1;
r->content_type = apr_psprintf(r->pool, "image/gif");
+ ap_set_content_type(r, "image/gif");
DBG(r,"convert to gif");
return 0;
return -1;
r->content_type = apr_psprintf(r->pool, "image/bmp");
+ ap_set_content_type(r, "image/bmp");
DBG(r, "convert to bmp(unsupported)");
return 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);
prev_size = writebyte;
- do {
- if (MagickSetImageCompressionQuality(magick_wand, quality) == MagickFalse) {
- EXIT_MAGICK_ERROR();
- return NULL;
- }
-
- writedata = (char*)MagickGetImageBlob(magick_wand, &writebyte);
- if (writebyte >= prev_size || revers_flag) {
- DBG(r, "quality=[%ld] size=[%d]", (long)quality, (int)writebyte);
- revers_flag = 1;
- quality += 10;
- if (quality > 100) {
- if (MagickSetImageCompression(magick_wand,NoCompression) == MagickFalse) {
- EXIT_MAGICK_ERROR();
- return NULL;
+
+ fmt = MagickGetImageFormat(magick_wand);
+ if (fmt) {
+ if (STRCASEEQ('j','J',"jpg",fmt)) fmt_type = 1;
+ if (STRCASEEQ('p','P',"png",fmt)) fmt_type = 2;
+ if (STRCASEEQ('g','G',"gif",fmt)) fmt_type = 3;
+ if (STRCASEEQ('b','B',"bmp",fmt)) fmt_type = 4;
+ }
+ if (fmt_type == 1) {
+ do {
+ if (MagickSetImageCompressionQuality(magick_wand, quality) == MagickFalse) {
+ EXIT_MAGICK_ERROR();
+ return NULL;
+ }
+
+ writedata = (char*)MagickGetImageBlob(magick_wand, &writebyte);
+ if (writebyte >= prev_size || revers_flag) {
+ DBG(r, "quality=[%ld] size=[%d]", (long)quality, (int)writebyte);
+ revers_flag = 1;
+ quality += 10;
+ if (quality > 100) {
+ if (MagickSetImageCompression(magick_wand,NoCompression) == MagickFalse) {
+ EXIT_MAGICK_ERROR();
+ return NULL;
+ }
+ break;
}
- break;
+ prev_size = writebyte;
+ continue;
}
- prev_size = writebyte;
- continue;
+
+ DBG(r, "quality=[%ld] size=[%d]", (long)quality, (int)writebyte);
+
+ if (spec->cache == 0)
+ break;
+
+ if (writebyte <= (unsigned int)spec->cache)
+ break;
+
+ quality -= 10;
+
+ if (quality == 0 || quality > 100)
+ break;
+
}
-
- DBG(r, "quality=[%ld] size=[%d]", (long)quality, (int)writebyte);
-
- if (spec->cache == 0)
- break;
-
- if (writebyte <= (unsigned int)spec->cache)
- break;
-
- quality -= 10;
-
- if (quality == 0 || quality > 100)
- break;
-
+ while (1);
}
- while (1);
if (spec->cache > 0
if (now_color <= 2) break;
+
if (now_color >= 8) {
status = MagickQuantizeImage(magick_wand,
now_color,
EXIT_MAGICK_ERROR();
return NULL;
}
-
- if (MagickSetImageDepth(magick_wand, depth) == MagickFalse) {
- EXIT_MAGICK_ERROR();
- return NULL;
+ if (fmt_type != 2) {
+ if (MagickSetImageDepth(magick_wand, depth) == MagickFalse) {
+ EXIT_MAGICK_ERROR();
+ return NULL;
+ }
}
-
writedata = (char*)MagickGetImageBlob(magick_wand, &writebyte);
DBG(r,"now_color=[%ld] size=[%d]", (long)now_color, (int)writebyte);
static apr_status_t
-s_send_cache_file(device_table *spec, query_string_param_t *query_string, request_rec *r, const char *tmpfile)
+s_send_cache_file(device_table *UNUSED(spec), query_string_param_t *query_string, request_rec *r, const char *tmpfile)
{
apr_status_t rv;
apr_finfo_t st;
DBG(r, "offset:[%ld]", query_string->offset);
DBG(r, "count:[%ld]", query_string->count);
- if (spec->available_jpeg) {
- r->content_type = apr_psprintf(r->pool, "image/jpeg");
- }
- else
- if (spec->available_png) {
- r->content_type = apr_psprintf(r->pool, "image/png");
- }
- else
- if (spec->available_gif) {
- r->content_type = apr_psprintf(r->pool, "image/gif");
- }
- else
- if (spec->available_bmp2 || spec->available_bmp4) {
- r->content_type = apr_psprintf(r->pool, "image/bmp");
- }
-
if (query_string->mode != IMG_CONV_MODE_EZGET && query_string->name == NULL) {
contentLength = apr_psprintf(r->pool, "%d", (int)st.size);
apr_table_setn(r->headers_out, "Content-Length", (const char*)contentLength);
DBG(r,"Content-Length:[%d]", (int)st.size);
-
+ MagickWand *magick_wand = NewMagickWand();
+ if (MagickReadImage(magick_wand,tmpfile) == MagickFalse) {
+ EXIT_MAGICK_ERROR();
+ return HTTP_NOT_FOUND;
+ }
+ if (MagickStripImage(magick_wand) == MagickFalse) {
+ ERR(r, "mod_chxj: strip image failure.");
+ EXIT_MAGICK_ERROR();
+ return HTTP_NOT_FOUND;
+ }
+ char *nowFormat = MagickGetImageFormat(magick_wand);
+ DestroyMagickWand(magick_wand);
+ if (nowFormat) {
+ if (STRCASEEQ('j','J',"jpeg",nowFormat) || STRCASEEQ('j','J',"jpg",nowFormat)) {
+ DBG(r, "detect cache file => jpg.");
+ ap_set_content_type(r, "image/jpeg");
+ }
+ else if (STRCASEEQ('p','P',"png", nowFormat)) {
+ DBG(r, "detect cache file => png.");
+ ap_set_content_type(r, "image/png");
+ }
+ else if (STRCASEEQ('g','G',"gif", nowFormat)) {
+ DBG(r, "detect cache file => gif.");
+ ap_set_content_type(r, "image/gif");
+ }
+ else if (STRCASEEQ('b','B',"bmp", nowFormat)) {
+ DBG(r, "detect cache file => bmp.");
+ ap_set_content_type(r, "image/bmp");
+ }
+ else {
+ ERR(r, "detect unknown file");
+ return HTTP_NOT_FOUND;
+ }
+ }
rv = apr_file_open(&fout, tmpfile,
APR_READ | APR_BINARY, 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);
static apr_status_t
-s_header_only_cache_file(device_table *spec, query_string_param_t *query_string, request_rec *r, const char *tmpfile)
+s_header_only_cache_file(device_table *UNUSED(spec), query_string_param_t *query_string, request_rec *r, const char *tmpfile)
{
apr_status_t rv;
apr_finfo_t st;
DBG(r, "offset:[%ld]", query_string->offset);
DBG(r, "count:[%ld]", query_string->count);
- if (spec->available_jpeg) {
- r->content_type = apr_psprintf(r->pool, "image/jpeg");
- }
- else
- if (spec->available_png) {
- r->content_type = apr_psprintf(r->pool, "image/png");
- }
- else
- if (spec->available_gif) {
- r->content_type = apr_psprintf(r->pool, "image/gif");
- }
- else
- if (spec->available_bmp2 || spec->available_bmp4) {
- r->content_type = apr_psprintf(r->pool, "image/bmp");
- }
-
if (query_string->mode != IMG_CONV_MODE_EZGET && query_string->name == NULL) {
contentLength = apr_psprintf(r->pool, "%d", (int)st.size);
apr_table_setn(r->headers_out, "Content-Length", (const char*)contentLength);
+
+ MagickWand *magick_wand = NewMagickWand();
+ if (MagickReadImage(magick_wand,tmpfile) == MagickFalse) {
+ EXIT_MAGICK_ERROR();
+ return HTTP_NOT_FOUND;
+ }
+ if (MagickStripImage(magick_wand) == MagickFalse) {
+ ERR(r, "mod_chxj: strip image failure.");
+ EXIT_MAGICK_ERROR();
+ return HTTP_NOT_FOUND;
+ }
+ char *nowFormat = MagickGetImageFormat(magick_wand);
+ DestroyMagickWand(magick_wand);
+ if (nowFormat) {
+ if (STRCASEEQ('j','J',"jpeg",nowFormat) || STRCASEEQ('j','J',"jpg",nowFormat)) {
+ DBG(r, "detect cache file => jpg.");
+ ap_set_content_type(r, "image/jpeg");
+ }
+ else if (STRCASEEQ('p','P',"png", nowFormat)) {
+ DBG(r, "detect cache file => png.");
+ ap_set_content_type(r, "image/png");
+ }
+ else if (STRCASEEQ('g','G',"gif", nowFormat)) {
+ DBG(r, "detect cache file => gif.");
+ ap_set_content_type(r, "image/gif");
+ }
+ else if (STRCASEEQ('b','B',"bmp", nowFormat)) {
+ DBG(r, "detect cache file => bmp.");
+ ap_set_content_type(r, "image/bmp");
+ }
+ else {
+ ERR(r, "detect unknown file");
+ return HTTP_NOT_FOUND;
+ }
+ }
DBG(r,"Content-Length:[%d]", (int)st.size);
}
"qrc", /* QRCode出力用ファイルの拡張子 */
"",
};
- char *fname;
+ char *fname = NULL;
char *idx;
char *filename_sv;
int do_ext_check = TRUE;
OSDN Git Service
