From: Sandro Santilli <strk@keybit.net>
Date: Thu, 22 Jan 2015 16:12:40 +0000 (+0000)
Subject: Gracefully handle typos in style names for docs images
X-Git-Tag: 2.2.0rc1~698
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b327921312b8ae33f49bed761863b6650d390036;p=postgis

Gracefully handle typos in style names for docs images

git-svn-id: http://svn.osgeo.org/postgis/trunk@13194 b70326c6-7e19-0410-871a-916f4a2858ee
---

diff --git a/doc/html/image_src/generator.c b/doc/html/image_src/generator.c
index cb4551656..c08c318ad 100644
--- a/doc/html/image_src/generator.c
+++ b/doc/html/image_src/generator.c
@@ -371,6 +371,7 @@ int main( int argc, const char* argv[] )
 		char output[32768];
 		char *ptr = output;
 		char *styleName;
+		LAYERSTYLE *style;
 		int useDefaultStyle;
 
 		ptr += sprintf( ptr, "convert -size %s xc:none ", imageSize );
@@ -387,7 +388,12 @@ int main( int argc, const char* argv[] )
 			lwgeom = lwgeom_from_wkt( line+strlen(styleName)+1, LW_PARSER_CHECK_NONE );
 		LWDEBUGF( 4, "geom = %s", lwgeom_to_ewkt((LWGEOM*)lwgeom) );
 
-		ptr += drawGeometry( ptr, lwgeom, getStyle(styles, styleName) );
+		style = getStyle(styles, styleName);
+		if ( ! style ) {
+		  lwerror("Could not find style named %s", styleName);
+		  return -1;
+		}
+		ptr += drawGeometry( ptr, lwgeom, style );
 
 		ptr += sprintf( ptr, "-flip tmp%d.png", layerCount );