sergiotarxz/libvips
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

small fixes

Browse Source 
also bumped smalltile to 512x512 for tetsing aconv, this needs checking
This commit is contained in:
John Cupitt 2011-06-01 17:56:28 +01:00
parent 6819919f0c
commit 75e5804e3c
4 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -64,6 +64,7 @@
- added im_gauss_dmask_sep() - added im_gauss_dmask_sep()
- laplacian generator lost -ve lobes for large sigma - laplacian generator lost -ve lobes for large sigma
- added im_aconv(), approximate convolution - added im_aconv(), approximate convolution
- bumped smalltile to 512x512 for testing
30/11/10 started 7.24.0 30/11/10 started 7.24.0
- bump for new stable - bump for new stable

4
libvips/convolution/im_aconv.c
View File

@ -40,9 +40,9 @@
*/ */
/* /*
*/
#define DEBUG #define DEBUG
#define VIPS_DEBUG #define VIPS_DEBUG
*/
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
#include <config.h> #include <config.h>
@ -275,7 +275,6 @@ lines_new( IMAGE *in, IMAGE *out, DOUBLEMASK *mask, int n_layers )
lines->rounding = (lines->area + 1) / 2; lines->rounding = (lines->area + 1) / 2;
/* ASCII-art layer drawing. /* ASCII-art layer drawing.
*/
printf( "lines:\n" ); printf( "lines:\n" );
for( z = 0; z < lines->n_lines; z++ ) { for( z = 0; z < lines->n_lines; z++ ) {
printf( "%3d - %2d x ", z, lines->factor[z] ); printf( "%3d - %2d x ", z, lines->factor[z] );
@ -291,6 +290,7 @@ lines_new( IMAGE *in, IMAGE *out, DOUBLEMASK *mask, int n_layers )
} }
printf( "area = %d\n", lines->area ); printf( "area = %d\n", lines->area );
printf( "rounding = %d\n", lines->rounding ); printf( "rounding = %d\n", lines->rounding );
*/
return( lines ); return( lines );
} }

4
libvips/include/vips/private.h
View File

@ -136,8 +136,8 @@ typedef enum region_type {
* vips_image_generate() * vips_image_generate()
* when acting as a data sink. * when acting as a data sink.
*/ */
#define VIPS__TILE_WIDTH (64) #define VIPS__TILE_WIDTH (512)
#define VIPS__TILE_HEIGHT (64) #define VIPS__TILE_HEIGHT (512)
/* The height of the strips for the other two request styles. /* The height of the strips for the other two request styles.
*/ */

1
tools/vips.c
View File

@ -1062,6 +1062,7 @@ main( int argc, char **argv )
/* Could be a vips7 im_function. /* Could be a vips7 im_function.
*/ */
if( action && !handled && (fn = im_find_function( action )) ) { if( action && !handled && (fn = im_find_function( action )) ) {
(void) add_main_group( context, NULL );
parse_options( context, &argc, argv ); parse_options( context, &argc, argv );
if( im_run_command( action, argc - 1, argv + 1 ) ) { if( im_run_command( action, argc - 1, argv + 1 ) ) {