Fixed asp.net loading (#97)

charlesw · Jun 22, 2014 · 999b2cd · 999b2cd
1 parent 1b92e22
commit 999b2cd
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 5 deletions.
diff --git a/.gitignore b/.gitignore
@@ -186,3 +186,4 @@ pip-log.txt
 /src/AssemblyVersionInfo.cs
 
 /*.Log
+*.sdsettings
diff --git a/Samples/Tesseract.ConsoleDemo/Program.cs b/Samples/Tesseract.ConsoleDemo/Program.cs
@@ -71,7 +71,7 @@ public static void Main(string[] args)
 
         private class ResultPrinter
         {
-            private FormattedConsoleLogger logger;
+            readonly FormattedConsoleLogger logger;
 
             public ResultPrinter(FormattedConsoleLogger logger)
             {

diff --git a/Samples/Tesseract.WebDemo/Default.aspx.cs b/Samples/Tesseract.WebDemo/Default.aspx.cs
@@ -49,7 +49,7 @@ private void OnSubmitFileClicked(object sender, EventArgs args)
             {
             	// for now just fail hard if there's any error however in a propper app I would expect a full demo.
 
-                using (var engine = new TesseractEngine(Server.MapPath(@"./tessdata"), "eng", EngineMode.Default))
+                using (var engine = new TesseractEngine(Server.MapPath(@"~/tessdata"), "eng", EngineMode.Default))
                 {
                     // have to load Pix via a bitmap since Pix doesn't support loading a stream.
                     using (var image = new System.Drawing.Bitmap(imageFile.PostedFile.InputStream))

diff --git a/build.proj b/build.proj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Package" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 	<PropertyGroup>
-		<Version>1.0.10</Version>
+		<Version>1.0.11</Version>
 		<SourceDir>$(MSBuildProjectDirectory)\src</SourceDir>
 		<BuildDir>$(MSBuildProjectDirectory)\bin</BuildDir>
 		<ReleaseDir>$(MSBuildProjectDirectory)\release</ReleaseDir>

diff --git a/src/Tesseract/ChangeLog.md b/src/Tesseract/ChangeLog.md
@@ -1,3 +1,8 @@
 ### Version 1.10
 
-* Added support for uzn files - [Issue 66](https://github.com/charlesw/tesseract/issues/66)
+* Added support for uzn files - [Issue 66](https://github.com/charlesw/tesseract/issues/66)
+
+### Version 1.11
+
+* Allow changing the current region of interest without having to reload the entire image (Page.RegionOfInterest)
+* Fixed loader for ASP.NET [Issue 97](https://github.com/charlesw/tesseract/issues/97)
diff --git a/src/Tesseract/Interop/WindowsLibraryLoader.cs b/src/Tesseract/Interop/WindowsLibraryLoader.cs
@@ -126,7 +126,7 @@ public void LoadLibrary(string dllName)
                             #if !ClientProfile
                             if(HttpContext.Current != null) {
                             	var server = HttpContext.Current.Server;
-                            	baseDirectory = Path.GetFullPath(server.MapPath("bin"));
+                            	baseDirectory = Path.GetFullPath(server.MapPath("~/bin"));
 	                            dllHandle = LoadLibraryInternal(dllName, baseDirectory, processArch);
 	                            if (dllHandle != IntPtr.Zero) return;	                            
                             }