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

move bytw swapping out to vips_byteswap()

Browse Source 
it was an option to vips_copy(), ugly!
This commit is contained in:
John Cupitt 2015-06-05 13:56:26 +01:00
parent e84b97038f
commit dbd852211e
13 changed files with 292 additions and 121 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -9,6 +9,7 @@
- added VipsRefString as a thing that gi bindings can unpack
- support "with Vips.Image as ...:" in Python
- try to support DOS CSV and PPM files on linux
- add vips_byteswap(), remove byteswap from vips_copy()
7/5/15 started 8.0.3
- dzsave and tif pyr write could fail for some image dimensions, thanks Jonas

30
TODO
View File

@ -1,13 +1,18 @@
- try:
- break up vips_copy(), it's become unwieldy
$ vips csvload ~/Desktop/NDVI_VGYRM-lut.txt x.v --skip 1
$ vips copy x.v x2.v --width 256 --height 1 --bands 4
Segmentation fault (core dumped)
- just let it make changes which don't change sizeof(pixel)
see commented-out test in test_conversion.py
- split swap out to vips_byteswap()
- split 1xN -> MxN out to vips_band_fold() / vips_band_unfold(), have an
option for fold direction
- does ruby need to unpack RefString as well? what about C++?
horizontal (default): M x N image, B bands -> (M * B) x N mono image
vertical: M x N image, B bands -> M x (N * B) mono, copy image N times
vertically
maybe leave direction option for later
- how about something like vips_grid() which turns a tall thin one-band
image into a much smaller many-band image?
@ -19,6 +24,19 @@
much faster to make a very tall, thin image and fold it up in a single
operation
- try:
$ vips csvload ~/Desktop/NDVI_VGYRM-lut.txt x.v --skip 1
$ vips copy x.v x2.v --width 256 --height 1 --bands 4
Segmentation fault (core dumped)
see commented-out test in test_conversion.py
- does ruby need to unpack RefString as well? what about C++?
- are the mosaic functions calling vips_fastcor()? it must be very slow
add vips_fastcor_direct()

1
libvips/conversion/Makefile.am
View File

@ -9,6 +9,7 @@ libconversion_la_SOURCES = \
flatten.c \
premultiply.c \
unpremultiply.c \
byteswap.c \
cache.c \
copy.c \
embed.c \

2
libvips/conversion/bandmean.c
View File

