florent/triskele
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove libtiff

Browse Source
This commit is contained in:
Florent Guiotte 2018-03-23 18:31:11 +01:00
parent a18b669437
commit 94e01e240d
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
python/triskele/Triskele.py
View File

@ -12,7 +12,7 @@ import os
import subprocess import subprocess
from pathlib import Path from pathlib import Path
import numpy as np import numpy as np
import libtiff from .CreaTIFF import read, write
class Triskele: class Triskele:
def __init__(self, raster, dtype=np.uint8, cache_dir='/tmp', verbose=True): def __init__(self, raster, dtype=np.uint8, cache_dir='/tmp', verbose=True):
@ -43,7 +43,7 @@ class Triskele:
return self._read_outfile() return self._read_outfile()
def _read_outfile(self): def _read_outfile(self):
return libtiff.TIFF.open(self.outfile).read_image() return read(self.outfile)
def _write_infile(self, raster, dtype): def _write_infile(self, raster, dtype):
## Scale to new dtype ## Scale to new dtype
@ -54,8 +54,7 @@ class Triskele:
raster *= (rep.max - rep.min) / (raster.max() - raster.min()) raster *= (rep.max - rep.min) / (raster.max() - raster.min())
raster = raster.astype(dtype) raster = raster.astype(dtype)
tif = libtiff.TIFFimage(raster, description='TRISKELE Python wrapper') write(self.infile, raster)
tif.write_file(self.infile, verbose=self.verbose, compression=None) # 'lzw'
def _setup(self, tree, area, standard_deviation, moment_of_inertia): def _setup(self, tree, area, standard_deviation, moment_of_inertia):
self.process = [self.triskele_bin, self.process = [self.triskele_bin,