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

more oopses from coverity

Browse Source
This commit is contained in:
John Cupitt 2015-09-30 10:08:36 +01:00
parent d88dd1ab72
commit 2a82286dad
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libvips/colour/icc_transform.c
View File

@ -620,6 +620,7 @@ vips_icc_import_build( VipsObject *object )
code->in ); code->in );
if( !icc->in_profile && if( !icc->in_profile &&
code->in &&
import->input_profile_filename ) import->input_profile_filename )
icc->in_profile = vips_icc_load_profile_file( class->nickname, icc->in_profile = vips_icc_load_profile_file( class->nickname,
code->in, import->input_profile_filename ); code->in, import->input_profile_filename );
@ -1031,6 +1032,7 @@ vips_icc_transform_build( VipsObject *object )
code->in ); code->in );
if( !icc->in_profile && if( !icc->in_profile &&
code->in &&
transform->input_profile_filename ) transform->input_profile_filename )
icc->in_profile = vips_icc_load_profile_file( class->nickname, icc->in_profile = vips_icc_load_profile_file( class->nickname,
code->in, transform->input_profile_filename ); code->in, transform->input_profile_filename );

3
libvips/draw/draw_circle.c
View File

@ -100,11 +100,12 @@ vips__draw_circle_direct( VipsImage *image, int cx, int cy, int r,
} }
} }
if( x == y ) if( x == y ) {
draw_scanline( image, cy + y, cx - x, cx + x, client ); draw_scanline( image, cy + y, cx - x, cx + x, client );
draw_scanline( image, cy - y, cx - x, cx + x, client ); draw_scanline( image, cy - y, cx - x, cx + x, client );
draw_scanline( image, cy + x, cx - y, cx + y, client ); draw_scanline( image, cy + x, cx - y, cx + y, client );
draw_scanline( image, cy - x, cx - y, cx + y, client ); draw_scanline( image, cy - x, cx - y, cx + y, client );
}
} }
static inline void static inline void

6
libvips/foreign/csv.c
View File

@ -266,7 +266,7 @@ read_csv( FILE *fp, VipsImage *out,
skip + 1, columns + 1, &d )) == 0; skip + 1, columns + 1, &d )) == 0;
columns++ ) columns++ )
; ;
fsetpos( fp, &pos ); (void) fsetpos( fp, &pos );
if( columns == 0 ) { if( columns == 0 ) {
vips_error( "csv2vips", "%s", _( "empty line" ) ); vips_error( "csv2vips", "%s", _( "empty line" ) );
@ -277,10 +277,10 @@ read_csv( FILE *fp, VipsImage *out,
* number of lines out. * number of lines out.
*/ */
if( lines == -1 ) { if( lines == -1 ) {
fgetpos( fp, &pos ); (void) fgetpos( fp, &pos );
for( lines = 0; skip_line( fp ); lines++ ) for( lines = 0; skip_line( fp ); lines++ )
; ;
fsetpos( fp, &pos ); (void) fsetpos( fp, &pos );
} }
vips_image_pipelinev( out, VIPS_DEMAND_STYLE_THINSTRIP, NULL ); vips_image_pipelinev( out, VIPS_DEMAND_STYLE_THINSTRIP, NULL );