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

remove im_binfile

Browse Source 
im_binfile is now folded into image.c
This commit is contained in:
John Cupitt 2011-02-28 18:00:03 +00:00
parent 2a2fef64f3
commit 17c5ab4383
7 changed files with 145 additions and 217 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
TODO
View File

@ -8,6 +8,8 @@
decls for im_local etc. are now in image.h, move them to object.h and the
code to object.c
how about vips_local_array()?
also see im_bits_of_fmt()
decls for type_map etc. are now in object.h, move the code to object.c

6
libvips/include/vips/image.h
View File

@ -352,7 +352,7 @@ void vips_image_preeval( VipsImage *image );
void vips_image_eval( VipsImage *image, int w, int h );
void vips_image_posteval( VipsImage *image );
VipsImage *vips_open( const char *filename, const char *mode );
VipsImage *vips_image_open( const char *filename, const char *mode );
gboolean vips_image_isMSBfirst( VipsImage *image );
gboolean vips_image_isfile( VipsImage *image );
@ -362,14 +362,14 @@ int vips_format_sizeof( VipsBandFormat format );
#define vips_open_local( IM, NAME, MODE ) \
#define vips_image_open_local( IM, NAME, MODE ) \
((IMAGE *) vips_local( (IM), \
(vips_construct_fn) im_open, (im_callback_fn) im_close, \
(void *) (NAME), (void *) (MODE), NULL ))
/* Strange double cast stops bogus warnings from gcc 4.1
*/
#define vips_open_local_array( IM, OUT, N, NAME, MODE ) \
#define vips_image_open_local_array( IM, OUT, N, NAME, MODE ) \
(vips_local_array( (IM), (void **)((void*)(OUT)), (N),\
(im_construct_fn) im_open, (im_callback_fn) im_close, \
(void *) (NAME), (void *) (MODE), NULL ))

1
libvips/iofuncs/Makefile.am
View File

@ -11,7 +11,6 @@ libiofuncs_la_SOURCES = \
error.c \
image.c \
vips.c \
im_binfile.c \
im_cp_desc.c \
im_demand_hint.c \
im_generate.c \

6
libvips/iofuncs/base64.c
View File

@ -168,13 +168,13 @@ im__b64_encode( const unsigned char *data, size_t data_length )
int cursor;
if( data_length <= 0 ) {
im_error( "im__b64_encode", "%s", _( "too little data" ) );
vips_error( "im__b64_encode", "%s", _( "too little data" ) );
return( NULL );
}
if( output_data_length > 1024 * 1024 ) {
/* We shouldn't really be used for large amounts of data.
*/
im_error( "im__b64_encode", "%s", _( "too much data" ) );
vips_error( "im__b64_encode", "%s", _( "too much data" ) );
return( NULL );
}
if( !(buffer = im_malloc( NULL, output_data_length )) )
@ -239,7 +239,7 @@ im__b64_decode( const char *buffer, size_t *data_length )
if( output_data_length > 1024 * 1024 ) {
/* We shouldn't really be used for large amounts of data.
*/
im_error( "im__b64_decode", "%s", _( "too much data" ) );
vips_error( "im__b64_decode", "%s", _( "too much data" ) );
return( NULL );
}

10
libvips/iofuncs/dispatch_types.c
View File

