Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge branch 'master' of github.com:mapserver/mapserver

  • Loading branch information...
commit de0dd13242dc3c818d9fc59efd15f8315b6f0033 2 parents 7e54ebe + f76b75a
@Schpidi Schpidi authored
Showing with 8,098 additions and 3,476 deletions.
  1. +8,075 −3,457 configure
  2. +14 −14 configure.in
  3. +9 −5 mapcairo.c
View
11,532 configure
8,075 additions, 3,457 deletions not shown
View
28 configure.in
@@ -215,11 +215,11 @@ AC_DEFUN([MS_CHECK_PNG],[
fi
if test -z "$with_png" -o "$with_png" == "yes" -o "$with_png" == "/usr"; then
- AC_CHECK_HEADER([png.h], [] ,
+ AC_CHECK_HEADER([png.h],[],
[AC_MSG_ERROR([png.h header not found. install png development package, or reconfigure with --with-png=/path/to/png/prefix])])
- AC_CHECK_HEADER([setjmp.h], [] ,
+ AC_CHECK_HEADER([setjmp.h],[],
[AC_MSG_ERROR([setjmp.h header not found. install png development package, or reconfigure with --with-png=/path/to/png/prefix])])
- AC_CHECK_LIB([png], [png_init_io], [] ,
+ AC_CHECK_LIB([png], [png_init_io],[],
[AC_MSG_ERROR([libpng library not found. install png development package, or reconfigure with --with-png=/path/to/png/prefix])])
else
@@ -229,11 +229,11 @@ AC_DEFUN([MS_CHECK_PNG],[
CPPFLAGS="-I$with_png/include"
LDFLAGS="-L$with_png/lib"
- AC_CHECK_HEADER([png.h], [] ,
+ AC_CHECK_HEADER([png.h],[],
[AC_MSG_ERROR([png.h header not found in $with_png. install png development package, or reconfigure with --with-png=/path/to/png/prefix])])
- AC_CHECK_HEADER([setjmp.h], [] ,
+ AC_CHECK_HEADER([setjmp.h],[],
[AC_MSG_ERROR([setjmp.h header not found. install png development package, or reconfigure with --with-png=/path/to/png/prefix])])
- AC_CHECK_LIB([png], [png_init_io], [] ,
+ AC_CHECK_LIB([png], [png_init_io],[],
[AC_MSG_ERROR([libpng library not found in $with_png. install png development package, or reconfigure with --with-png=/path/to/png/prefix])])
PNG_INC="$CFLAGS"
PNG_LIB="$LDFLAGS"
@@ -262,9 +262,9 @@ AC_DEFUN([MS_CHECK_JPEG],[
fi
if test -z "$with_jpeg" -o "$with_jpeg" == "yes" -o "$with_jpeg" == "/usr"; then
- AC_CHECK_HEADER([jpeglib.h], [] ,
+ AC_CHECK_HEADER([jpeglib.h],[],
[AC_MSG_ERROR([jpeglib.h header not found. install jpeg development package, or reconfigure with --with-jpeg=/path/to/jpeg/prefix])])
- AC_CHECK_LIB([jpeg], [jpeg_read_header], [] ,
+ AC_CHECK_LIB([jpeg], [jpeg_read_header],[],
[AC_MSG_ERROR([libjpeg library not found. install jpeg development package, or reconfigure with --with-jpeg=/path/to/jpeg/prefix])])
else
@@ -274,9 +274,9 @@ AC_DEFUN([MS_CHECK_JPEG],[
CPPFLAGS="-I$with_jpeg/include"
LDFLAGS="-L$with_jpeg/lib"
- AC_CHECK_HEADER([jpeglib.h], [] ,
+ AC_CHECK_HEADER([jpeglib.h],[],
[AC_MSG_ERROR([jpeglib.h header not found in $with_jpeg. install jpeg development package, or reconfigure with --with-jpeg=/path/to/jpeg/prefix])])
- AC_CHECK_LIB([jpeg], [jpeg_read_header], [] ,
+ AC_CHECK_LIB([jpeg], [jpeg_read_header],[],
[AC_MSG_ERROR([libjpeg library not found in $with_jpeg. install jpeg development package, or reconfigure with --with-jpeg=/path/to/jpeg/prefix])])
JPEG_INC="$CFLAGS"
JPEG_LIB="$LDFLAGS"
@@ -319,9 +319,9 @@ AC_DEFUN([MS_CHECK_GIF],[
else
AC_MSG_RESULT([yes])
if test -z "$with_gif" -o "$with_gif" == "yes" -o "$with_gif" == "/usr"; then
- AC_CHECK_HEADER([gif_lib.h], [] ,
+ AC_CHECK_HEADER([gif_lib.h],,
[AC_MSG_ERROR([gif_lib.h header not found. install gif development package, or reconfigure with --with-gif=/path/to/gif/prefix])])
- AC_CHECK_LIB([gif], [DGifOpenFileHandle], [] ,
+ AC_CHECK_LIB([gif], [DGifOpenFileHandle],[],
[AC_MSG_ERROR([libgif library not found. install gif development package, or reconfigure with --with-gif=/path/to/gif/prefix])])
else
@@ -331,9 +331,9 @@ AC_DEFUN([MS_CHECK_GIF],[
CPPFLAGS="-I$with_gif/include"
LDFLAGS="-L$with_gif/lib"
- AC_CHECK_HEADER([gif_lib.h], [] ,
+ AC_CHECK_HEADER([gif_lib.h],[],
[AC_MSG_ERROR([gif_lib.h header not found in $with_gif. install gif development package, or reconfigure with --with-gif=/path/to/gif/prefix])])
- AC_CHECK_LIB([gif], [DGifOpenFileHandle], [] ,
+ AC_CHECK_LIB([gif], [DGifOpenFileHandle],[],
[AC_MSG_ERROR([libgif library not found in $with_gif. install gif development package, or reconfigure with --with-gif=/path/to/gif/prefix])])
GIF_INC="$CFLAGS"
GIF_LIB="$LDFLAGS"
View
14 mapcairo.c
@@ -890,15 +890,19 @@ int renderEllipseSymbolCairo(imageObj *img, double x, double y, symbolObj *symbo
int startLayerVectorCairo(imageObj *img, mapObj *map, layerObj *layer) {
- cairo_renderer *r = CAIRO_RENDERER(img);
- cairo_push_group (r->cr);
+ if(layer->opacity<100) {
+ cairo_renderer *r = CAIRO_RENDERER(img);
+ cairo_push_group (r->cr);
+ }
return MS_SUCCESS;
}
int closeLayerVectorCairo(imageObj *img, mapObj *map, layerObj *layer) {
- cairo_renderer *r = CAIRO_RENDERER(img);
- cairo_pop_group_to_source (r->cr);
- cairo_paint_with_alpha (r->cr, layer->opacity*0.01);
+ if(layer->opacity<100) {
+ cairo_renderer *r = CAIRO_RENDERER(img);
+ cairo_pop_group_to_source (r->cr);
+ cairo_paint_with_alpha (r->cr, layer->opacity*0.01);
+ }
return MS_SUCCESS;
}
Please sign in to comment.
Something went wrong with that request. Please try again.