diff options
| author | yo mama <pepper@scannerjammer.com> | 2016-09-26 09:11:22 -0700 |
|---|---|---|
| committer | yo mama <pepper@scannerjammer.com> | 2016-09-26 09:11:22 -0700 |
| commit | b3ea660cc8be363d0f8cc5a514efe020adbc1573 (patch) | |
| tree | 310662d37dd9a249b96dabc894e4440855b5aab7 | |
| parent | 81f397d177aa83d1ad79dddfd965675a1c27985b (diff) | |
ok
| -rw-r--r-- | photoblaster/config.py | 2 | ||||
| -rwxr-xr-x | photoblaster/modules/pbgenerate/__init__.py | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/photoblaster/config.py b/photoblaster/config.py index e7fda7c..6e11f9d 100644 --- a/photoblaster/config.py +++ b/photoblaster/config.py @@ -6,7 +6,7 @@ if os.environ.get("PB_PRODUCTION"): MAX_SIZE = 1024 * 1024 * 1.2 * 1.5 if LOCAL: - MAX_SIZE = 1024 * 1024 * 1.2 * 7 + MAX_SIZE = 1024 * 1024 * 1.2 * 12 # PATHS BIN_CONVERT = "/usr/bin/convert" diff --git a/photoblaster/modules/pbgenerate/__init__.py b/photoblaster/modules/pbgenerate/__init__.py index a549da2..f5fe93c 100755 --- a/photoblaster/modules/pbgenerate/__init__.py +++ b/photoblaster/modules/pbgenerate/__init__.py @@ -12,7 +12,7 @@ _GRAVITY_DEFAULT = "Center" _COMPOSE_PARAMS = [ "Over", "ATop", "Dst_Over", "Dst_In", "Dst_Out", "Multiply", "Screen", "Divide", "Plus", "Difference", "Exclusion", "Pin_Light", - "Lighten", "Darken", "Overlay", "Hard_Light", "Soft_Light", + "Lighten", "Darken", "Overlay", "Hard_Light", "Soft_Light", "Vivid_Light", "Linear_Dodge", "Linear_Burn", "Color_Dodge", "Color_Burn", "Pegtop_Light" ] _DISPOSE_PARAMS = ["None", "Previous", "Background"] @@ -152,7 +152,6 @@ class PbGenerate(ModuleBase): sys.stderr.write("\n") self._call_cmd(cmd) - def _convert(self): """Imagemagick convert command""" cmd = [BIN_CONVERT, self.params.url.get_file().get_filepath()] @@ -219,7 +218,6 @@ class PbGenerate(ModuleBase): ] self._call_cmd(cmd) - def create(self): self._convert() if self.params.format == "jpg": |