large-image-converter 1.28.1.dev4__tar.gz → 1.28.1.dev8__tar.gz

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (15) hide show
  1. {large-image-converter-1.28.1.dev4 → large-image-converter-1.28.1.dev8}/PKG-INFO +1 -1
  2. {large-image-converter-1.28.1.dev4 → large-image-converter-1.28.1.dev8}/large_image_converter/__init__.py +14 -7
  3. {large-image-converter-1.28.1.dev4 → large-image-converter-1.28.1.dev8}/large_image_converter.egg-info/PKG-INFO +1 -1
  4. {large-image-converter-1.28.1.dev4 → large-image-converter-1.28.1.dev8}/large_image_converter.egg-info/requires.txt +3 -3
  5. {large-image-converter-1.28.1.dev4 → large-image-converter-1.28.1.dev8}/LICENSE +0 -0
  6. {large-image-converter-1.28.1.dev4 → large-image-converter-1.28.1.dev8}/README.rst +0 -0
  7. {large-image-converter-1.28.1.dev4 → large-image-converter-1.28.1.dev8}/large_image_converter/__main__.py +0 -0
  8. {large-image-converter-1.28.1.dev4 → large-image-converter-1.28.1.dev8}/large_image_converter/format_aperio.py +0 -0
  9. {large-image-converter-1.28.1.dev4 → large-image-converter-1.28.1.dev8}/large_image_converter.egg-info/SOURCES.txt +0 -0
  10. {large-image-converter-1.28.1.dev4 → large-image-converter-1.28.1.dev8}/large_image_converter.egg-info/dependency_links.txt +0 -0
  11. {large-image-converter-1.28.1.dev4 → large-image-converter-1.28.1.dev8}/large_image_converter.egg-info/entry_points.txt +0 -0
  12. {large-image-converter-1.28.1.dev4 → large-image-converter-1.28.1.dev8}/large_image_converter.egg-info/top_level.txt +0 -0
  13. {large-image-converter-1.28.1.dev4 → large-image-converter-1.28.1.dev8}/pyproject.toml +0 -0
  14. {large-image-converter-1.28.1.dev4 → large-image-converter-1.28.1.dev8}/setup.cfg +0 -0
  15. {large-image-converter-1.28.1.dev4 → large-image-converter-1.28.1.dev8}/setup.py +0 -0
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.1
2
2
  Name: large-image-converter
3
- Version: 1.28.1.dev4
3
+ Version: 1.28.1.dev8
4
4
  Summary: Converter for Large Image.
5
5
  Author: Kitware Inc
6
6
  Author-email: kitware@kitware.com
@@ -18,7 +18,9 @@ import psutil
18
18
  import tifftools
19
19
 
20
20
  import large_image
21
- from large_image.tilesource.utilities import _gdalParameters, _vipsCast, _vipsParameters
21
+ from large_image.tilesource.utilities import (_gdalParameters,
22
+ _newFromFileLock, _vipsCast,
23
+ _vipsParameters)
22
24
 
23
25
  from . import format_aperio
24
26
 
@@ -77,7 +79,7 @@ def _data_from_large_image(path, outputPath, **kwargs):
77
79
  _import_pyvips()
78
80
  if not path.startswith('large_image://test'):
79
81
  try:
80
- ts = large_image.open(path)
82
+ ts = large_image.open(path, noCache=True)
81
83
  except Exception:
82
84
  return
83
85
  else:
@@ -164,7 +166,8 @@ def _generate_multiframe_tiff(inputPath, outputPath, tempPath, lidata, **kwargs)
164
166
  """
165
167
  _import_pyvips()
166
168
 
167
- image = pyvips.Image.new_from_file(inputPath)
169
+ with _newFromFileLock:
170
+ image = pyvips.Image.new_from_file(inputPath)
168
171
  width = image.width
169
172
  height = image.height
170
173
  pages = 1
@@ -180,7 +183,8 @@ def _generate_multiframe_tiff(inputPath, outputPath, tempPath, lidata, **kwargs)
180
183
  # Process each image separately to pyramidize it
181
184
  for page in range(pages):
182
185
  subInputPath = inputPath + '[page=%d]' % page
183
- subImage = pyvips.Image.new_from_file(subInputPath)
186
+ with _newFromFileLock:
187
+ subImage = pyvips.Image.new_from_file(subInputPath)
184
188
  imageSizes.append((subImage.width, subImage.height, subInputPath, page))
185
189
  if subImage.width != width or subImage.height != height:
186
190
  if subImage.width * subImage.height <= width * height:
@@ -274,7 +278,8 @@ def _convert_via_vips(inputPathOrBuffer, outputPath, tempPath, forTiled=True,
274
278
  image = pyvips.Image.new_from_buffer(inputPathOrBuffer, '')
275
279
  else:
276
280
  source = inputPathOrBuffer
277
- image = pyvips.Image.new_from_file(inputPathOrBuffer)
281
+ with _newFromFileLock:
282
+ image = pyvips.Image.new_from_file(inputPathOrBuffer)
278
283
  logger.info('Input: %s, Output: %s, Options: %r%s',
279
284
  source, outputPath, convertParams, status)
280
285
  image = image.autorot()
@@ -736,7 +741,8 @@ def _is_multiframe(path):
736
741
  """
737
742
  _import_pyvips()
738
743
  try:
739
- image = pyvips.Image.new_from_file(path)
744
+ with _newFromFileLock:
745
+ image = pyvips.Image.new_from_file(path)
740
746
  except Exception:
741
747
  try:
742
748
  open(path, 'rb').read(1)
@@ -971,7 +977,8 @@ def is_vips(path):
971
977
  """
972
978
  _import_pyvips()
973
979
  try:
974
- image = pyvips.Image.new_from_file(path)
980
+ with _newFromFileLock:
981
+ image = pyvips.Image.new_from_file(path)
975
982
  # image(0, 0) will throw if vips can't decode the image
976
983
  if not image.width or not image.height or image(0, 0) is None:
977
984
  return False
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.1
2
2
  Name: large-image-converter
3
- Version: 1.28.1.dev4
3
+ Version: 1.28.1.dev8
4
4
  Summary: Converter for Large Image.
5
5
  Author: Kitware Inc
6
6
  Author-email: kitware@kitware.com
@@ -1,4 +1,4 @@
1
- large-image-source-tiff>=1.28.1.dev4
1
+ large-image-source-tiff>=1.28.1.dev8
2
2
  numpy
3
3
  psutil
4
4
  pyvips
@@ -7,7 +7,7 @@ tifftools
7
7
  [all]
8
8
  glymur
9
9
  gdal
10
- large-image[sources]>=1.28.1.dev4
10
+ large-image[sources]>=1.28.1.dev8
11
11
  packaging
12
12
  scikit-image
13
13
 
@@ -18,7 +18,7 @@ gdal
18
18
  glymur
19
19
 
20
20
  [sources]
21
- large-image[sources]>=1.28.1.dev4
21
+ large-image[sources]>=1.28.1.dev8
22
22
 
23
23
  [stats]
24
24
  packaging