Skip to content

Commit

Permalink
Remove mention of --output
Browse files Browse the repository at this point in the history
  • Loading branch information
Sean Gillies committed Aug 27, 2016
1 parent 81ab4d1 commit b72bfed
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 4 deletions.
2 changes: 1 addition & 1 deletion rasterio/rio/helpers.py
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ def resolve_inout(input=None, output=None, files=None, force_overwrite=False):
resolved_output):
raise FileOverwriteError(
"file exists and won't be overwritten without use of the "
"`--force-overwrite` or `--output` options.")
"`--force-overwrite` option.")
resolved_inputs = (
[input] if input else [] +
list(files[:-1 if not output else None]) if files else [])
Expand Down
7 changes: 4 additions & 3 deletions rasterio/warp.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@
from rasterio._warp import (
_transform_geom, _reproject, _calculate_default_transform)
from rasterio.enums import Resampling
from rasterio.env import ensure_env
from rasterio.env import ensure_env, Env
from rasterio.transform import guard_transform


@ensure_env
def transform(src_crs, dst_crs, xs, ys, zs=None):
def transform(src_crs, dst_crs, xs, ys, zs=None, **options):
"""Transform vectors from source to target coordinate reference system.
Transform vectors of x, y and optionally z from source
Expand All @@ -43,7 +43,8 @@ def transform(src_crs, dst_crs, xs, ys, zs=None):
Tuple of x, y, and optionally z vectors, transformed into the target
coordinate reference system.
"""
return _transform(src_crs, dst_crs, xs, ys, zs)
with Env(**options):
return _transform(src_crs, dst_crs, xs, ys, zs)


@ensure_env
Expand Down

0 comments on commit b72bfed

Please sign in to comment.