@ -1,4 +1,4 @@
/* im_bandmean.c
/* average image bands
*
* Author: Simon Goodall
* Written on: 17/7/07

242
libvips/conversion/byteswap.c Normal file
View File

@ -0,0 +1,242 @@
/* Swap image byte order.
*
* 5/6/15
* - from copy.c
*/
/*
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 <stdlib.h>
#include <string.h>
#include <math.h>
#include <vips/vips.h>
#include <vips/internal.h>
#include <vips/debug.h>
#include "pconversion.h"
typedef struct _VipsByteswap {
VipsConversion parent_instance;
/* The input image.
*/
VipsImage *in;
} VipsByteswap;
typedef VipsConversionClass VipsByteswapClass;
G_DEFINE_TYPE( VipsByteswap, vips_byteswap, VIPS_TYPE_CONVERSION );
/* Swap pairs of bytes.
*/
static void
vips_byteswap_swap2( VipsPel *in, VipsPel *out, int width, VipsImage *im )
{
guint16 *p = (guint16 *) in;
guint16 *q = (guint16 *) out;
int sz = (VIPS_IMAGE_SIZEOF_PEL( im ) * width) / 2;
int x;
for( x = 0; x < sz; x++ )
q[x] = GUINT16_SWAP_LE_BE( p[x] );
}
/* Swap 4- of bytes.
*/
static void
vips_byteswap_swap4( VipsPel *in, VipsPel *out, int width, VipsImage *im )
{
guint32 *p = (guint32 *) in;
guint32 *q = (guint32 *) out;
int sz = (VIPS_IMAGE_SIZEOF_PEL( im ) * width) / 4;
int x;
for( x = 0; x < sz; x++ )
q[x] = GUINT32_SWAP_LE_BE( p[x] );
}
/* Swap 8- of bytes.
*/
static void
vips_byteswap_swap8( VipsPel *in, VipsPel *out, int width, VipsImage *im )
{
guint64 *p = (guint64 *) in;
guint64 *q = (guint64 *) out;
int sz = (VIPS_IMAGE_SIZEOF_PEL( im ) * width) / 8;
int x;
for( x = 0; x < sz; x++ )
q[x] = GUINT64_SWAP_LE_BE( p[x] );
}
typedef void (*SwapFn)( VipsPel *in, VipsPel *out, int width, VipsImage *im );
static SwapFn vips_byteswap_swap_fn[] = {
NULL, /* VIPS_FORMAT_UCHAR = 0, */
NULL, /* VIPS_FORMAT_CHAR = 1, */
vips_byteswap_swap2, /* VIPS_FORMAT_USHORT = 2, */
vips_byteswap_swap2, /* VIPS_FORMAT_SHORT = 3, */
vips_byteswap_swap4, /* VIPS_FORMAT_UINT = 4, */
vips_byteswap_swap4, /* VIPS_FORMAT_INT = 5, */
vips_byteswap_swap4, /* VIPS_FORMAT_FLOAT = 6, */
vips_byteswap_swap4, /* VIPS_FORMAT_COMPLEX = 7, */
vips_byteswap_swap8, /* VIPS_FORMAT_DOUBLE = 8, */
vips_byteswap_swap8 /* VIPS_FORMAT_DPCOMPLEX = 9, */
};
/* Byteswap, turning bands into the x axis.
*/
static int
vips_byteswap_gen( VipsRegion *or,
void *seq, void *a, void *b, gboolean *stop )
{
VipsRegion *ir = (VipsRegion *) seq;
VipsImage *im = ir->im;
VipsRect *r = &or->valid;
SwapFn swap = vips_byteswap_swap_fn[im->BandFmt];
int y;
if( vips_region_prepare( ir, r ) )
return( -1 );
for( y = 0; y < r->height; y++ ) {
VipsPel *p = VIPS_REGION_ADDR( ir, r->left, r->top + y );
VipsPel *q = VIPS_REGION_ADDR( or, r->left, r->top + y );
swap( p, q, r->width, im );
}
return( 0 );
}
static int
vips_byteswap_build( VipsObject *object )
{
VipsConversion *conversion = VIPS_CONVERSION( object );
VipsByteswap *byteswap = (VipsByteswap *) object;
if( VIPS_OBJECT_CLASS( vips_byteswap_parent_class )->build( object ) )
return( -1 );
if( vips_image_pio_input( byteswap->in ) )
return( -1 );
if( vips_image_pipelinev( conversion->out,
VIPS_DEMAND_STYLE_THINSTRIP, byteswap->in, NULL ) )
return( -1 );
if( vips_image_generate( conversion->out,
vips_start_one, vips_byteswap_gen, vips_stop_one,
byteswap->in, byteswap ) )
return( -1 );
return( 0 );
}
static void
vips_byteswap_class_init( VipsByteswapClass *class )
{
GObjectClass *gobject_class = G_OBJECT_CLASS( class );
VipsObjectClass *vobject_class = VIPS_OBJECT_CLASS( class );
VipsOperationClass *operation_class = VIPS_OPERATION_CLASS( class );
VIPS_DEBUG_MSG( "vips_byteswap_class_init\n" );
gobject_class->set_property = vips_object_set_property;
gobject_class->get_property = vips_object_get_property;
vobject_class->nickname = "byteswap";
vobject_class->description = _( "byteswap an image" );
vobject_class->build = vips_byteswap_build;
operation_class->flags = VIPS_OPERATION_SEQUENTIAL_UNBUFFERED;
VIPS_ARG_IMAGE( class, "in", 1,
_( "Input" ),
_( "Input image" ),
VIPS_ARGUMENT_REQUIRED_INPUT,
G_STRUCT_OFFSET( VipsByteswap, in ) );
}
static void
vips_byteswap_init( VipsByteswap *byteswap )
{
}
/**
* vips_byteswap:
* @in: input image
* @out: output image
* @...: %NULL-terminated list of optional named arguments
*
* Swap the byte order in an image.
*
* See also: vips_rawload().
*
* Returns: 0 on success, -1 on error.
*/
int
vips_byteswap( VipsImage *in, VipsImage **out, ... )
{
va_list ap;
int result;
va_start( ap, out );
result = vips_call_split( "byteswap", ap, in, out );
va_end( ap );
return( result );
}
/* Convenience function: swap if @swap is %TRUE, otherwise copy.
*/
int
vips__byteswap_bool( VipsImage *in, VipsImage **out, gboolean swap )
{
if( swap )
return( vips_byteswap( in, out, NULL ) );
else
return( vips_copy( in, out, NULL ) );
}

