[Wsplgen-commits] r81 - trunk/src

Tue Nov 28 20:07:42 CET 2006

Author: mrchip
Date: 2006-11-28 20:07:37 +0100 (Tue, 28 Nov 2006)
New Revision: 81

Added:
   trunk/src/shapelib_1_2_10.zip
Modified:
   trunk/src/shape.cpp
   trunk/src/test_xy.cpp
   trunk/src/wsplgen.h
Log:
Version 1.0.0
Der Kopf von shape.cpp wurde ge?\195?\164ndert, wegen der Rechte und
ein Test wurde angepasst.

Modified: trunk/src/shape.cpp
===================================================================

--- trunk/src/shape.cpp	2006-11-27 06:17:22 UTC (rev 80)
+++ trunk/src/shape.cpp	2006-11-28 19:07:37 UTC (rev 81)
@@ -1,3 +1,60 @@
+// $Id$
+//
+// Copyright (C) 2005 STADT-LAND-FLUSS INGENIEURDIENSTE GmbH
+//
+// Authors:
+// Ulrich Kiel <u.kiel at S-L-F.de>
+//
+// Diese Datei beruht auf der Shapelib von Frank Warmerdam
+//
+// Es wurden die beiden Hauptdateien shpopen.c und dbfopen.c zusammengefügt und
+// an die Strktur von WSPLGEN angepasst
+//
+// Einige 'assert' wuurden durch 'dump_error' Aufrufe ersetzt
+//
+// Die original Shapelib wurde als ZIP-Archive den Quellen beigefügt.
+//
+// Die beiden Funktionen SHPWritePoint und SHPWriteElement wurden der Einfachheit
+// halber eingeführt.
+// 
+// Hier der original Kopf der Datei shpopen.c
+
+/******************************************************************************
+ * $Id$
+ *
+ * Project:  Shapelib
+ * Purpose:  Implementation of core Shapefile read/write functions.
+ * Author:   Frank Warmerdam, warmerdam at pobox.com
+ *
+ ******************************************************************************
+ * Copyright (c) 1999, 2001, Frank Warmerdam
+ *
+ * This software is available under the following "MIT Style" license,
+ * or at the option of the licensee under the LGPL (see LICENSE.LGPL).  This
+ * option is discussed in more detail in shapelib.html.
+ *
+ * --
+ * 
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ ******************************************************************************/
+
+
 #ifdef __BORLANDC__
 #pragma hdrstop
 #endif
@@ -1842,41 +1899,8 @@
 
 	return bAltered;
 }
-/******************************************************************************
- * $Id$
- *
- * Project:  Shapelib
- * Purpose:  Implementation of .dbf access API documented in dbf_api.html.
- * Author:   Frank Warmerdam, warmerdam at pobox.com
- *
- ******************************************************************************
- * Copyright (c) 1999, Frank Warmerdam
- *
- * This software is available under the following "MIT Style" license,
- * or at the option of the licensee under the LGPL (see LICENSE.LGPL).  This
- * option is discussed in more detail in shapelib.html.
- *
- * --
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included
- * in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
- ******************************************************************************/
 
+
 static int	nStringFieldLen = 0;
 static char * pszStringField = NULL;
 

Added: trunk/src/shapelib_1_2_10.zip
===================================================================
(Binary files differ)


Property changes on: trunk/src/shapelib_1_2_10.zip
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: trunk/src/test_xy.cpp
===================================================================
--- trunk/src/test_xy.cpp	2006-11-27 06:17:22 UTC (rev 80)
+++ trunk/src/test_xy.cpp	2006-11-28 19:07:37 UTC (rev 81)
@@ -386,11 +386,11 @@
 		TXY* Xy2 = *NewPolygon2->begin();
 
 		if (NewPolygon1->size() != 13)		printf("Failed\n");
-		else if (Xy1->X != 4147)			printf("Failed\n");
-		else if (Xy1->Y != 5503)			printf("Failed\n");
+		else if (Xy1->X != 2144)			printf("Failed\n");
+		else if (Xy1->Y != 6240)			printf("Failed\n");
 		else if (NewPolygon2->size() != 10)	printf("Failed\n");
-		else if (Xy2->X != 5044)			printf("Failed\n");
-		else if (Xy2->Y != 5540)			printf("Failed\n");
+		else if (Xy2->X != 2863)			printf("Failed\n");
+		else if (Xy2->Y != 5975)			printf("Failed\n");
 		else								printf("Pass\n");
 
         delete NewPolygon1;

Modified: trunk/src/wsplgen.h
===================================================================
--- trunk/src/wsplgen.h	2006-11-27 06:17:22 UTC (rev 80)
+++ trunk/src/wsplgen.h	2006-11-28 19:07:37 UTC (rev 81)
@@ -10,8 +10,12 @@
 // Read the file COPYING coming with WSPLGEN for details.
 //
 
-const char Version[] = "1.0.0 rc4";
+const char Version[] = "1.0.0";
 
+// Keine Änderungen
+
+// const char Version[] = "1.0.0 rc4";
+
 // Die Attribute 'Rohr1' und 'Rohr2' wurden in 'Rohr 1' und 'Rohr 2' umbenannt
 
 // Es werden jetzt die Zeichen '#', ';' und ''' als Beginn eines Kommentares verstanden

