Remove libtiff

This commit is contained in:
Florent Guiotte 2018-03-23 18:31:11 +01:00
parent a18b669437
commit 94e01e240d

View File

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