mirror of
https://github.com/oDinZu/callirhoe.git
synced 2025-02-23 00:02:16 -05:00
LUV colorspace instead of Gray
git-svn-id: https://callirhoe.googlecode.com/svn/trunk@150 81c8bb96-aa45-f2e2-0eef-c4fa4a15c6df
This commit is contained in:
parent
9190eb7789
commit
5a2e544f56
12
calmagick.py
12
calmagick.py
@ -42,13 +42,11 @@ from lib.geom import rect_rel_scale
|
|||||||
# move to python 3
|
# move to python 3
|
||||||
|
|
||||||
# MAYBE-TODO
|
# MAYBE-TODO
|
||||||
|
# imagemagick prog wrapper / entropy launch routine (instead of _entropy args)
|
||||||
# convert input to ImageMagick native format for faster access
|
# convert input to ImageMagick native format for faster access
|
||||||
# report error on parse-float (like itoa())
|
# report error on parse-float (like itoa())
|
||||||
# abort --range only on KeyboardInterrupt?
|
# abort --range only on KeyboardInterrupt?
|
||||||
|
|
||||||
#class Abort(Exception):
|
|
||||||
# pass
|
|
||||||
|
|
||||||
def run_callirhoe(style, w, h, args, outfile):
|
def run_callirhoe(style, w, h, args, outfile):
|
||||||
return subprocess.Popen(['callirhoe', '-s', style, '--paper=-%d:-%d' % (w,h)] + args + [outfile])
|
return subprocess.Popen(['callirhoe', '-s', style, '--paper=-%d:-%d' % (w,h)] + args + [outfile])
|
||||||
|
|
||||||
@ -298,8 +296,8 @@ def _get_image_luminance(img, args, geometry = None):
|
|||||||
|
|
||||||
#_entropy_args = ["-scale 512> -colorspace Gray -define convolve:scale=! -define morphology:compose=Lighten -morphology Convolve Sobel:> -normalize -unsharp 0x3 -scale",
|
#_entropy_args = ["-scale 512> -colorspace Gray -define convolve:scale=! -define morphology:compose=Lighten -morphology Convolve Sobel:> -normalize -unsharp 0x3 -scale",
|
||||||
# "-scale 512> -colorspace Gray ( +clone -blur 0x2 ) +swap -compose minus -composite -unsharp 0x3 -level 0,50% -scale"]
|
# "-scale 512> -colorspace Gray ( +clone -blur 0x2 ) +swap -compose minus -composite -unsharp 0x3 -level 0,50% -scale"]
|
||||||
_entropy_args = ["-scale 512> -colorspace Gray -define convolve:scale=! -define morphology:compose=Lighten -morphology Convolve Sobel:> -contrast-stretch 0x3% -scale",
|
_entropy_args = ["-scale 512> -colorspace LUV -channel R -define convolve:scale=! -define morphology:compose=Lighten -morphology Convolve Sobel:> -contrast-stretch 0x3% -scale",
|
||||||
"-scale 512> -colorspace Gray ( +clone -blur 0x2 ) +swap -compose minus -composite -contrast-stretch 0x7% -scale"]
|
"-scale 512> -colorspace LUV -channel R ( +clone -blur 0x2 ) +swap -compose minus -composite -contrast-stretch 0x7% -scale"]
|
||||||
|
|
||||||
def _entropy_placement(img, size, args, options, r):
|
def _entropy_placement(img, size, args, options, r):
|
||||||
w,h = size
|
w,h = size
|
||||||
@ -309,7 +307,7 @@ def _entropy_placement(img, size, args, options, r):
|
|||||||
print "Calculating image entropy..."
|
print "Calculating image entropy..."
|
||||||
qresize = '%dx%d!' % ((options.quantum,)*2)
|
qresize = '%dx%d!' % ((options.quantum,)*2)
|
||||||
pnm_entropy = PNMImage(subprocess.check_output(['convert', img] + args + _entropy_args[options.alt].split() +
|
pnm_entropy = PNMImage(subprocess.check_output(['convert', img] + args + _entropy_args[options.alt].split() +
|
||||||
[qresize] + (['-negate'] if options.placement == 'max' else []) + ['-compress', 'None', 'pnm:-']).splitlines())
|
[qresize] + (['-negate'] if options.placement == 'max' else []) + ['-separate', '-compress', 'None', 'pnm:-']).splitlines())
|
||||||
|
|
||||||
# find optimal fit
|
# find optimal fit
|
||||||
if options.verbose: print "Fitting... ",
|
if options.verbose: print "Fitting... ",
|
||||||
@ -375,7 +373,7 @@ def compose_calendar(img, outimg, options, callirhoe_args, magick_args, stats=No
|
|||||||
elif options.test == 'quant':
|
elif options.test == 'quant':
|
||||||
subprocess.call(['convert', img] + magick_args[0] + _entropy_args[options.alt].split() +
|
subprocess.call(['convert', img] + magick_args[0] + _entropy_args[options.alt].split() +
|
||||||
[qresize, '-scale', '%dx%d!' % (w,h), '-region', '%dx%d+%d+%d' % geometry,
|
[qresize, '-scale', '%dx%d!' % (w,h), '-region', '%dx%d+%d+%d' % geometry,
|
||||||
'-negate', outimg])
|
'-negate', '-separate', outimg])
|
||||||
elif options.test == 'print':
|
elif options.test == 'print':
|
||||||
print ' '.join(map(str,geometry))
|
print ' '.join(map(str,geometry))
|
||||||
elif options.test == 'crop':
|
elif options.test == 'crop':
|
||||||
|
Loading…
x
Reference in New Issue
Block a user