Skip to content
Merged

sync #266

Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion Libs/swig/dataset.py
Original file line number Diff line number Diff line change
Expand Up @@ -384,7 +384,7 @@ def pick_quality_from_size(size, dtype_str, q_max, base_elems_q1=2):
# Assert(quality<=0)
temp_qual=quality
bit_length=len(self.getBitmask().toString())-1
if temp_qual!=0:
if size!=None:
quality = pick_quality_from_size(size, self.getField().dtype.toString(), bit_length)
temp_qual=quality
if temp_qual<=0:
Expand Down Expand Up @@ -880,3 +880,4 @@ def read(self, logic_box=None, x=None, y=None, z=None, u=None,v=None, field_name
elif type(z) is not tuple:
data = data[0,:,:]
return data

10 changes: 5 additions & 5 deletions Libs/swig/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
pass

# the following line can be replaced automatically by `NewTag` so be careful not to change its format
PROJECT_VERSION="2.2.142"
PROJECT_VERSION="2.2.146"

# I can override by env variable
if "PROJECT_VERSION" in os.environ:
Expand All @@ -33,8 +33,8 @@ def DoSetup():
shutil.rmtree('./dist', ignore_errors=True)
shutil.rmtree('./.git', ignore_errors=True)
shutil.rmtree('./tmp', ignore_errors=True)
shutil.rmtree('./{}.egg-info'.format("OpenVisus"), ignore_errors=True)
shutil.rmtree('./{}.egg-info'.format("OpenVisusNoGui"), ignore_errors=True)
shutil.rmtree('./openvisus.egg-info'.format(""), ignore_errors=True)
shutil.rmtree('./openvisusnogui.egg-info'.format(""), ignore_errors=True)
files=[]
for dirpath, __dirnames__, filenames in os.walk("."):
for it in filenames:
Expand All @@ -46,11 +46,11 @@ def DoSetup():

# special name for no-gui
# see https://github.com/opencv/opencv-python/blob/master/setup.py
package_name="OpenVisus"
package_name="openvisus"

# special case no gui
if not os.path.isfile(os.path.join(this_dir,"QT_VERSION")):
package_name="OpenVisusNoGui"
package_name="openvisusnogui"

# dependency on numpy removed otherwise I have problems with conda which downgrade numpy for unknown reasons
setuptools.setup(
Expand Down
Loading