Skip to content

Commit 91661df

Browse files
authored
Merge pull request #384 from JuliaIO/vs/rm-quartzimageio
Remove QuartzImageIO
2 parents b7259eb + 5df2454 commit 91661df

File tree

1 file changed

+6
-12
lines changed

1 file changed

+6
-12
lines changed

src/registry.jl

+6-12
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,12 @@ const idImageMagick = :ImageMagick => UUID("6218d12a-5da1-5696-b52f-db25d2ecc6d1
88
const idMeshIO = :MeshIO => UUID("7269a6da-0436-5bbc-96c2-40638cbb6118")
99
const idNetpbm = :Netpbm => UUID("f09324ee-3d7c-5217-9330-fc30815ba969")
1010
const idOpenCV = :OpenCV => UUID("f878e3a2-a245-4720-8660-60795d644f2a")
11-
const idQuartzImageIO = :QuartzImageIO => UUID("dca85d43-d64c-5e67-8c65-017450d5d020")
1211
const idRData = :RData => UUID("df47a6cb-8c03-5eed-afd8-b6050d6c41da")
1312
const idStatFiles = :StatFiles => UUID("1463e38c-9381-5320-bcd4-4134955f093a")
1413
const idSixel = :Sixel => UUID("45858cf5-a6b0-47a3-bbea-62219f50df47")
1514
const idVegaLite = :VegaLite => UUID("112f6efa-9a02-5b7d-90c0-432ed331239a")
1615
const idVideoIO = :VideoIO => UUID("d6d074c3-1acf-5d4c-9a43-ef38773959a2")
17-
const idLibSndFile = :LibSndFile => UUID("b13ce0c6-77b0-50c6-a2db-140568b8d1a5")
16+
const idLibSndFile = :LibSndFile => UUID("b13ce0c6-77b0-50c6-a2db-140568b8d1a5")
1817
const idJpegTurbo = :JpegTurbo => UUID("b835a17e-a41a-41e7-81f0-2f016b05efe0")
1918
const idNPZ = :NPZ => UUID("15e1cf62-19b3-5cfa-8e77-841668bca605")
2019

@@ -102,7 +101,7 @@ function detect_rdata_single(io)
102101
c == UInt8('\n') || return false
103102
return true
104103
end
105-
104+
106105
res = checked_match(io)
107106
if !res
108107
res = detect_compressed(io; formats=["GZIP", "BZIP2", "XZ"]) && !name_matches_compressed_fits(io)
@@ -164,22 +163,19 @@ add_format(
164163
format"TGA",
165164
(),
166165
".tga",
167-
[idQuartzImageIO, OSX],
168166
[idImageMagick]
169167
)
170168
add_format(
171169
format"GIF",
172170
UInt8[0x47,0x49,0x46,0x38],
173171
".gif",
174-
[idQuartzImageIO, OSX],
175172
[idImageMagick]
176173
)
177174
add_format(
178175
format"PNG",
179176
UInt8[0x89,0x50,0x4e,0x47,0x0d,0x0a,0x1a,0x0a],
180177
".png",
181178
[idImageIO],
182-
[idQuartzImageIO, OSX],
183179
[idImageMagick],
184180
[idOpenCV],
185181
[MimeWriter, SAVE]
@@ -190,15 +186,13 @@ add_format(
190186
[".jpeg", ".jpg", ".JPG"],
191187
[idJpegTurbo],
192188
[idImageIO],
193-
[idQuartzImageIO, OSX],
194189
[idImageMagick],
195190
[idOpenCV]
196191
) # 0xe1
197192
add_format(
198193
format"BMP",
199194
UInt8[0x42,0x4d],
200195
".bmp",
201-
[idQuartzImageIO, OSX],
202196
[idImageMagick],
203197
[idOpenCV]
204198
)
@@ -389,7 +383,7 @@ function detecttiff(io)
389383
end
390384
# normal TIFF
391385
detect_noometiff(io) = detecttiff(io) && ((:name propertynames(io)) || !(endswith(io.name, ".ome.tif>") || endswith(io.name, ".ome.tiff>")))
392-
add_format(format"TIFF", detect_noometiff, [".tiff", ".tif"], [idImageIO], [idQuartzImageIO, OSX], [idImageMagick], [idOpenCV])
386+
add_format(format"TIFF", detect_noometiff, [".tiff", ".tif"], [idImageIO], [idImageMagick], [idOpenCV])
393387
# OME-TIFF
394388
detect_ometiff(io) = detecttiff(io) && (:name propertynames(io)) && (endswith(io.name, ".ome.tif>") || endswith(io.name, ".ome.tiff>"))
395389
add_format(format"OMETIFF", detect_ometiff, [".tif", ".tiff"], [:OMETIFF => UUID("2d0ec36b-e807-5756-994b-45af29551fcf")])
@@ -482,9 +476,9 @@ add_format(format"GZIP", detect_gzip, ".gz", [:Libz => UUID("2ec943e9-cfe8-584d-
482476

483477

484478
# Astro Data
485-
# FITS files are often gziped and given the extension ".fits.gz". We want to load those directly and not dispatch to Libz
486-
function detect_fits(io)
487-
# FITS files can have
479+
# FITS files are often gziped and given the extension ".fits.gz". We want to load those directly and not dispatch to Libz
480+
function detect_fits(io)
481+
# FITS files can have
488482
if name_matches_compressed_fits(io)
489483
return true
490484
end

0 commit comments

Comments
 (0)