lsm/ntwain
1
0
Fork 0
mirror of https://github.com/soukoku/ntwain.git synced 2025-09-18 17:47:57 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Small time problem fixes.

Browse Source
This commit is contained in:
soukoku
2014-09-16 18:33:35 -04:00
parent 92063d2b84
commit d72c0586e6
2 changed files with 31 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
NTwain/Data/TwainTypesExtended.cs
View File

@@ -949,7 +949,7 @@ namespace NTwain.Data
} }
break; break;
case ContainerType.Range: case ContainerType.Range:
for (var i = read.RangeMinValue; i <= read.RangeMaxValue; i += read.RangeStepSize) for (var i = read.RangeMinValue; i >= read.RangeMinValue && i <= read.RangeMaxValue; i += read.RangeStepSize)
{ {
toPopulate.Add(i); toPopulate.Add(i);
} }
@@ -1390,7 +1390,10 @@ namespace NTwain.Data
/// </summary> /// </summary>
public sealed partial class TWExtImageInfo : IDisposable public sealed partial class TWExtImageInfo : IDisposable
{ {
internal TWExtImageInfo() /// <summary>
/// Initializes a new instance of the <see cref="TWExtImageInfo"/> class.
/// </summary>
public TWExtImageInfo()
{ {
_info = new TWInfo[200]; _info = new TWInfo[200];
} }

34
NTwain/TwainSession.cs
View File

@@ -18,7 +18,7 @@ namespace NTwain
/// <summary> /// <summary>
/// Basic class for interfacing with TWAIN. You should only have one of this per application process. /// Basic class for interfacing with TWAIN. You should only have one of this per application process.
/// </summary> /// </summary>
public partial class TwainSession public partial class TwainSession
{ {
/// <summary> /// <summary>
/// Initializes a new instance of the <see cref="TwainSession"/> class. /// Initializes a new instance of the <see cref="TwainSession"/> class.
@@ -71,7 +71,7 @@ namespace NTwain
} }
return source; return source;
} }
#region ITwainSession Members #region ITwainSession Members
@@ -421,7 +421,10 @@ namespace NTwain
var hand = PropertyChanged; var hand = PropertyChanged;
if (hand != null) { hand(this, new PropertyChangedEventArgs(propertyName)); } if (hand != null) { hand(this, new PropertyChangedEventArgs(propertyName)); }
} }
catch { } catch (Exception ex)
{
Debug.WriteLine("PropertyChanged event error: " + ex.ToString());
}
} }
else else
{ {
@@ -432,7 +435,10 @@ namespace NTwain
var hand = PropertyChanged; var hand = PropertyChanged;
if (hand != null) { hand(this, new PropertyChangedEventArgs(propertyName)); } if (hand != null) { hand(this, new PropertyChangedEventArgs(propertyName)); }
} }
catch { } catch (Exception ex)
{
Debug.WriteLine("PropertyChanged event error: " + ex.ToString());
}
}, null); }, null);
} }
} }
@@ -486,7 +492,10 @@ namespace NTwain
onEventFunc(); onEventFunc();
if (handler != null) { handler(this, EventArgs.Empty); } if (handler != null) { handler(this, EventArgs.Empty); }
} }
catch { } catch (Exception ex)
{
Debug.WriteLine(handler.Method.Name + " event error: " + ex.ToString());
}
} }
else else
{ {
@@ -497,7 +506,10 @@ namespace NTwain
onEventFunc(); onEventFunc();
if (handler != null) { handler(this, EventArgs.Empty); } if (handler != null) { handler(this, EventArgs.Empty); }
} }
catch { } catch (Exception ex)
{
Debug.WriteLine(handler.Method.Name + " event error: " + ex.ToString());
}
}, null); }, null);
} }
} }
@@ -522,7 +534,10 @@ namespace NTwain
onEventFunc(e); onEventFunc(e);
if (handler != null) { handler(this, e); } if (handler != null) { handler(this, e); }
} }
catch { } catch (Exception ex)
{
Debug.WriteLine(handler.Method.Name + " event error: " + ex.ToString());
}
} }
else else
{ {
@@ -535,7 +550,10 @@ namespace NTwain
onEventFunc(e); onEventFunc(e);
if (handler != null) { handler(this, e); } if (handler != null) { handler(this, e); }
} }
catch { } catch (Exception ex)
{
Debug.WriteLine(handler.Method.Name + " event error: " + ex.ToString());
}
}, null); }, null);
} }
} }