@ -113,7 +113,7 @@ input_image_init( im_object *obj, char *str )
{
IMAGE **im = (IMAGE **) obj;
return( !(*im = vips_open( str, "rd" )) );
return( !(*im = vips_image_open( str, "rd" )) );
}
/* Input image type.
@ -133,7 +133,7 @@ output_image_init( im_object *obj, char *str )
{
IMAGE **im = (IMAGE **) obj;
return( !(*im = vips_open( str, "w" )) );
return( !(*im = vips_image_open( str, "w" )) );
}
/* Output image type.
@ -153,7 +153,7 @@ rw_image_init( im_object *obj, char *str )
{
IMAGE **im = (IMAGE **) obj;
return( !(*im = vips_open( str, "rw" )) );
return( !(*im = vips_image_open( str, "rw" )) );
}
/* RW image type.
@ -215,7 +215,7 @@ input_imagevec_init( im_object *obj, char *str )
iv->vec[i] = NULL;
for( i = 0; i < nargs; i++ )
if( !(iv->vec[i] = vips_open( strv[i], "rd" )) ) {
if( !(iv->vec[i] = vips_image_open( strv[i], "rd" )) ) {
g_strfreev( strv );
return( -1 );
}
@ -540,7 +540,7 @@ input_intvec_init( im_object *obj, char *str )
long int val= strtol( strv[i], NULL, 10 );
if( errno ) {
im_error_system( errno, "input_intvec_init",
vips_error_system( errno, "input_intvec_init",
_( "bad integer \"%s\"" ), strv[i] );
g_strfreev( strv );
return( -1 );

183
libvips/iofuncs/im_binfile.c
View File

@ -1,183 +0,0 @@
/* im_binfile.c --- load a raw binary file
*
* Author: N. Dessipris
* Written on: 31/7/91
* Modified on:
* 15/6/93 JC
* - includes fixed
* - externs fixed
* 7/6/94 JC
* - im_outcheck() added
* 13/12/94 JC
* - now uses im_mapfile(), rather than read() and copy
* - hence returns a new IMAGE descriptor
* 25/5/95 JC
* - oops! mess up with fd on errors
* 5/2/04 JC
* - added offset param
* 26/5/04
* - data init was broken by im_mapfile() change
* 30/9/05
* - use int64 for size calcs so we can map >31 bit files on 64 bit
* machines
* - delay mmap() for large files, cf. im_openin()
* 12/5/09
* - fix signed/unsigned warnings
*/
/*
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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
/*
These files are distributed with VIPS - http://www.vips.ecs.soton.ac.uk
*/
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif /*HAVE_CONFIG_H*/
#include <vips/intl.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#ifdef HAVE_SYS_TYPES_H
#include <sys/types.h>
#endif
#ifdef HAVE_SYS_STAT_H
#include <sys/stat.h>
#endif
#include <vips/vips.h>
#include <vips/internal.h>
#ifdef WITH_DMALLOC
#include <dmalloc.h>
#endif /*WITH_DMALLOC*/
/**
* im_binfile:
* @name: filename to open
* @xsize: image width
* @ysize: image height
* @bands: image bands (or bytes per pixel)
* @offset: bytes to skip at start of file
*
* This function maps the named file and returns an #IMAGE you can use to
* read it.
*
* It returns an 8-bit image with @bands bands. If the image is not 8-bit, use
* im_copy_set() to transform the descriptor after loading it.
*
* See also: im_copy_set(), im_raw2vips(), im_open().
*
* Returns: the new #IMAGE, or NULL on error.
*/
IMAGE *
im_binfile( const char *name, int xsize, int ysize, int bands, int offset )
{
IMAGE *im;
gint64 psize;
gint64 rsize;
/* Check parameters.
*/
if( xsize <= 0 || ysize <= 0 || bands <= 0 ) {
im_error( "im_binfile",
"%s", _( "bad parameters" ) );
return( NULL );
}
/* Make new output image for us.
*/
if( !(im = im_init( name )) )
return( NULL );
if( (im->fd = im__open_image_file( name )) == -1 ) {
im_close( im );
return( NULL );
}
im->dtype = IM_OPENIN;
im->sizeof_header = offset;
/* Predict file size.
*/
psize = (gint64) xsize * ysize * bands + offset;
/* Read the real file length and check against what we think
* the size should be.
*/
if( (rsize = im_file_length( im->fd )) == -1 ) {
im_close( im );
return( NULL );
}
im->file_length = rsize;
/* Very common, so special message.
*/
if( psize > rsize ) {
im_error( "im_binfile", _( "unable to open %s: "
"file has been truncated" ), im->filename );
im_close( im );
return( NULL );
}
/* Just wierd. Only print a warning for this, since we should
* still be able to process it without coredumps.
*/
if( psize < rsize )
im_warn( "im_binfile", _( "%s is longer than expected" ),
im->filename );
/* Set header fields.
*/
im->Xsize = xsize;
im->Ysize = ysize;
im->Bands = bands;
/* Set others to standard values.
*/
im->BandFmt = IM_BANDFMT_UCHAR;
im->Bbits = im_bits_of_fmt( im->BandFmt );
im->Coding = IM_CODING_NONE;
if( bands == 1 )
im->Type = IM_TYPE_B_W;
else if( bands == 3 )
im->Type = IM_TYPE_RGB;
else
im->Type = IM_TYPE_MULTIBAND;
im->Xres = 1.0;
im->Yres = 1.0;
im->Length = 0;
im->Compression = 0;
im->Level = 0;
im->Xoffset = 0;
im->Yoffset = 0;
/* Init others too.
*/
im->dhint = IM_THINSTRIP;
return( im );
}