2
libvips/conversion/conversion.c
View File

@ -248,6 +248,7 @@ vips_conversion_operation_init( void )
extern GType vips_zoom_get_type( void );
extern GType vips_subsample_get_type( void );
extern GType vips_msb_get_type( void );
extern GType vips_byteswap_get_type( void );
#ifdef HAVE_PANGOFT2
extern GType vips_text_get_type( void );
#endif /*HAVE_PANGOFT2*/
@ -289,6 +290,7 @@ vips_conversion_operation_init( void )
vips_zoom_get_type();
vips_subsample_get_type();
vips_msb_get_type();
vips_byteswap_get_type();
#ifdef HAVE_PANGOFT2
vips_text_get_type();
#endif /*HAVE_PANGOFT2*/

116
libvips/conversion/copy.c
View File

@ -51,6 +51,8 @@
* - support bands -> width conversion
* 4/6/15
* - support width -> bands conversion
* 5/6/15
* - move byteswap out to vips_byteswap()
*/
/*
@ -107,12 +109,9 @@ typedef struct _VipsCopy {
*/
VipsImage *in;
/* Swap bytes on the way through.
*/
gboolean swap;
/* Fields we can optionally set on the way through.
*/
gboolean swap;
VipsInterpretation interpretation;
double xres;
double yres;
@ -130,66 +129,6 @@ typedef VipsConversionClass VipsCopyClass;
G_DEFINE_TYPE( VipsCopy, vips_copy, VIPS_TYPE_CONVERSION );
/* Swap pairs of bytes.
*/
static void
vips_copy_swap2( VipsPel *in, VipsPel *out, int width, VipsImage *im )
{
guint16 *p = (guint16 *) in;
guint16 *q = (guint16 *) out;
int sz = (VIPS_IMAGE_SIZEOF_PEL( im ) * width) / 2;
int x;
for( x = 0; x < sz; x++ )
q[x] = GUINT16_SWAP_LE_BE( p[x] );
}
/* Swap 4- of bytes.
*/
static void
vips_copy_swap4( VipsPel *in, VipsPel *out, int width, VipsImage *im )
{
guint32 *p = (guint32 *) in;
guint32 *q = (guint32 *) out;
int sz = (VIPS_IMAGE_SIZEOF_PEL( im ) * width) / 4;
int x;
for( x = 0; x < sz; x++ )
q[x] = GUINT32_SWAP_LE_BE( p[x] );
}
/* Swap 8- of bytes.
*/
static void
vips_copy_swap8( VipsPel *in, VipsPel *out, int width, VipsImage *im )
{
guint64 *p = (guint64 *) in;
guint64 *q = (guint64 *) out;
int sz = (VIPS_IMAGE_SIZEOF_PEL( im ) * width) / 8;
int x;
for( x = 0; x < sz; x++ )
q[x] = GUINT64_SWAP_LE_BE( p[x] );
}
typedef void (*SwapFn)( VipsPel *in, VipsPel *out, int width, VipsImage *im );
static SwapFn vips_copy_swap_fn[] = {
NULL, /* VIPS_FORMAT_UCHAR = 0, */
NULL, /* VIPS_FORMAT_CHAR = 1, */
vips_copy_swap2, /* VIPS_FORMAT_USHORT = 2, */
vips_copy_swap2, /* VIPS_FORMAT_SHORT = 3, */
vips_copy_swap4, /* VIPS_FORMAT_UINT = 4, */
vips_copy_swap4, /* VIPS_FORMAT_INT = 5, */
vips_copy_swap4, /* VIPS_FORMAT_FLOAT = 6, */
vips_copy_swap4, /* VIPS_FORMAT_COMPLEX = 7, */
vips_copy_swap8, /* VIPS_FORMAT_DOUBLE = 8, */
vips_copy_swap8 /* VIPS_FORMAT_DPCOMPLEX = 9, */
};
/* Copy, turning bands into the x axis.
*/
static int
@ -198,10 +137,7 @@ vips_copy_unbandize_gen( VipsRegion *or,
{
VipsRegion *ir = (VipsRegion *) seq;
VipsImage *in = ir->im;
VipsImage *out = or->im;
VipsRect *r = &or->valid;
VipsCopy *copy = (VipsCopy *) b;
SwapFn swap = vips_copy_swap_fn[copy->in->BandFmt];
int sze = VIPS_IMAGE_SIZEOF_ELEMENT( in );
VipsRect need;
@ -241,11 +177,7 @@ vips_copy_unbandize_gen( VipsRegion *or,
(r->left + x) * sze;
q = VIPS_REGION_ADDR( or, r->left + x, r->top + y );
if( copy->swap &&
swap )
swap( p, q, 1, out );
else
memcpy( q, p, sze );
memcpy( q, p, sze );
}
}
@ -265,8 +197,6 @@ vips_copy_bandize_gen( VipsRegion *or,
VipsImage *in = ir->im;
VipsImage *out = or->im;
VipsRect *r = &or->valid;
VipsCopy *copy = (VipsCopy *) b;
SwapFn swap = vips_copy_swap_fn[copy->in->BandFmt];
int sze = VIPS_IMAGE_SIZEOF_ELEMENT( in );
VipsRect need;
@ -309,11 +239,7 @@ vips_copy_bandize_gen( VipsRegion *or,
q = VIPS_REGION_ADDR( or, 0, r->left + x );
}
if( copy->swap &&
swap )
swap( p, q, 1, out );
else
memcpy( q, p, out->Bands * sze );
memcpy( q, p, out->Bands * sze );
}
}
@ -327,32 +253,14 @@ vips_copy_gen( VipsRegion *or, void *seq, void *a, void *b, gboolean *stop )
{
VipsRegion *ir = (VipsRegion *) seq;
VipsRect *r = &or->valid;
VipsCopy *copy = (VipsCopy *) b;
SwapFn swap = vips_copy_swap_fn[copy->in->BandFmt];
/* Ask for input we need.
*/
if( vips_region_prepare( ir, r ) )
return( -1 );
if( copy->swap &&
swap ) {
int y;
for( y = 0; y < r->height; y++ ) {
VipsPel *p = VIPS_REGION_ADDR( ir,
r->left, r->top + y );
VipsPel *q = VIPS_REGION_ADDR( or,
r->left, r->top + y );
swap( p, q, r->width, copy->in );
}
}
else
/* Nothing to do, just copy with pointers.
*/
if( vips_region_region( or, ir, r, r->left, r->top ) )
return( -1 );
if( vips_region_region( or, ir, r, r->left, r->top ) )
return( -1 );
return( 0 );
}
@ -391,6 +299,10 @@ vips_copy_build( VipsObject *object )
if( vips_image_pio_input( copy->in ) )
return( -1 );
if( copy->swap )
vips_warn( class->nickname, "%s",
_( "copy swap is deprecated, use byteswap instead" ) );
if( vips_image_pipelinev( conversion->out,
VIPS_DEMAND_STYLE_THINSTRIP, copy->in, NULL ) )
return( -1 );
@ -512,7 +424,7 @@ vips_copy_class_init( VipsCopyClass *class )
VIPS_ARG_BOOL( class, "swap", 2,
_( "Swap" ),
_( "Swap bytes in image between little and big-endian" ),
VIPS_ARGUMENT_OPTIONAL_INPUT,
VIPS_ARGUMENT_OPTIONAL_INPUT | VIPS_ARGUMENT_DEPRECATED,
G_STRUCT_OFFSET( VipsCopy, swap ),
FALSE );
@ -612,7 +524,6 @@ vips_copy_init( VipsCopy *copy )
* @yres: set image yres
* @xoffset: set image xoffset
* @yoffset: set image yoffset
* @swap: swap byte order
*
* Copy an image, optionally modifying the header. VIPS copies images by
* copying pointers, so this operation is instant, even for very large images.
@ -623,9 +534,6 @@ vips_copy_init( VipsCopy *copy )
* they are not set carefully. The operation will block changes which make the
* image size grow, see VIPS_IMAGE_SIZEOF_IMAGE().
*
* Setting @swap to %TRUE will make vips_copy() swap the byte ordering of
* pixels according to the image's format.
*
* You can use this operation to turn 1xN or Nx1 images with M bands into MxN
* one band images.
*

