Mercurial > hg > nginx

comparison src/http/modules/ngx_http_image_filter_module.c @ 3134:e6f5cb5eff8b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
image_filter_transparency
author Igor Sysoev <igor@sysoev.ru>
date Tue, 15 Sep 2009 11:55:17 +0000
parents 28a6aa24b453
children fbf6d83ce288
comparison
equal deleted inserted replaced
3133:28a6aa24b453 3134:e6f5cb5eff8b
37 typedef struct { 37 typedef struct {
38 ngx_uint_t filter; 38 ngx_uint_t filter;
39 ngx_uint_t width; 39 ngx_uint_t width;
40 ngx_uint_t height; 40 ngx_uint_t height;
41 ngx_int_t jpeg_quality; 41 ngx_int_t jpeg_quality;
42
43 ngx_flag_t transparency;
42 44
43 ngx_http_complex_value_t *wcv; 45 ngx_http_complex_value_t *wcv;
44 ngx_http_complex_value_t *hcv; 46 ngx_http_complex_value_t *hcv;
45 47
46 size_t buffer_size; 48 size_t buffer_size;
111 { ngx_string("image_filter_jpeg_quality"), 113 { ngx_string("image_filter_jpeg_quality"),
112 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1, 114 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
113 ngx_conf_set_num_slot, 115 ngx_conf_set_num_slot,
114 NGX_HTTP_LOC_CONF_OFFSET, 116 NGX_HTTP_LOC_CONF_OFFSET,
115 offsetof(ngx_http_image_filter_conf_t, jpeg_quality), 117 offsetof(ngx_http_image_filter_conf_t, jpeg_quality),
118 NULL },
119
120 { ngx_string("image_filter_transparency"),
121 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_FLAG,
122 ngx_conf_set_flag_slot,
123 NGX_HTTP_LOC_CONF_OFFSET,
124 offsetof(ngx_http_image_filter_conf_t, transparency),
116 NULL }, 125 NULL },
117 126
118 { ngx_string("image_filter_buffer"), 127 { ngx_string("image_filter_buffer"),
119 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1, 128 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
120 ngx_conf_set_size_slot, 129 ngx_conf_set_size_slot,
676 685
677 686
678 static ngx_buf_t * 687 static ngx_buf_t *
679 ngx_http_image_resize(ngx_http_request_t *r, ngx_http_image_filter_ctx_t *ctx) 688 ngx_http_image_resize(ngx_http_request_t *r, ngx_http_image_filter_ctx_t *ctx)
680 { 689 {
681 int sx, sy, dx, dy, ox, oy, 690 int sx, sy, dx, dy, ox, oy, size,
682 colors, transparent, red, green, blue, size; 691 colors, palette, transparent,
692 red, green, blue;
683 u_char *out; 693 u_char *out;
684 ngx_buf_t *b; 694 ngx_buf_t *b;
685 ngx_uint_t resize; 695 ngx_uint_t resize;
686 gdImagePtr src, dst; 696 gdImagePtr src, dst;
687 ngx_pool_cleanup_t *cln; 697 ngx_pool_cleanup_t *cln;
704 gdImageDestroy(src); 714 gdImageDestroy(src);
705 return ngx_http_image_asis(r, ctx); 715 return ngx_http_image_asis(r, ctx);
706 } 716 }
707 717
708 colors = gdImageColorsTotal(src); 718 colors = gdImageColorsTotal(src);
709 transparent = gdImageGetTransparent(src); 719
710 720 if (colors && conf->transparency) {
711 if (transparent != -1 && colors) { 721 transparent = gdImageGetTransparent(src);
712 red = gdImageRed(src, transparent); 722
713 green = gdImageGreen(src, transparent); 723 if (transparent != -1) {
714 blue = gdImageBlue(src, transparent); 724 palette = colors;
715 gdImageColorTransparent(src, -1); 725 red = gdImageRed(src, transparent);
716 726 green = gdImageGreen(src, transparent);
717 } else { 727 blue = gdImageBlue(src, transparent);
718 red = 0; green = 0; blue = 0; 728
719 } 729 goto transparent;
730 }
731 }
732
733 palette = 0;
734 transparent = -1;
735 red = 0;
736 green = 0;
737 blue = 0;
738
739 transparent:
740
741 gdImageColorTransparent(src, -1);
720 742
721 dx = sx; 743 dx = sx;
722 dy = sy; 744 dy = sy;
723 745
724 if (conf->filter == NGX_HTTP_IMAGE_RESIZE) { 746 if (conf->filter == NGX_HTTP_IMAGE_RESIZE) {
760 } 782 }
761 } 783 }
762 } 784 }
763 785
764 if (resize) { 786 if (resize) {
765 dst = ngx_http_image_new(r, dx, dy, colors); 787 dst = ngx_http_image_new(r, dx, dy, palette);
766 if (dst == NULL) { 788 if (dst == NULL) {
767 gdImageDestroy(src); 789 gdImageDestroy(src);
768 return NULL; 790 return NULL;
769 } 791 }
770 792
772 gdImageSaveAlpha(dst, 1); 794 gdImageSaveAlpha(dst, 1);
773 gdImageAlphaBlending(dst, 0); 795 gdImageAlphaBlending(dst, 0);
774 } 796 }
775 797
776 gdImageCopyResampled(dst, src, 0, 0, 0, 0, dx, dy, sx, sy); 798 gdImageCopyResampled(dst, src, 0, 0, 0, 0, dx, dy, sx, sy);
799
800 if (colors) {
801 gdImageTrueColorToPalette(dst, 1, 256);
802 }
777 803
778 gdImageDestroy(src); 804 gdImageDestroy(src);
779 805
780 } else { 806 } else {
781 dst = src; 807 dst = src;
819 gdImageSaveAlpha(dst, 1); 845 gdImageSaveAlpha(dst, 1);
820 gdImageAlphaBlending(dst, 0); 846 gdImageAlphaBlending(dst, 0);
821 } 847 }
822 848
823 gdImageCopy(dst, src, 0, 0, ox, oy, dx - ox, dy - oy); 849 gdImageCopy(dst, src, 0, 0, ox, oy, dx - ox, dy - oy);
850
851 if (colors) {
852 gdImageTrueColorToPalette(dst, 1, 256);
853 }
824 854
825 gdImageDestroy(src); 855 gdImageDestroy(src);
826 } 856 }
827 } 857 }
828 858
1029 return NULL; 1059 return NULL;
1030 } 1060 }
1031 1061
1032 conf->filter = NGX_CONF_UNSET_UINT; 1062 conf->filter = NGX_CONF_UNSET_UINT;
1033 conf->jpeg_quality = NGX_CONF_UNSET; 1063 conf->jpeg_quality = NGX_CONF_UNSET;
1064 conf->transparency = NGX_CONF_UNSET;
1034 conf->buffer_size = NGX_CONF_UNSET_SIZE; 1065 conf->buffer_size = NGX_CONF_UNSET_SIZE;
1035 1066
1036 return conf; 1067 return conf;
1037 } 1068 }
1038 1069
1058 } 1089 }
1059 1090
1060 /* 75 is libjpeg default quality */ 1091 /* 75 is libjpeg default quality */
1061 ngx_conf_merge_value(conf->jpeg_quality, prev->jpeg_quality, 75); 1092 ngx_conf_merge_value(conf->jpeg_quality, prev->jpeg_quality, 75);
1062 1093
1094 ngx_conf_merge_value(conf->transparency, prev->transparency, 1);
1095
1063 ngx_conf_merge_size_value(conf->buffer_size, prev->buffer_size, 1096 ngx_conf_merge_size_value(conf->buffer_size, prev->buffer_size,
1064 1 * 1024 * 1024); 1097 1 * 1024 * 1024);
1065 1098
1066 return NGX_CONF_OK; 1099 return NGX_CONF_OK;
1067 } 1100 }