154
libvips/iofuncs/image.c
View File

@ -243,14 +243,14 @@
*/
/**
* vips_open_local_array:
* vips_image_open_local_array:
* @IM: image to open local to
* @OUT: array to fill with #VipsImage *
* @N: array size
* @NAME: filename to open
* @MODE: mode to open with
*
* Just like vips_open(), but opens an array of images. Handy for creating a
* Just like vips_image_open(), but opens an array of images. Handy for creating a
* set of temporary images for a function.
*
* Example:
@ -258,7 +258,7 @@
* |[
* VipsImage *t[5];
*
* if( vips_open_local_array( out, t, 5, "some-temps", "p" ) ||
* if( vips_image_open_local_array( out, t, 5, "some-temps", "p" ) ||
* vips_add( a, b, t[0] ) ||
* vips_invert( t[0], t[1] ) ||
* vips_add( t[1], t[0], t[2] ) ||
@ -266,21 +266,21 @@
* return( -1 );
* ]|
*
* See also: vips_open(), vips_open_local(), vips_local_array().
* See also: vips_image_open(), vips_image_open_local(), vips_local_array().
*
* Returns: 0 on sucess, or -1 on error
*/
/**
* vips_open_local:
* vips_image_open_local:
* @IM: image to open local to
* @NAME: filename to open
* @MODE: mode to open with
*
* Just like vips_open(), but the #VipsImage will be closed for you
* Just like vips_image_open(), but the #VipsImage will be closed for you
* automatically when @IM is closed.
*
* See also: vips_open(), vips_local().
* See also: vips_image_open(), vips_local().
*
* Returns: a new #VipsImage, or %NULL on error
*/
@ -597,7 +597,7 @@ lazy_real_image( Lazy *lazy )
/* Otherwise, fall back to a "p".
*/
if( !real &&
!(real = vips_open( lazy->filename, "p" )) )
!(real = vips_image_open( lazy->filename, "p" )) )
return( NULL );
return( real );
@ -649,7 +649,7 @@ open_lazy_generate( REGION *or, void *seq, void *a, void *b )
* decoding pixels with the second OpenLazyFn until the first generate().
*/
static int
vips_open_lazy( VipsImage *image,
vips_image_open_lazy( VipsImage *image,
VipsFormatClass *format, const char *filename, gboolean disc )
{
Lazy *lazy;
@ -822,7 +822,7 @@ vips_image_build( VipsObject *object )
im_amiMSBfirst();
if( native ) {
if( vips_open_input( image ) )
if( vips_image_open_input( image ) )
return( -1 );
if( mode[1] == 'w' )
@ -831,10 +831,10 @@ vips_image_build( VipsObject *object )
else {
VipsImage *x;
if( !(x = vips_open( filename, "p" )) )
if( !(x = vips_image_open( filename, "p" )) )
return( -1 );
vips_object_local( image, x );
if( vips_open_input( x ) )
if( vips_image_open_input( x ) )
return( -1 );
image->dtype = VIPS_IMAGE_PARTIAL;
if( im_copy_swap( x, image ) )
@ -842,7 +842,7 @@ vips_image_build( VipsObject *object )
}
}
else {
if( vips_open_lazy( image, format,
if( vips_image_open_lazy( image, format,
filename, mode[1] == 'd' ) )
return( -1 );
}
@ -1202,18 +1202,19 @@ vips_image_posteval( VipsImage *image )
}
/**
* vips_open:
* vips_image_open:
* @filename: file to open
* @mode: mode to open with
*
* vips_open() examines the mode string, and creates an appropriate #IMAGE.
* vips_image_open() examines the mode string, and creates an appropriate
* #VipsImage.
*
* <itemizedlist>
* <listitem>
* <para>
* <emphasis>"r"</emphasis>
* opens the named file for reading. If the file is not in the native
* VIPS format for your machine, vips_open() automatically converts the
* VIPS format for your machine, vips_image_open() automatically converts the
* file for you in memory.
*
* For some large files (eg. TIFF) this may
@ -1222,7 +1223,7 @@ vips_image_posteval( VipsImage *image )
* API and control the loading process yourself. See
* #VipsBandFormat.
*
* vips_open() can read files in most formats.
* vips_image_open() can read files in most formats.
*
* Note that <emphasis>"r"</emphasis> mode works in at least two stages.
* It should return quickly and let you check header fields. It will
@ -1234,7 +1235,7 @@ vips_image_posteval( VipsImage *image )
* <emphasis>"rd"</emphasis>
* opens the named file for reading. If the uncompressed image is larger
* than a threshold and the file format does not support random access,
* rather than uncompressing to memory, vips_open() will uncompress to a
* rather than uncompressing to memory, vips_image_open() will uncompress to a
* temporary disc file. This file will be automatically deleted when the
* IMAGE is closed.
*
@ -1263,7 +1264,7 @@ vips_image_posteval( VipsImage *image )
* suffix to determine the type to write -- for example:
*
* |[
* vips_open( "fred.tif", "w" )
* vips_image_open( "fred.tif", "w" )
* ]|
*
* will write in TIFF format.
@ -1295,7 +1296,7 @@ vips_image_posteval( VipsImage *image )
* Returns: the image descriptor on success and NULL on error.
*/
VipsImage *
vips_open( const char *filename, const char *mode )
vips_image_open( const char *filename, const char *mode )
{
VipsImage *image;
@ -1312,6 +1313,114 @@ vips_open( const char *filename, const char *mode )
return( image );
}
/**
* vips_image_open_raw:
* @filename: filename to open
* @xsize: image width
* @ysize: image height
* @bands: image bands (or bytes per pixel)
* @offset: bytes to skip at start of file
*
* This function maps the named file and returns a #VipsImage you can use to
* read it.
*
* It returns an 8-bit image with @bands bands. If the image is not 8-bit, use
* im_copy_set() to transform the descriptor after loading it.
*
* See also: im_copy_set(), im_raw2vips(), vips_image_open().
*
* Returns: the new #VipsImage, or %NULL on error.
*/
VipsImage *
vips_image_open_raw( const char *filename,
int xsize, int ysize, int bands, int offset )
{
VipsImage *image;
/* Check parameters.
*/
if( xsize <= 0 || ysize <= 0 ||
bands <= 0 || offset <= 0 ) {
vips_error( "vips_image_open_raw",
"%s", _( "bad parameters" ) );
return( NULL );
}
if( !(image = vips_image_open( filename, "p" )) )
return( NULL );
if( (im->fd = im__open_image_file( name )) == -1 ) {
im_close( im );
return( NULL );
}
im->dtype = IM_OPENIN;
im->sizeof_header = offset;
/* Predict file size.
*/
psize = (gint64) xsize * ysize * bands + offset;
/* Read the real file length and check against what we think
* the size should be.
*/
if( (rsize = im_file_length( im->fd )) == -1 ) {
im_close( im );
return( NULL );
}
im->file_length = rsize;
/* Very common, so a special message.
*/
if( psize > rsize ) {
vips_error( "im_binfile", _( "unable to open %s: "
"file has been truncated" ), im->filename );
im_close( im );
return( NULL );
}
/* Just wierd. Only print a warning for this, since we should
* still be able to process it without coredumps.
*/
if( psize < rsize )
im_warn( "im_binfile", _( "%s is longer than expected" ),
im->filename );
/* Set header fields.
*/
im->Xsize = xsize;
im->Ysize = ysize;
im->Bands = bands;
/* Set others to standard values.
*/
im->BandFmt = IM_BANDFMT_UCHAR;
im->Bbits = im_bits_of_fmt( im->BandFmt );
im->Coding = IM_CODING_NONE;
if( bands == 1 )
im->Type = IM_TYPE_B_W;
else if( bands == 3 )
im->Type = IM_TYPE_RGB;
else
im->Type = IM_TYPE_MULTIBAND;
im->Xres = 1.0;
im->Yres = 1.0;
im->Length = 0;
im->Compression = 0;
im->Level = 0;
im->Xoffset = 0;
im->Yoffset = 0;
/* Init others too.
*/
im->dhint = IM_THINSTRIP;
return( im );
}
/**
* vips_image_isMSBfirst:
* @image: image to test
@ -1335,8 +1444,7 @@ vips_image_isMSBfirst( VipsImage *image )
*
* Return %TRUE if @image represents a file on disc in some way.
*/
gboolean
vips_image_isfile( VipsImage *image )
gboolean vips_image_isfile( VipsImage *image )
{
switch( image->dtype ) {
case VIPS_IMAGE_MMAPIN:
@ -1399,3 +1507,5 @@ vips_format_sizeof( VipsBandFormat format )
vips_image__sizeof_bandformat[format] );
}