TestEIn 1.6k3 :

- aggiornamenti per import BTL.
This commit is contained in:
Dario Sassi
2015-11-09 10:31:01 +00:00
parent ab7b564b24
commit a3aea51d20
3 changed files with 8 additions and 8 deletions
+1 -1
View File
@@ -453,7 +453,7 @@ Public Class Controller
ElseIf nFileType = FT.CSF Then
bOk = bOk And EgtImportCsf(sFile)
ElseIf nFileType = FT.BTL Then
bOk = bOk And EgtImportBtl(sFile, True)
bOk = bOk And EgtImportBtl(sFile, True, False)
End If
EgtResetCurrPartLayer()
DisableCommandLog()
+5 -5
View File
@@ -1326,16 +1326,16 @@ Public Function EgtImportCsf(ByVal sFilePath As String) As Boolean
End Function
<DllImport(EgtIntDll32, CharSet:=CharSet.Unicode, EntryPoint:="EgtImportBtl")>
Private Function EgtImportBtl_32(ByVal sFilePath As String, ByVal bFlatPos As Boolean) As Boolean
Private Function EgtImportBtl_32(ByVal sFilePath As String, ByVal bFlatPos As Boolean, ByVal bSpecialTrim As Boolean) As Boolean
End Function
<DllImport(EgtIntDll64, CharSet:=CharSet.Unicode, EntryPoint:="EgtImportBtl")>
Private Function EgtImportBtl_64(ByVal sFilePath As String, ByVal bFlatPos As Boolean) As Boolean
Private Function EgtImportBtl_64(ByVal sFilePath As String, ByVal bFlatPos As Boolean, ByVal bSpecialTrim As Boolean) As Boolean
End Function
Public Function EgtImportBtl(ByVal sFilePath As String, ByVal bFlatPos As Boolean) As Boolean
Public Function EgtImportBtl(ByVal sFilePath As String, ByVal bFlatPos As Boolean, ByVal bSpecialTrim As Boolean) As Boolean
If IntPtr.Size = 4 Then
Return EgtImportBtl_32(sFilePath, bFlatPos)
Return EgtImportBtl_32(sFilePath, bFlatPos, bSpecialTrim)
Else
Return EgtImportBtl_64(sFilePath, bFlatPos)
Return EgtImportBtl_64(sFilePath, bFlatPos, bSpecialTrim)
End If
End Function
+2 -2
View File
@@ -46,5 +46,5 @@ Imports System.Runtime.InteropServices
' utilizzando l'asterisco (*) come descritto di seguito:
' <Assembly: AssemblyVersion("1.0.*")>
<Assembly: AssemblyVersion("1.6.11.1")>
<Assembly: AssemblyFileVersion("1.6.11.1")>
<Assembly: AssemblyVersion("1.6.11.3")>
<Assembly: AssemblyFileVersion("1.6.11.3")>