add smartcrop
This commit is contained in:
John Cupitt
parent
1221309c62
commit
d40773515c
|
|
@ -34,6 +34,7 @@
|
|||
- vips_region_shrink() knows about alpha, helps dzsave and tiffsave
|
||||
- use expat, not libxml, for XML load ... removes a required dependency, since
|
||||
we get expat as part of glib
|
||||
- add vips_smartcrop(), based on sharp's smartcropper
|
||||
|
||||
8/12/16 started 8.4.5
|
||||
- allow libgsf-1.14.26 to help centos, thanks tdiprima
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
// headers for vips operations
|
||||
// Wed 2 Nov 13:48:15 GMT 2016
|
||||
// Wed 1 Mar 15:40:22 GMT 2017
|
||||
// this file is generated automatically, do not edit!
|
||||
|
||||
static void system( char * cmd_format , VOption *options = 0 );
|
||||
|
|
@ -51,6 +51,7 @@ VImage insert( VImage sub , int x , int y , VOption *options = 0 );
|
|||
VImage join( VImage in2 , VipsDirection direction , VOption *options = 0 );
|
||||
static VImage arrayjoin( std::vector<VImage> in , VOption *options = 0 );
|
||||
VImage extract_area( int left , int top , int width , int height , VOption *options = 0 );
|
||||
VImage smartcrop( int width , int height , VOption *options = 0 );
|
||||
VImage extract_band( int band , VOption *options = 0 );
|
||||
static VImage bandjoin( std::vector<VImage> in , VOption *options = 0 );
|
||||
VImage bandjoin_const( std::vector<double> c , VOption *options = 0 );
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
// bodies for vips operations
|
||||
// Wed 2 Nov 13:48:04 GMT 2016
|
||||
// Wed 1 Mar 15:40:06 GMT 2017
|
||||
// this file is generated automatically, do not edit!
|
||||
|
||||
void VImage::system( char * cmd_format , VOption *options )
|
||||
|
|
@ -633,6 +633,20 @@ VImage VImage::extract_area( int left , int top , int width , int height , VOpti
|
|||
return( out );
|
||||
}
|
||||
|
||||
VImage VImage::smartcrop( int width , int height , VOption *options )
|
||||
{
|
||||
VImage out;
|
||||
|
||||
call( "smartcrop" ,
|
||||
(options ? options : VImage::option()) ->
|
||||
set( "input", *this ) ->
|
||||
set( "out", &out ) ->
|
||||
set( "width", width ) ->
|
||||
set( "height", height ) );
|
||||
|
||||
return( out );
|
||||
}
|
||||
|
||||
VImage VImage::extract_band( int band , VOption *options )
|
||||
{
|
||||
VImage out;
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
noinst_LTLIBRARIES = libconversion.la
|
||||
|
||||
libconversion_la_SOURCES = \
|
||||
smartcrop.c \
|
||||
conversion.c \
|
||||
pconversion.h \
|
||||
tilecache.c \
|
||||
|
|
|
|||
|
|
@ -97,6 +97,18 @@
|
|||
* See also: vips_rot().
|
||||
*/
|
||||
|
||||
/**
|
||||
* VipsInteresting:
|
||||
* @VIPS_INTERESTING_ENTROPY: use an entropy measure
|
||||
* @VIPS_INTERESTING_ATTENTION: look for features likely to draw human attention
|
||||
*
|
||||
* Pick the algorithm vips uses to decide image "interestingness". This is used
|
||||
* by vips_smartcrop(), for example, to decide what parts of the image to
|
||||
* keep.
|
||||
*
|
||||
* See also: vips_smartcrop().
|
||||
*/
|
||||
|
||||
/**
|
||||
* VipsAngle45:
|
||||
* @VIPS_ANGLE45_D0: no rotate
|
||||
|
|
@ -226,6 +238,7 @@ vips_conversion_operation_init( void )
|
|||
extern GType vips_arrayjoin_get_type( void );
|
||||
extern GType vips_extract_area_get_type( void );
|
||||
extern GType vips_crop_get_type( void );
|
||||
extern GType vips_smartcrop_get_type( void );
|
||||
extern GType vips_extract_band_get_type( void );
|
||||
extern GType vips_replicate_get_type( void );
|
||||
extern GType vips_cast_get_type( void );
|
||||
|
|
@ -272,6 +285,7 @@ vips_conversion_operation_init( void )
|
|||
vips_arrayjoin_get_type();
|
||||
vips_extract_area_get_type();
|
||||
vips_crop_get_type();
|
||||
vips_smartcrop_get_type();
|
||||
vips_extract_band_get_type();
|
||||
vips_replicate_get_type();
|
||||
vips_cast_get_type();
|
||||
|
|
|
|||
|
|
@ -243,7 +243,7 @@ vips_extract_area_init( VipsExtractArea *extract )
|
|||
*
|
||||
* Extract an area from an image. The area must fit within @in.
|
||||
*
|
||||
* See also: vips_extract_bands().
|
||||
* See also: vips_extract_bands(), vips_smartcrop().
|
||||
*
|
||||
* Returns: 0 on success, -1 on error.
|
||||
*/
|
||||
|
|
@ -302,7 +302,7 @@ vips_crop_get_type( void )
|
|||
*
|
||||
* A synonym for vips_extract_area().
|
||||
*
|
||||
* See also: vips_extract_bands().
|
||||
* See also: vips_extract_bands(), vips_smartcrop().
|
||||
*
|
||||
* Returns: 0 on success, -1 on error.
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -0,0 +1,360 @@
|
|||
/* crop an image down to a specified size by removing boring parts
|
||||
*
|
||||
* Copyright: 2017, J. Cupitt
|
||||
*
|
||||
* Adapted from sharp's smartcrop feature, with kind permission.
|
||||
*
|
||||
* 1/3/17
|
||||
* - first version, from sharp
|
||||
*/
|
||||
|
||||
/*
|
||||
|
||||
This file is part of VIPS.
|
||||
|
||||
VIPS is free software; you can redistribute it and/or modify
|
||||
it under the terms of the GNU Lesser General Public License as published by
|
||||
the Free Software Foundation; either version 2 of the License, or
|
||||
(at your option) any later version.
|
||||
|
||||
This program is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU Lesser General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU Lesser General Public License
|
||||
along with this program; if not, write to the Free Software
|
||||
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
|
||||
02110-1301 USA
|
||||
|
||||
*/
|
||||
|
||||
/*
|
||||
|
||||
These files are distributed with VIPS - http://www.vips.ecs.soton.ac.uk
|
||||
|
||||
*/
|
||||
|
||||
/*
|
||||
#define VIPS_DEBUG
|
||||
*/
|
||||
|
||||
#ifdef HAVE_CONFIG_H
|
||||
#include <config.h>
|
||||
#endif /*HAVE_CONFIG_H*/
|
||||
#include <vips/intl.h>
|
||||
|
||||
#include <stdio.h>
|
||||
#include <string.h>
|
||||
#include <stdlib.h>
|
||||
|
||||
#include <vips/vips.h>
|
||||
#include <vips/debug.h>
|
||||
|
||||
#include "pconversion.h"
|
||||
|
||||
#include "bandary.h"
|
||||
|
||||
typedef struct _VipsSmartcrop {
|
||||
VipsConversion parent_instance;
|
||||
|
||||
VipsImage *in;
|
||||
int width;
|
||||
int height;
|
||||
VipsInteresting interesting;
|
||||
|
||||
VipsImage *sobel;
|
||||
VipsImage *sobel90;
|
||||
|
||||
} VipsSmartcrop;
|
||||
|
||||
typedef VipsConversionClass VipsSmartcropClass;
|
||||
|
||||
G_DEFINE_TYPE( VipsSmartcrop, vips_smartcrop, VIPS_TYPE_CONVERSION );
|
||||
|
||||
static void
|
||||
vips_smartcrop_dispose( GObject *gobject )
|
||||
{
|
||||
VipsSmartcrop *smartcrop = (VipsSmartcrop *) gobject;
|
||||
|
||||
VIPS_UNREF( smartcrop->sobel );
|
||||
VIPS_UNREF( smartcrop->sobel90 );
|
||||
|
||||
G_OBJECT_CLASS( vips_smartcrop_parent_class )->dispose( gobject );
|
||||
}
|
||||
|
||||
static int
|
||||
vips_smartcrop_score( VipsSmartcrop *smartcrop, VipsImage *image, double *score )
|
||||
{
|
||||
VipsImage **t = (VipsImage **)
|
||||
vips_object_local_array( VIPS_OBJECT( smartcrop ), 20 );
|
||||
|
||||
/* ab ranges for skin colours. Trained with http://humanae.tumblr.com/
|
||||
*/
|
||||
double ab_low[2] = { 3.0, 4.0 };
|
||||
double ab_high[2] = { 22.0, 31.0 };
|
||||
|
||||
switch( smartcrop->interesting ) {
|
||||
case VIPS_INTERESTING_ENTROPY:
|
||||
if( vips_hist_find( image, &t[0], NULL ) ||
|
||||
vips_hist_entropy( t[0], score, NULL ) )
|
||||
return( -1 );
|
||||
break;
|
||||
|
||||
case VIPS_INTERESTING_ATTENTION:
|
||||
/* Convert to LAB and just use the first three bands.
|
||||
*/
|
||||
if( vips_colourspace( image, &t[0],
|
||||
VIPS_INTERPRETATION_LAB, NULL ) ||
|
||||
vips_extract_band( t[0], &t[1], 0, "n", 3, NULL ) )
|
||||
return( -1 );
|
||||
|
||||
/* Sobel edge-detect on L.
|
||||
*/
|
||||
if( vips_extract_band( t[1], &t[2], 0, NULL ) ||
|
||||
vips_conv( t[2], &t[3], smartcrop->sobel, NULL ) ||
|
||||
vips_conv( t[2], &t[4], smartcrop->sobel90, NULL ) ||
|
||||
vips_abs( t[3], &t[5], NULL ) ||
|
||||
vips_abs( t[4], &t[6], NULL ) ||
|
||||
vips_add( t[5], t[6], &t[7], NULL ))
|
||||
return( -1 );
|
||||
|
||||
/* Look for skin colours, plus L > 15.
|
||||
*/
|
||||
if( vips_extract_band( t[1], &t[8], 1, "n", 2, NULL ) ||
|
||||
vips_moreeq_const( t[8], &t[9], ab_low, 2, NULL ) ||
|
||||
vips_lesseq_const( t[8], &t[10], ab_high, 2, NULL ) ||
|
||||
vips_andimage( t[9], t[10], &t[11], NULL ) ||
|
||||
vips_bandand( t[11], &t[12], NULL ) ||
|
||||
vips_moreeq_const1( t[2], &t[18], 15.0, NULL ) ||
|
||||
vips_andimage( t[12], t[18], &t[19], NULL ) )
|
||||
return( -1 );
|
||||
|
||||
/* Look for saturated areas.
|
||||
*/
|
||||
if( vips_colourspace( t[1], &t[13],
|
||||
VIPS_INTERPRETATION_LCH, NULL ) ||
|
||||
vips_extract_band( t[13], &t[14], 1, NULL ) ||
|
||||
vips_more_const1( t[14], &t[15], 60.0, NULL ) )
|
||||
return( -1 );
|
||||
|
||||
/* Sum and find max.
|
||||
*/
|
||||
if( vips_add( t[7], t[19], &t[16], NULL ) ||
|
||||
vips_add( t[16], t[15], &t[17], NULL ) ||
|
||||
vips_avg( t[17], score, NULL ) )
|
||||
return( -1 );
|
||||
break;
|
||||
|
||||
default:
|
||||
g_assert_not_reached();
|
||||
break;
|
||||
}
|
||||
|
||||
VIPS_DEBUG_MSG( "vips_smartcrop_score: %g\n", *score );
|
||||
|
||||
return( 0 );
|
||||
}
|
||||
|
||||
static int
|
||||
vips_smartcrop_build( VipsObject *object )
|
||||
{
|
||||
VipsObjectClass *class = VIPS_OBJECT_GET_CLASS( object );
|
||||
VipsConversion *conversion = VIPS_CONVERSION( object );
|
||||
VipsSmartcrop *smartcrop = (VipsSmartcrop *) object;
|
||||
VipsImage **t = (VipsImage **) vips_object_local_array( object, 2 );
|
||||
|
||||
VipsImage *in;
|
||||
int max_slice_size;
|
||||
int left;
|
||||
int top;
|
||||
int width;
|
||||
int height;
|
||||
|
||||
if( VIPS_OBJECT_CLASS( vips_smartcrop_parent_class )->
|
||||
build( object ) )
|
||||
return( -1 );
|
||||
|
||||
if( smartcrop->width > smartcrop->in->Xsize ||
|
||||
smartcrop->height > smartcrop->in->Ysize ||
|
||||
smartcrop->width <= 0 || smartcrop->height <= 0 ) {
|
||||
vips_error( class->nickname, "%s", _( "bad extract area" ) );
|
||||
return( -1 );
|
||||
}
|
||||
|
||||
if( !(smartcrop->sobel = vips_image_new_matrixv( 3, 3,
|
||||
-1.0, 0.0, 1.0, -2.0, 0.0, 2.0, -1.0, 0.0, 1.0 )) ||
|
||||
vips_rot( smartcrop->sobel, &smartcrop->sobel90,
|
||||
VIPS_ANGLE_D90, NULL ) )
|
||||
return( -1 );
|
||||
|
||||
in = smartcrop->in;
|
||||
left = 0;
|
||||
top = 0;
|
||||
width = in->Xsize;
|
||||
height = in->Ysize;
|
||||
|
||||
/* How much do we trim by each iteration? Aim for 8 steps in the axis
|
||||
* that needs trimming most.
|
||||
*/
|
||||
max_slice_size = VIPS_MAX(
|
||||
ceil( (width - smartcrop->width) / 8.0 ),
|
||||
ceil( (height - smartcrop->height) / 8.0 ) );
|
||||
|
||||
/* Repeatedly take a slice off width and height until we
|
||||
* reach the target.
|
||||
*/
|
||||
while( width > smartcrop->width ||
|
||||
height > smartcrop->height ) {
|
||||
const int slice_width =
|
||||
VIPS_MIN( width - smartcrop->width, max_slice_size );
|
||||
const int slice_height =
|
||||
VIPS_MIN( height - smartcrop->height, max_slice_size );
|
||||
|
||||
if( slice_width > 0 ) {
|
||||
VipsImage **t = (VipsImage **)
|
||||
vips_object_local_array( object, 4 );
|
||||
|
||||
double left_score;
|
||||
double right_score;
|
||||
|
||||
if( vips_extract_area( in, &t[0],
|
||||
left, top, slice_width, height, NULL ) ||
|
||||
vips_smartcrop_score( smartcrop, t[0],
|
||||
&left_score ) )
|
||||
return( -1 );
|
||||
|
||||
if( vips_extract_area( in, &t[1],
|
||||
left + width - slice_width, top,
|
||||
slice_width, height, NULL ) ||
|
||||
vips_smartcrop_score( smartcrop, t[1],
|
||||
&right_score ) )
|
||||
return( -1 );
|
||||
|
||||
width -= slice_width;
|
||||
if( left_score < right_score )
|
||||
left += slice_width;
|
||||
}
|
||||
|
||||
if( slice_height > 0 ) {
|
||||
VipsImage **t = (VipsImage **)
|
||||
vips_object_local_array( object, 4 );
|
||||
|
||||
double top_score;
|
||||
double bottom_score;
|
||||
|
||||
if( vips_extract_area( in, &t[0],
|
||||
left, top, width, slice_height, NULL ) ||
|
||||
vips_smartcrop_score( smartcrop, t[0],
|
||||
&top_score ) )
|
||||
return( -1 );
|
||||
|
||||
if( vips_extract_area( in, &t[1],
|
||||
left, top + height - slice_height,
|
||||
width, slice_height, NULL ) ||
|
||||
vips_smartcrop_score( smartcrop, t[1],
|
||||
&bottom_score ) )
|
||||
return( -1 );
|
||||
|
||||
height -= slice_height;
|
||||
if( top_score < bottom_score )
|
||||
top += slice_height;
|
||||
}
|
||||
}
|
||||
|
||||
/* And our output is the final crop.
|
||||
*/
|
||||
if( vips_extract_area( in, &t[0], left, top, width, height, NULL ) ||
|
||||
vips_image_write( t[0], conversion->out ) )
|
||||
return( -1 );
|
||||
|
||||
return( 0 );
|
||||
}
|
||||
|
||||
static void
|
||||
vips_smartcrop_class_init( VipsSmartcropClass *class )
|
||||
{
|
||||
GObjectClass *gobject_class = G_OBJECT_CLASS( class );
|
||||
VipsObjectClass *vobject_class = VIPS_OBJECT_CLASS( class );
|
||||
|
||||
VIPS_DEBUG_MSG( "vips_smartcrop_class_init\n" );
|
||||
|
||||
gobject_class->dispose = vips_smartcrop_dispose;
|
||||
gobject_class->set_property = vips_object_set_property;
|
||||
gobject_class->get_property = vips_object_get_property;
|
||||
|
||||
vobject_class->nickname = "smartcrop";
|
||||
vobject_class->description = _( "extract an area from an image" );
|
||||
vobject_class->build = vips_smartcrop_build;
|
||||
|
||||
VIPS_ARG_IMAGE( class, "input", 0,
|
||||
_( "Input" ),
|
||||
_( "Input image" ),
|
||||
VIPS_ARGUMENT_REQUIRED_INPUT,
|
||||
G_STRUCT_OFFSET( VipsSmartcrop, in ) );
|
||||
|
||||
VIPS_ARG_INT( class, "width", 4,
|
||||
_( "Width" ),
|
||||
_( "Width of extract area" ),
|
||||
VIPS_ARGUMENT_REQUIRED_INPUT,
|
||||
G_STRUCT_OFFSET( VipsSmartcrop, width ),
|
||||
1, VIPS_MAX_COORD, 1 );
|
||||
|
||||
VIPS_ARG_INT( class, "height", 5,
|
||||
_( "Height" ),
|
||||
_( "Height of extract area" ),
|
||||
VIPS_ARGUMENT_REQUIRED_INPUT,
|
||||
G_STRUCT_OFFSET( VipsSmartcrop, height ),
|
||||
1, VIPS_MAX_COORD, 1 );
|
||||
|
||||
VIPS_ARG_ENUM( class, "interesting", 6,
|
||||
_( "Interesting" ),
|
||||
_( "How to measure interestingness" ),
|
||||
VIPS_ARGUMENT_OPTIONAL_INPUT,
|
||||
G_STRUCT_OFFSET( VipsSmartcrop, interesting ),
|
||||
VIPS_TYPE_INTERESTING, VIPS_INTERESTING_ATTENTION );
|
||||
|
||||
}
|
||||
|
||||
static void
|
||||
vips_smartcrop_init( VipsSmartcrop *smartcrop )
|
||||
{
|
||||
smartcrop->interesting = VIPS_INTERESTING_ATTENTION;
|
||||
}
|
||||
|
||||
/**
|
||||
* vips_smartcrop:
|
||||
* @in: input image
|
||||
* @out: output image
|
||||
* @width: width of area to extract
|
||||
* @height: height of area to extract
|
||||
* @...: %NULL-terminated list of optional named arguments
|
||||
*
|
||||
* Optional arguments:
|
||||
*
|
||||
* * @interesting: #VipsInteresting to use to find interesting areas (default: #VIPS_INTERESTING_ATTENTION)
|
||||
*
|
||||
* Crop an image down to a specified width and height by removing boring parts.
|
||||
*
|
||||
* Use @interesting to pick the method vips uses to decide which bits of the
|
||||
* image should be kept.
|
||||
*
|
||||
* You can test xoffset / yoffset on @out to find the location of the crop
|
||||
* within the input image.
|
||||
*
|
||||
* See also: vips_extract_area().
|
||||
*
|
||||
* Returns: 0 on success, -1 on error.
|
||||
*/
|
||||
int
|
||||
vips_smartcrop( VipsImage *in, VipsImage **out, int width, int height, ... )
|
||||
{
|
||||
va_list ap;
|
||||
int result;
|
||||
|
||||
va_start( ap, height );
|
||||
result = vips_call_split( "smartcrop", ap, in, out, width, height );
|
||||
va_end( ap );
|
||||
|
||||
return( result );
|
||||
}
|
||||
|
|
@ -81,6 +81,12 @@ typedef enum {
|
|||
VIPS_ANGLE45_LAST
|
||||
} VipsAngle45;
|
||||
|
||||
typedef enum {
|
||||
VIPS_INTERESTING_ENTROPY,
|
||||
VIPS_INTERESTING_ATTENTION,
|
||||
VIPS_INTERESTING_LAST
|
||||
} VipsInteresting;
|
||||
|
||||
int vips_copy( VipsImage *in, VipsImage **out, ... )
|
||||
__attribute__((sentinel));
|
||||
int vips_tilecache( VipsImage *in, VipsImage **out, ... )
|
||||
|
|
@ -113,6 +119,8 @@ int vips_extract_area( VipsImage *in, VipsImage **out,
|
|||
int vips_crop( VipsImage *in, VipsImage **out,
|
||||
int left, int top, int width, int height, ... )
|
||||
__attribute__((sentinel));
|
||||
int vips_smartcrop( VipsImage *in, VipsImage **out, int width, int height, ... )
|
||||
__attribute__((sentinel));
|
||||
int vips_extract_band( VipsImage *in, VipsImage **out, int band, ... )
|
||||
__attribute__((sentinel));
|
||||
int vips_replicate( VipsImage *in, VipsImage **out, int across, int down, ... )
|
||||
|
|
|
|||
|
|
@ -60,6 +60,8 @@ GType vips_angle_get_type (void) G_GNUC_CONST;
|
|||
#define VIPS_TYPE_ANGLE (vips_angle_get_type())
|
||||
GType vips_angle45_get_type (void) G_GNUC_CONST;
|
||||
#define VIPS_TYPE_ANGLE45 (vips_angle45_get_type())
|
||||
GType vips_interesting_get_type (void) G_GNUC_CONST;
|
||||
#define VIPS_TYPE_INTERESTING (vips_interesting_get_type())
|
||||
/* enumerations from "../../../libvips/include/vips/util.h" */
|
||||
GType vips_token_get_type (void) G_GNUC_CONST;
|
||||
#define VIPS_TYPE_TOKEN (vips_token_get_type())
|
||||
|
|
|
|||
|
|
@ -350,6 +350,24 @@ vips_angle45_get_type( void )
|
|||
|
||||
return( etype );
|
||||
}
|
||||
GType
|
||||
vips_interesting_get_type( void )
|
||||
{
|
||||
static GType etype = 0;
|
||||
|
||||
if( etype == 0 ) {
|
||||
static const GEnumValue values[] = {
|
||||
{VIPS_INTERESTING_ENTROPY, "VIPS_INTERESTING_ENTROPY", "entropy"},
|
||||
{VIPS_INTERESTING_ATTENTION, "VIPS_INTERESTING_ATTENTION", "attention"},
|
||||
{VIPS_INTERESTING_LAST, "VIPS_INTERESTING_LAST", "last"},
|
||||
{0, NULL, NULL}
|
||||
};
|
||||
|
||||
etype = g_enum_register_static( "VipsInteresting", values );
|
||||
}
|
||||
|
||||
return( etype );
|
||||
}
|
||||
/* enumerations from "../../libvips/include/vips/arithmetic.h" */
|
||||
GType
|
||||
vips_operation_math_get_type( void )
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
#!/usr/bin/python
|
||||
# vim: set fileencoding=utf-8 :
|
||||
|
||||
from __future__ import division
|
||||
import unittest
|
||||
|
|
@ -144,6 +145,8 @@ class TestConversion(unittest.TestCase):
|
|||
self.colour = im * [1, 2, 3] + [2, 3, 4]
|
||||
self.mono = self.colour[1]
|
||||
self.all_images = [self.mono, self.colour]
|
||||
self.jpeg_file = "images/йцук.jpg"
|
||||
self.image = Vips.Image.jpegload(self.jpeg_file)
|
||||
|
||||
def test_band_and(self):
|
||||
def band_and(x):
|
||||
|
|
@ -370,6 +373,11 @@ class TestConversion(unittest.TestCase):
|
|||
pixel = sub(5, 5)
|
||||
self.assertAlmostEqualObjects(pixel, [2, 3, 4])
|
||||
|
||||
def test_smartcrop(self):
|
||||
test = self.image.smartcrop(100, 100)
|
||||
self.assertEqual(test.width, 100)
|
||||
self.assertEqual(test.height, 100)
|
||||
|
||||
def test_falsecolour(self):
|
||||
for fmt in all_formats:
|
||||
test = self.colour.cast(fmt)
|
||||
|
|
|
|||
Loading…
Reference in New Issue