4
libvips/deprecated/vips7compat.c
View File

@ -1137,9 +1137,7 @@ im_copy_swap( IMAGE *in, IMAGE *out )
{
VipsImage *x;
if( vips_copy( in, &x,
"swap", TRUE,
NULL ) )
if( vips_byteswap( in, &x, NULL ) )
return( -1 );
if( vips_image_write( x, out ) ) {
g_object_unref( x );

2
libvips/foreign/analyze2vips.c
View File

@ -584,7 +584,7 @@ vips__analyze_read( const char *filename, VipsImage *out )
}
if( vips_copy( t[0], &t[1], "bands", bands, "format", fmt, NULL ) ||
vips_copy( t[1], &t[2], "swap", !vips_amiMSBfirst(), NULL ) ||
vips__byteswap_bool( t[1], &t[2], !vips_amiMSBfirst() ) ||
vips_image_write( t[2], out ) ) {
g_object_unref( x );
return( -1 );

5
libvips/foreign/ppm.c
View File

@ -297,9 +297,8 @@ read_mmap( FILE *fp, const char *filename, int msb_first, VipsImage *out )
"format", out->BandFmt,
"coding", out->Coding,
NULL ) ||
vips_copy( t[1], &t[2],
"swap", vips_amiMSBfirst() != msb_first,
NULL ) ||
vips__byteswap_bool( t[1], &t[2],
vips_amiMSBfirst() != msb_first ) ||
vips_image_write( t[2], out ) ) {
g_object_unref( x );
return( -1 );

2
libvips/include/vips/conversion.h
View File

@ -158,6 +158,8 @@ int vips_scale( VipsImage *in, VipsImage **out, ... )
__attribute__((sentinel));
int vips_msb( VipsImage *in, VipsImage **out, ... )
__attribute__((sentinel));
int vips_byteswap( VipsImage *in, VipsImage **out, ... )
__attribute__((sentinel));
int vips_bandjoin( VipsImage **in, VipsImage **out, int n, ... )
__attribute__((sentinel));

2
libvips/include/vips/internal.h
View File

@ -221,6 +221,8 @@ int vips_check_coding_labq( const char *domain, VipsImage *im );
int vips_check_coding_rad( const char *domain, VipsImage *im );
int vips_check_bands_3ormore( const char *domain, VipsImage *im );
int vips__byteswap_bool( VipsImage *in, VipsImage **out, gboolean swap );
#ifdef __cplusplus
}
#endif /*__cplusplus*/

4
libvips/iofuncs/image.c
View File

@ -888,9 +888,7 @@ vips_image_build( VipsObject *object )
"v" )) )
return( -1 );
if( vips_copy( t, &t2,
"swap", TRUE,
NULL ) ) {
if( vips_byteswap( t, &t2, NULL ) ) {
g_object_unref( t );
return( -1 );
}