Skip to content

Use transcode for string convert to Julia #76

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 5, 2016
Merged

Use transcode for string convert to Julia #76

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,9 @@ By default, `MATLAB.jl` uses the MATLAB installation with the greatest version n

### Windows

1. Start a Command Prompt as an Administrator.
1. Start a Command Prompt as an Administrator and enter `matlab /regserver`.

2. Enter `matlab /regserver` in the command prompt.

3. From Julia run: `Pkg.add("MATLAB")`
2. From Julia run: `Pkg.add("MATLAB")`


### Linux
Expand Down
7 changes: 2 additions & 5 deletions src/mxarray.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ typealias MxNum Union{MxRealNum, MxComplexNum}

typealias mwSize UInt
typealias mwIndex Int
typealias mxChar UInt16
typealias mxClassID Cint
typealias mxComplexity Cint

Expand Down Expand Up @@ -639,11 +640,7 @@ function jstring(mx::MxArray)
if !(classid(mx) == mxCHAR_CLASS && ((ndims(mx) == 2 && nrows(mx) == 1) || is_empty(mx)))
throw(ArgumentError("jstring only applies to strings (i.e. char vectors)."))
end
len = ncols(mx) + 1
tmp = Array(UInt8, len)
ccall(_mx_get_string, Cint, (Ptr{Void}, Ptr{UInt8}, mwSize), mx, tmp, len)
pop!(tmp)
String(tmp)
return transcode(String, unsafe_wrap(Array, Ptr{mxChar}(data_ptr(mx)), ncols(mx)))
end

function jdict(mx::MxArray)
Expand Down