@@ -32,47 +32,48 @@ add_format(format"PSD", UInt8[0x38,0x42,0x50,0x53], ".psd",
32
32
add_format (format " RGB" , UInt8[0x01 ,0xda ,0x01 ,0x01 ,0x00 ,0x03 ], " .rgb" , [:ImageMagick ])
33
33
add_format (format " WMF" , UInt8[0xd7 ,0xcd ,0xc6 ,0x9a ], " .wmf" , [:ImageMagick ])
34
34
add_format (format " WPG" , UInt8[0xff ,0x57 ,0x50 ,0x43 ], " .wpg" , [:ImageMagick ])
35
+ add_format (format " Imagine" , " IMAGINE" , " .imagine" , [:ImagineFormat ])
35
36
36
37
add_format (
37
- format " TGA" ,
38
+ format " TGA" ,
38
39
(),
39
- " .tga" ,
40
- [:OSXNativeIO , LOAD, OSX],
40
+ " .tga" ,
41
+ [:OSXNativeIO , LOAD, OSX],
41
42
[:ImageMagick ]
42
43
)
43
44
add_format (
44
- format " GIF" ,
45
+ format " GIF" ,
45
46
UInt8[0x47 ,0x49 ,0x46 ,0x38 ],
46
- " .gif" ,
47
- [:OSXNativeIO , LOAD, OSX],
47
+ " .gif" ,
48
+ [:OSXNativeIO , LOAD, OSX],
48
49
[:ImageMagick ]
49
50
)
50
51
add_format (
51
- format " PNG" ,
52
- UInt8[0x89 ,0x50 ,0x4e ,0x47 ,0x0d ,0x0a ,0x1a ,0x0a ],
53
- " .png" ,
54
- [:OSXNativeIO , LOAD, OSX],
52
+ format " PNG" ,
53
+ UInt8[0x89 ,0x50 ,0x4e ,0x47 ,0x0d ,0x0a ,0x1a ,0x0a ],
54
+ " .png" ,
55
+ [:OSXNativeIO , LOAD, OSX],
55
56
[:ImageMagick ]
56
57
)
57
58
add_format (
58
- format " TIFF" ,
59
- (UInt8[0x4d ,0x4d ,0x00 ,0x2a ], UInt8[0x4d ,0x4d ,0x00 ,0x2b ], UInt8[0x49 ,0x49 ,0x2a ,0x00 ]),
60
- [" .tiff" , " .tif" ],
61
- [:OSXNativeIO , LOAD, OSX],
59
+ format " TIFF" ,
60
+ (UInt8[0x4d ,0x4d ,0x00 ,0x2a ], UInt8[0x4d ,0x4d ,0x00 ,0x2b ], UInt8[0x49 ,0x49 ,0x2a ,0x00 ]),
61
+ [" .tiff" , " .tif" ],
62
+ [:OSXNativeIO , LOAD, OSX],
62
63
[:ImageMagick ]
63
64
)
64
65
add_format (
65
- format " JPEG" ,
66
+ format " JPEG" ,
66
67
UInt8[0xff ,0xd8 ,0xff ],
67
- [" .jpeg" , " .jpg" , " .JPG" ],
68
- [:OSXNativeIO , LOAD, OSX],
68
+ [" .jpeg" , " .jpg" , " .JPG" ],
69
+ [:OSXNativeIO , LOAD, OSX],
69
70
[:ImageMagick ]
70
71
) # 0xe1
71
72
add_format (
72
- format " BMP" ,
73
+ format " BMP" ,
73
74
UInt8[0x42 ,0x4d ],
74
75
" .bmp" ,
75
- [:OSXNativeIO , LOAD, OSX],
76
+ [:OSXNativeIO , LOAD, OSX],
76
77
[:ImageMagick ]
77
78
)
78
79
@@ -146,7 +147,7 @@ function detect_stlbinary(io)
146
147
len = position (io)
147
148
seekstart (io)
148
149
len < size_header && return false
149
-
150
+
150
151
skip (io, 80 ) # skip header
151
152
number_of_triangle_blocks = read (io, UInt32)
152
153
# 1 normal, 3 vertices in Float32 + attrib count, usually 0
@@ -160,4 +161,3 @@ function detect_stlbinary(io)
160
161
end
161
162
add_format (format " STL_ASCII" , detect_stlascii, [" .stl" , " .STL" ], [:MeshIO ])
162
163
add_format (format " STL_BINARY" , detect_stlbinary, [" .stl" , " .STL" ], [:MeshIO ])
163
-
0 commit comments