[mapserver] 02/04: Fix merge.

[Sebastiaan Couwenberg]

This is an automated email from the git hooks/post-receive script.

sebastic pushed a commit to branch master
in repository mapserver.

commit 952258611e7fc2928fcc5c28fc18c1d89a5b5d50
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Fri Jul 24 15:09:57 2015 +0200

    Fix merge.
---
 debian/libmapserver2.symbols | 2 +-
 maprendering.c               | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/libmapserver2.symbols b/debian/libmapserver2.symbols
index f08c895..b2ca166 100644
--- a/debian/libmapserver2.symbols
+++ b/debian/libmapserver2.symbols
@@ -557,7 +557,7 @@ libmapserver.so.2 #PACKAGE# #MINVER#
  _ZNK9mapserver12trans_affine8is_equalERKS0_d at Base 6.2.1
  _ZNK9mapserver12trans_affine8is_validEd at Base 6.2.1
  _ZNK9mapserver12trans_affine8rotationEv at Base 6.2.1
- (arch=armel hurd-i386 i386 kfreebsd-i386 mips mipsel powerpc)_ZNK9mapserver12trans_affine9transformEPdS1_ at Base 6.4.1
+ (arch=armel armhf hurd-i386 i386 kfreebsd-i386 mips mipsel powerpc)_ZNK9mapserver12trans_affine9transformEPdS1_ at Base 6.4.1
  (optional=templinst)_ZNK9mapserver18rasterizer_sl_clipINS_12ras_conv_intEE11line_clip_yINS_19rasterizer_cells_aaINS_7cell_aaEEEEEvRT_iiiijj at Base 6.2.1
  _ZNK9mapserver25font_engine_freetype_base14write_glyph_toEPh at Base 6.2.1
  _ZNK9mapserver25font_engine_freetype_base8ascenderEv at Base 6.2.1
diff --git a/maprendering.c b/maprendering.c
index 9ccb1e7..4a50d62 100644
--- a/maprendering.c
+++ b/maprendering.c
@@ -561,7 +561,7 @@ int msDrawLineSymbol(mapObj *map, imageObj *image, shapeObj *p,
       rendererVTableObj *renderer = image->format->vtable;
       symbolObj *symbol;
       shapeObj *offsetLine = p;
-      int i,ret=MS_SUCCESS;
+      int i;
       double width;
       double finalscalefactor;
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/mapserver.git