Skip to content

Commit 81c88d5

Browse files
andelfandelf
committed
Merge pull request #1 from netvl/master
Adapted to the latest Rust and ported to Cargo
2 parents d71a770 + def2947 commit 81c88d5

File tree

6 files changed

+149
-142
lines changed

6 files changed

+149
-142
lines changed

‎.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,3 +13,5 @@
1313
build/
1414
bin/
1515
lib/
16+
target/
17+
.*.swp

‎Cargo.toml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
[package]
2+
name = "sdl2_gfx"
3+
version = "0.1.0"
4+
authors = ["ShuYu Wang <[email protected]>"]
5+
6+
[dependencies.sdl2]
7+
git = "https://github.com/AngryLawyer/rust-sdl2"
8+
9+
[[lib]]
10+
name = "sdl2_gfx"
11+
path = "src/sdl2_gfx/lib.rs"

‎src/sdl2_gfx/imagefilter.rs

Lines changed: 45 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -14,73 +14,73 @@ mod ll {
1414
pub fn SDL_imageFilterMMXdetect() -> c_int;
1515
pub fn SDL_imageFilterMMXoff();
1616
pub fn SDL_imageFilterMMXon();
17-
pub fn SDL_imageFilterAdd(Src1: *u8, Src2: *u8,
18-
Dest: *u8, length: c_uint) -> c_int;
19-
pub fn SDL_imageFilterMean(Src1: *u8, Src2: *u8,
20-
Dest: *u8, length: c_uint) -> c_int;
21-
pub fn SDL_imageFilterSub(Src1: *u8, Src2: *u8,
22-
Dest: *u8, length: c_uint) -> c_int;
23-
pub fn SDL_imageFilterAbsDiff(Src1: *u8, Src2: *u8,
24-
Dest: *u8, length: c_uint) ->
17+
pub fn SDL_imageFilterAdd(Src1: *mut u8, Src2: *mut u8,
18+
Dest: *mut u8, length: c_uint) -> c_int;
19+
pub fn SDL_imageFilterMean(Src1: *mut u8, Src2: *mut u8,
20+
Dest: *mut u8, length: c_uint) -> c_int;
21+
pub fn SDL_imageFilterSub(Src1: *mut u8, Src2: *mut u8,
22+
Dest: *mut u8, length: c_uint) -> c_int;
23+
pub fn SDL_imageFilterAbsDiff(Src1: *mut u8, Src2: *mut u8,
24+
Dest: *mut u8, length: c_uint) ->
2525
c_int;
26-
pub fn SDL_imageFilterMult(Src1: *u8, Src2: *u8,
27-
Dest: *u8, length: c_uint) -> c_int;
28-
pub fn SDL_imageFilterMultNor(Src1: *u8, Src2: *u8,
29-
Dest: *u8, length: c_uint) ->
26+
pub fn SDL_imageFilterMult(Src1: *mut u8, Src2: *mut u8,
27+
Dest: *mut u8, length: c_uint) -> c_int;
28+
pub fn SDL_imageFilterMultNor(Src1: *mut u8, Src2: *mut u8,
29+
Dest: *mut u8, length: c_uint) ->
3030
c_int;
31-
pub fn SDL_imageFilterMultDivby2(Src1: *u8, Src2: *u8,
32-
Dest: *u8, length: c_uint) ->
31+
pub fn SDL_imageFilterMultDivby2(Src1: *mut u8, Src2: *mut u8,
32+
Dest: *mut u8, length: c_uint) ->
3333
c_int;
34-
pub fn SDL_imageFilterMultDivby4(Src1: *u8, Src2: *u8,
35-
Dest: *u8, length: c_uint) ->
34+
pub fn SDL_imageFilterMultDivby4(Src1: *mut u8, Src2: *mut u8,
35+
Dest: *mut u8, length: c_uint) ->
3636
c_int;
37-
pub fn SDL_imageFilterBitAnd(Src1: *u8, Src2: *u8,
38-
Dest: *u8, length: c_uint) -> c_int;
39-
pub fn SDL_imageFilterBitOr(Src1: *u8, Src2: *u8,
40-
Dest: *u8, length: c_uint) -> c_int;
41-
pub fn SDL_imageFilterDiv(Src1: *u8, Src2: *u8,
42-
Dest: *u8, length: c_uint) -> c_int;
43-
pub fn SDL_imageFilterBitNegation(Src1: *u8, Dest: *u8,
37+
pub fn SDL_imageFilterBitAnd(Src1: *mut u8, Src2: *mut u8,
38+
Dest: *mut u8, length: c_uint) -> c_int;
39+
pub fn SDL_imageFilterBitOr(Src1: *mut u8, Src2: *mut u8,
40+
Dest: *mut u8, length: c_uint) -> c_int;
41+
pub fn SDL_imageFilterDiv(Src1: *mut u8, Src2: *mut u8,
42+
Dest: *mut u8, length: c_uint) -> c_int;
43+
pub fn SDL_imageFilterBitNegation(Src1: *mut u8, Dest: *mut u8,
4444
length: c_uint) -> c_int;
45-
pub fn SDL_imageFilterAddByte(Src1: *u8, Dest: *u8,
45+
pub fn SDL_imageFilterAddByte(Src1: *mut u8, Dest: *mut u8,
4646
length: c_uint, C: u8) -> c_int;
47-
pub fn SDL_imageFilterAddUint(Src1: *u8, Dest: *u8,
47+
pub fn SDL_imageFilterAddUint(Src1: *mut u8, Dest: *mut u8,
4848
length: c_uint, C: c_uint) -> c_int;
49-
pub fn SDL_imageFilterAddByteToHalf(Src1: *u8,
50-
Dest: *u8, length: c_uint,
49+
pub fn SDL_imageFilterAddByteToHalf(Src1: *mut u8,
50+
Dest: *mut u8, length: c_uint,
5151
C: u8) -> c_int;
52-
pub fn SDL_imageFilterSubByte(Src1: *u8, Dest: *u8,
52+
pub fn SDL_imageFilterSubByte(Src1: *mut u8, Dest: *mut u8,
5353
length: c_uint, C: u8) -> c_int;
54-
pub fn SDL_imageFilterSubUint(Src1: *u8, Dest: *u8,
54+
pub fn SDL_imageFilterSubUint(Src1: *mut u8, Dest: *mut u8,
5555
length: c_uint, C: c_uint) -> c_int;
56-
pub fn SDL_imageFilterShiftRight(Src1: *u8, Dest: *u8,
56+
pub fn SDL_imageFilterShiftRight(Src1: *mut u8, Dest: *mut u8,
5757
length: c_uint, N: u8) -> c_int;
58-
pub fn SDL_imageFilterShiftRightUint(Src1: *u8,
59-
Dest: *u8, length: c_uint,
58+
pub fn SDL_imageFilterShiftRightUint(Src1: *mut u8,
59+
Dest: *mut u8, length: c_uint,
6060
N: u8) -> c_int;
61-
pub fn SDL_imageFilterMultByByte(Src1: *u8, Dest: *u8,
61+
pub fn SDL_imageFilterMultByByte(Src1: *mut u8, Dest: *mut u8,
6262
length: c_uint, C: u8) -> c_int;
63-
pub fn SDL_imageFilterShiftRightAndMultByByte(Src1: *u8,
64-
Dest: *u8,
63+
pub fn SDL_imageFilterShiftRightAndMultByByte(Src1: *mut u8,
64+
Dest: *mut u8,
6565
length: c_uint, N: u8,
6666
C: u8) -> c_int;
67-
pub fn SDL_imageFilterShiftLeftByte(Src1: *u8,
68-
Dest: *u8, length: c_uint,
67+
pub fn SDL_imageFilterShiftLeftByte(Src1: *mut u8,
68+
Dest: *mut u8, length: c_uint,
6969
N: u8) -> c_int;
70-
pub fn SDL_imageFilterShiftLeftUint(Src1: *u8,
71-
Dest: *u8, length: c_uint,
70+
pub fn SDL_imageFilterShiftLeftUint(Src1: *mut u8,
71+
Dest: *mut u8, length: c_uint,
7272
N: u8) -> c_int;
73-
pub fn SDL_imageFilterShiftLeft(Src1: *u8, Dest: *u8,
73+
pub fn SDL_imageFilterShiftLeft(Src1: *mut u8, Dest: *mut u8,
7474
length: c_uint, N: u8) -> c_int;
75-
pub fn SDL_imageFilterBinarizeUsingThreshold(Src1: *u8,
76-
Dest: *u8,
75+
pub fn SDL_imageFilterBinarizeUsingThreshold(Src1: *mut u8,
76+
Dest: *mut u8,
7777
length: c_uint, T: u8)
7878
-> c_int;
79-
pub fn SDL_imageFilterClipToRange(Src1: *u8, Dest: *u8,
79+
pub fn SDL_imageFilterClipToRange(Src1: *mut u8, Dest: *mut u8,
8080
length: c_uint, Tmin: u8,
8181
Tmax: u8) -> c_int;
82-
pub fn SDL_imageFilterNormalizeLinear(Src: *u8,
83-
Dest: *u8, length: c_uint,
82+
pub fn SDL_imageFilterNormalizeLinear(Src: *mut u8,
83+
Dest: *mut u8, length: c_uint,
8484
Cmin: c_int, Cmax: c_int,
8585
Nmin: c_int, Nmax: c_int) -> c_int;
8686
}

‎src/sdl2_gfx/lib.rs

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,6 @@
22
A binding for SDL2_gfx.
33
*/
44

5-
#![crate_id="sdl2_gfx#sdl2_gfx:0.1"]
6-
#![crate_type = "lib"]
7-
#![desc = "SDL2_gfx bindings and wrappers"]
8-
#![comment = "SDL2_gfx bindings and wrappers"]
9-
#![license = "MIT"]
10-
115
#![feature(globs, macro_rules)]
126

137
extern crate libc;

0 commit comments

Comments
 (0)