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

stuff

Browse Source
This commit is contained in:
John Cupitt 2008-11-10 10:55:15 +00:00
parent 10cd80481c
commit dc68f4a3ec
3 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libsrc/conversion/im_bernd.c
View File

@ -65,13 +65,11 @@ extract( IMAGE *in, int x, int y, int w, int h )
im_vips2bufjpeg( t1, in, 75, &buf, &len ) )
return( -1 );
fwrite( buf, sizeof( char ), len, stdout );
fflush( stdout );
if( ferror( stdout ) ) {
im_errormsg( "im_bernd: error writing output" );
if( fwrite( buf, sizeof( char ), len, stdout ) != len ) {
im_error( "im_bernd", "%s", _( "error writing output" ) );
return( -1 );
}
fflush( stdout );
return( 0 );
}

10
libsrc/format/im_vips2jpeg.c
View File

@ -881,17 +881,15 @@ im_vips2mimejpeg( IMAGE *in, int qfac )
printf( "Content-length: %d\r\n", len );
printf( "Content-type: image/jpeg\r\n" );
printf( "\r\n" );
fwrite( buf, sizeof( char ), len, stdout );
fflush( stdout );
im_close( base );
if( ferror( stdout ) ) {
if( fwrite( buf, sizeof( char ), len, stdout ) != len ) {
im_error( "im_vips2mimejpeg",
"%s", _( "error writing output" ) );
return( -1 );
}
fflush( stdout );
im_close( base );
return( 0 );
}

9
src/mosaicing/mergeup.c
View File

@ -534,14 +534,17 @@ char **argv;
k = 0;
for( i=0; i<height; i++ ){
for( j=0; j<width; j++ ){
fscanf(fp,"%d %d ", &hxdisp[k] , &hydisp[k] );
if(fscanf(fp,"%d %d ", &hxdisp[k] , &hydisp[k])!=2)
error_exit("argh");
k++;
}
fscanf(fp,"\n");
if(fscanf(fp,"\n")!=0)
error_exit("argh3");
}
for( i=0; i<height; i++ )
fscanf(fp,"%d %d\n", &vxdisp[i] , &vydisp[i] );
if(fscanf(fp,"%d %d\n", &vxdisp[i] , &vydisp[i])!=2)
error_exit("argh2");
merge_analysis(width,height,in,xoverlap,yoverlap,vxdisp,vydisp,hxdisp,hydisp,hrect,vrect);
merge_up( width, height, in, out, xoverlap, yoverlap, hxdisp, hydisp, vrect );