[mapguide-commits] r1312 - trunk/MgDev/Oem/proj-4.5.0/src

[svn_mapguide at osgeo.org]

Author: stevedang
Date: 2007-03-20 23:55:05 -0400 (Tue, 20 Mar 2007)
New Revision: 1312

Added:
   trunk/MgDev/Oem/proj-4.5.0/src/proj.vcproj
Modified:
   trunk/MgDev/Oem/proj-4.5.0/src/PJ_gn_sinu.c
   trunk/MgDev/Oem/proj-4.5.0/src/PJ_laea.c
   trunk/MgDev/Oem/proj-4.5.0/src/makefile.vc
Log:
PROJ 4.5.0 upgrade (part 1):
- Fix MapGuide crashing problem on debug Windows.
- Incorporate changes made to PROJ 4.4.9 (e.g. running MT tool to add manifest to DLL, removing duplicate calls to pj_enfn(), freeing data allocated in pj_authset(), using a relative path for PROJ_LIB_DIR, fixing compiler settings to produce correct PDB).



Modified: trunk/MgDev/Oem/proj-4.5.0/src/PJ_gn_sinu.c
===================================================================
--- trunk/MgDev/Oem/proj-4.5.0/src/PJ_gn_sinu.c	2007-03-21 02:47:39 UTC (rev 1311)
+++ trunk/MgDev/Oem/proj-4.5.0/src/PJ_gn_sinu.c	2007-03-21 03:55:05 UTC (rev 1312)
@@ -75,7 +75,6 @@
 	if (!(P->en = pj_enfn(P->es)))
 		E_ERROR_0;
 	if (P->es) {
-		P->en = pj_enfn(P->es);
 		P->inv = e_inverse;
 		P->fwd = e_forward;
 	} else {

Modified: trunk/MgDev/Oem/proj-4.5.0/src/PJ_laea.c
===================================================================
--- trunk/MgDev/Oem/proj-4.5.0/src/PJ_laea.c	2007-03-21 02:47:39 UTC (rev 1311)
+++ trunk/MgDev/Oem/proj-4.5.0/src/PJ_laea.c	2007-03-21 03:55:05 UTC (rev 1312)
@@ -179,8 +179,14 @@
 		0. : atan2(xy.x, xy.y);
 	return (lp);
 }
-FREEUP; if (P) pj_dalloc(P); }
-ENTRY0(laea)
+FREEUP;
+    if (P) {
+		if (P->apa)
+			pj_dalloc(P->apa);
+		pj_dalloc(P);
+	}
+}
+ENTRY1(laea, apa)
 	double t;
 
 	if (fabs((t = fabs(P->phi0)) - HALFPI) < EPS10)

Modified: trunk/MgDev/Oem/proj-4.5.0/src/makefile.vc
===================================================================
--- trunk/MgDev/Oem/proj-4.5.0/src/makefile.vc	2007-03-21 02:47:39 UTC (rev 1311)
+++ trunk/MgDev/Oem/proj-4.5.0/src/makefile.vc	2007-03-21 03:55:05 UTC (rev 1312)
@@ -5,11 +5,11 @@
 # be adjusted.  It is also possible to leave this, and define the
 # PROJ_LIB environment variable to point to the NAD directory.
 #
-PROJ_LIB_DIR=C:/PROJ/NAD
+PROJ_LIB_DIR=../NAD
 
 # Uncomment the first for an optimized build, or the second for debug.
-OPTFLAGS=	/nologo /Ox /MD
-#OPTFLAGS=	/nologo /Zi /MD /Fdproj.pdb
+OPTFLAGS=	/nologo /Ox /MD /Zi /Fdprojvc.pdb
+#OPTFLAGS=	/nologo /Od /MDd /Zi /Fdprojvc.pdb
 
 # Uncomment the first for linking exes against DLL or second for static
 EXE_PROJ =	proj_i.lib
@@ -88,7 +88,8 @@
 
 proj_i.lib:	$(LIBOBJ)
 	link /debug /dll /def:proj.def /out:$(PROJ_DLL) /implib:proj_i.lib \
-			$(LIBOBJ)
+			/manifest /manifestfile:proj.dll.manifest $(LIBOBJ)
+	mt -manifest proj.dll.manifest -outputresource:$(PROJ_DLL);2
 
 proj.exe:	$(PROJEXE_OBJ) $(EXE_PROJ)
 	cl $(PROJEXE_OBJ) $(EXE_PROJ)

Added: trunk/MgDev/Oem/proj-4.5.0/src/proj.vcproj
===================================================================
--- trunk/MgDev/Oem/proj-4.5.0/src/proj.vcproj	                        (rev 0)
+++ trunk/MgDev/Oem/proj-4.5.0/src/proj.vcproj	2007-03-21 03:55:05 UTC (rev 1312)
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="8.00"
+	Name="PROJ"
+	ProjectGUID="{E8F6DBAE-C078-4826-B774-01EFA74219F6}"
+	Keyword="MakeFileProj"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="Debug"
+			IntermediateDirectory="Debug"
+			ConfigurationType="0"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+			>
+			<Tool
+				Name="VCNMakeTool"
+				BuildCommandLine="nmake /f makefile.vc proj_i.lib"
+				ReBuildCommandLine="nmake /f makefile.vc clean all"
+				CleanCommandLine="nmake /f makefile.vc clean"
+				Output=""
+				PreprocessorDefinitions=""
+				IncludeSearchPath=""
+				ForcedIncludes=""
+				AssemblySearchPath=""
+				ForcedUsingAssemblies=""
+				CompileAsManaged=""
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="Release"
+			IntermediateDirectory="Release"
+			ConfigurationType="0"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+			>
+			<Tool
+				Name="VCNMakeTool"
+				BuildCommandLine="nmake /f makefile.vc proj_i.lib"
+				ReBuildCommandLine="nmake /f makefile.vc clean all"
+				CleanCommandLine="nmake /f makefile.vc clean"
+				Output=""
+				PreprocessorDefinitions=""
+				IncludeSearchPath=""
+				ForcedIncludes=""
+				AssemblySearchPath=""
+				ForcedUsingAssemblies=""
+				CompileAsManaged=""
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<File
+			RelativePath=".\makefile.vc"
+			>
+		</File>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>


Property changes on: trunk/MgDev/Oem/proj-4.5.0/src/proj.vcproj
___________________________________________________________________
Name: svn:eol-style
   + native