added cimg to vips trunk
This commit is contained in:
John Cupitt
parent
36f7ed76b5
commit
244f5c054e
libsrc/cimg
22226
libsrc/cimg/CImg.h
Normal file
22226
libsrc/cimg/CImg.h
Normal file
File diff suppressed because it is too large
Load Diff
15
libsrc/cimg/Makefile.am
Normal file
15
libsrc/cimg/Makefile.am
Normal file
@ -0,0 +1,15 @@
|
|||||||
|
noinst_LTLIBRARIES = libcimg.la
|
||||||
|
|
||||||
|
libcimg_la_SOURCES = \
|
||||||
|
CImg.h \
|
||||||
|
cimg_dispatch.c \
|
||||||
|
cimg.cpp
|
||||||
|
|
||||||
|
# various cimg settings as well
|
||||||
|
AM_CPPFLAGS = \
|
||||||
|
-Dcimg_strict \
|
||||||
|
-Dcimg_OS=1 \
|
||||||
|
-Dcimg_display_type=0 \
|
||||||
|
-DLOCALEDIR=\""$(LOCALEDIR)"\"
|
||||||
|
|
||||||
|
INCLUDES = -I${top_srcdir}/include @VIPS_CFLAGS@ @VIPS_INCLUDES@
|
||||||
286
libsrc/cimg/cimg.cpp
Normal file
286
libsrc/cimg/cimg.cpp
Normal file
@ -0,0 +1,286 @@
|
|||||||
|
/* @(#) Pass VIPS images through CImg
|
||||||
|
*
|
||||||
|
* JC, 15/10/07
|
||||||
|
*/
|
||||||
|
|
||||||
|
/*
|
||||||
|
|
||||||
|
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 <vips/vips.h>
|
||||||
|
#include <vips/internal.h>
|
||||||
|
|
||||||
|
/* CImg needs to call pthread directly, this is the preproc magic they
|
||||||
|
* prefer.
|
||||||
|
*/
|
||||||
|
#if defined(sun) || defined(__sun) || defined(linux) || defined(__linux) \
|
||||||
|
|| defined(__linux__) || defined(__CYGWIN__) || defined(BSD) || defined(__FreeBSD__) \
|
||||||
|
|| defined(__OPENBSD__) || defined(__MACOSX__) || defined(__APPLE__) || defined(sgi) \
|
||||||
|
|| defined(__sgi)
|
||||||
|
#include <pthread.h>
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#include "CImg.h"
|
||||||
|
using namespace cimg_library;
|
||||||
|
|
||||||
|
/* Save params here.
|
||||||
|
*/
|
||||||
|
struct Greyc {
|
||||||
|
IMAGE *in;
|
||||||
|
IMAGE *out;
|
||||||
|
IMAGE *mask;
|
||||||
|
IMAGE **arry;
|
||||||
|
|
||||||
|
int iterations;
|
||||||
|
float amplitude;
|
||||||
|
float sharpness;
|
||||||
|
float anisotropy;
|
||||||
|
float alpha;
|
||||||
|
float sigma;
|
||||||
|
float dl;
|
||||||
|
float da;
|
||||||
|
float gauss_prec;
|
||||||
|
int interpolation;
|
||||||
|
bool fast_approx;
|
||||||
|
};
|
||||||
|
|
||||||
|
// copy part of a vips region into a cimg
|
||||||
|
template<typename T> static CImg<T> *
|
||||||
|
vips_to_cimg( REGION *in, Rect *area )
|
||||||
|
{
|
||||||
|
IMAGE *im = in->im;
|
||||||
|
CImg<T> *img = new CImg<T>( area->width, area->height, 1, im->Bands );
|
||||||
|
|
||||||
|
for( int y = 0; y < area->height; y++ ) {
|
||||||
|
T *p = (T *) IM_REGION_ADDR( in, area->left, area->top + y );
|
||||||
|
|
||||||
|
for( int x = 0; x < area->width; x++ ) {
|
||||||
|
for( int z = 0; z < im->Bands; z++ )
|
||||||
|
(*img)( x, y, z ) = p[z];
|
||||||
|
|
||||||
|
p += im->Bands;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return( img );
|
||||||
|
}
|
||||||
|
|
||||||
|
// write a CImg to a vips region
|
||||||
|
// fill out->valid, img has pixels in img_rect
|
||||||
|
template<typename T> static void
|
||||||
|
cimg_to_vips( CImg<T> *img, Rect *img_rect, REGION *out )
|
||||||
|
{
|
||||||
|
IMAGE *im = out->im;
|
||||||
|
Rect *valid = &out->valid;
|
||||||
|
|
||||||
|
g_assert( im_rect_includesrect( img_rect, valid ) );
|
||||||
|
|
||||||
|
int x_off = valid->left - img_rect->left;
|
||||||
|
int y_off = valid->top - img_rect->top;
|
||||||
|
|
||||||
|
for( int y = 0; y < valid->height; y++ ) {
|
||||||
|
T *p = (T *) IM_REGION_ADDR( out, valid->left, valid->top + y );
|
||||||
|
|
||||||
|
for( int x = 0; x < valid->width; x++ ) {
|
||||||
|
for( int z = 0; z < im->Bands; z++ )
|
||||||
|
p[z] = static_cast<T>( (*img)(
|
||||||
|
x + x_off, y + y_off, z ) );
|
||||||
|
|
||||||
|
p += im->Bands;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
template<typename T> static int
|
||||||
|
greyc_gen( REGION *out, REGION **in, IMAGE **arry, Greyc *greyc )
|
||||||
|
{
|
||||||
|
static const float gfact = (sizeof( T ) == 2) ? 1.0 / 256 : 1.0;
|
||||||
|
static const int tile_border = 4;
|
||||||
|
|
||||||
|
Rect *ir = &out->valid;
|
||||||
|
Rect need;
|
||||||
|
Rect image;
|
||||||
|
|
||||||
|
CImg<T> *img;
|
||||||
|
CImg<unsigned char> *msk;
|
||||||
|
|
||||||
|
need = *ir;
|
||||||
|
im_rect_marginadjust( &need, tile_border );
|
||||||
|
image.left = 0;
|
||||||
|
image.top = 0;
|
||||||
|
image.width = in[0]->im->Xsize;
|
||||||
|
image.height = in[0]->im->Ysize;
|
||||||
|
im_rect_intersectrect( &need, &image, &need );
|
||||||
|
if( im_prepare( in[0], &need ) )
|
||||||
|
return( -1 );
|
||||||
|
if( in[1] && im_prepare( in[1], &need ) )
|
||||||
|
return( -1 );
|
||||||
|
|
||||||
|
img = NULL;
|
||||||
|
msk = NULL;
|
||||||
|
|
||||||
|
try {
|
||||||
|
img = vips_to_cimg<T>( in[0], &need );
|
||||||
|
if( in[1] )
|
||||||
|
msk = vips_to_cimg<unsigned char>( in[1], &need );
|
||||||
|
else
|
||||||
|
// empty mask
|
||||||
|
msk = new CImg<unsigned char>();
|
||||||
|
|
||||||
|
for( int i = 0; i < greyc->iterations; i++ )
|
||||||
|
img->blur_anisotropic( *msk,
|
||||||
|
greyc->amplitude, greyc->sharpness,
|
||||||
|
greyc->anisotropy,
|
||||||
|
greyc->alpha, greyc->sigma, greyc->dl,
|
||||||
|
greyc->da, greyc->gauss_prec,
|
||||||
|
greyc->interpolation, greyc->fast_approx,
|
||||||
|
gfact );
|
||||||
|
|
||||||
|
cimg_to_vips<T>( img, &need, out );
|
||||||
|
}
|
||||||
|
catch( CImgException e ) {
|
||||||
|
if( img )
|
||||||
|
delete( img );
|
||||||
|
if( msk )
|
||||||
|
delete( msk );
|
||||||
|
|
||||||
|
im_error( "GREYCstoration", e.message );
|
||||||
|
|
||||||
|
return( -1 );
|
||||||
|
}
|
||||||
|
|
||||||
|
if( img )
|
||||||
|
delete( img );
|
||||||
|
if( msk )
|
||||||
|
delete( msk );
|
||||||
|
|
||||||
|
return( 0 );
|
||||||
|
}
|
||||||
|
|
||||||
|
// Hmm, strange double-cast needed
|
||||||
|
typedef int (*generate_fn)( REGION *out, REGION **in,
|
||||||
|
IMAGE **im, Greyc *greyc );
|
||||||
|
|
||||||
|
// as a plain C function
|
||||||
|
int
|
||||||
|
im_greyc_mask( IMAGE *in, IMAGE *out, IMAGE *mask,
|
||||||
|
int iterations,
|
||||||
|
float amplitude, float sharpness, float anisotropy,
|
||||||
|
float alpha, float sigma,
|
||||||
|
float dl, float da, float gauss_prec,
|
||||||
|
int interpolation, int fast_approx )
|
||||||
|
{
|
||||||
|
IMAGE **arry;
|
||||||
|
Greyc *greyc;
|
||||||
|
|
||||||
|
if( im_piocheck( in, out ) )
|
||||||
|
return( -1 );
|
||||||
|
if( in->Coding != IM_CODING_NONE ) {
|
||||||
|
im_error( "GREYCstoration", _( "uncoded only" ) );
|
||||||
|
return( -1 );
|
||||||
|
}
|
||||||
|
if( mask ) {
|
||||||
|
if( mask->Coding != IM_CODING_NONE ) {
|
||||||
|
im_error( "GREYCstoration", _( "uncoded only" ) );
|
||||||
|
return( -1 );
|
||||||
|
}
|
||||||
|
if( mask->Xsize != in->Xsize ||
|
||||||
|
mask->Ysize != in->Ysize ) {
|
||||||
|
im_error( "GREYCstoration",
|
||||||
|
_( "mask size does not match input" ) );
|
||||||
|
return( -1 );
|
||||||
|
}
|
||||||
|
if( mask->BandFmt != IM_BANDFMT_UCHAR ) {
|
||||||
|
im_error( "GREYCstoration", _( "mask must be uchar" ) );
|
||||||
|
return( -1 );
|
||||||
|
}
|
||||||
|
}
|
||||||
|
im_cp_desc( out, in );
|
||||||
|
if( im_demand_hint( out, IM_FATSTRIP, in, NULL ) )
|
||||||
|
return( -1 );
|
||||||
|
if( !(arry = im_allocate_input_array( out, in, mask, NULL )) )
|
||||||
|
return( -1 );
|
||||||
|
|
||||||
|
if( !(greyc = IM_NEW( out, Greyc )) )
|
||||||
|
return( -1 );
|
||||||
|
greyc->in = in;
|
||||||
|
greyc->out = out;
|
||||||
|
greyc->mask = mask;
|
||||||
|
greyc->arry = arry;
|
||||||
|
greyc->iterations = iterations;
|
||||||
|
greyc->amplitude = amplitude;
|
||||||
|
greyc->sharpness = sharpness;
|
||||||
|
greyc->anisotropy = anisotropy;
|
||||||
|
greyc->alpha = alpha;
|
||||||
|
greyc->sigma = sigma;
|
||||||
|
greyc->dl = dl;
|
||||||
|
greyc->da = da;
|
||||||
|
greyc->gauss_prec = gauss_prec;
|
||||||
|
greyc->interpolation = interpolation;
|
||||||
|
greyc->fast_approx = fast_approx;
|
||||||
|
|
||||||
|
switch( in->BandFmt ) {
|
||||||
|
case IM_BANDFMT_UCHAR:
|
||||||
|
if( im_generate( out,
|
||||||
|
im_start_many,
|
||||||
|
// double-cast to give g++ enough context to expand the
|
||||||
|
// template correctly
|
||||||
|
(im_generate_fn) (
|
||||||
|
(generate_fn) greyc_gen<unsigned char>),
|
||||||
|
im_stop_many, arry, greyc ) )
|
||||||
|
return( -1 );
|
||||||
|
break;
|
||||||
|
|
||||||
|
case IM_BANDFMT_USHORT:
|
||||||
|
if( im_generate( out,
|
||||||
|
im_start_many,
|
||||||
|
(im_generate_fn) (
|
||||||
|
(generate_fn) greyc_gen<unsigned short>),
|
||||||
|
im_stop_many, arry, greyc ) )
|
||||||
|
return( -1 );
|
||||||
|
break;
|
||||||
|
|
||||||
|
case IM_BANDFMT_FLOAT:
|
||||||
|
if( im_generate( out,
|
||||||
|
im_start_many,
|
||||||
|
(im_generate_fn) (
|
||||||
|
(generate_fn) greyc_gen<float>),
|
||||||
|
im_stop_many, arry, greyc ) )
|
||||||
|
return( -1 );
|
||||||
|
break;
|
||||||
|
|
||||||
|
default:
|
||||||
|
im_error( "GREYCstoration",
|
||||||
|
_( "unsupported type: uchar, ushort and float only" ) );
|
||||||
|
return( -1 );
|
||||||
|
}
|
||||||
|
|
||||||
|
return( 0 );
|
||||||
|
}
|
||||||
164
libsrc/cimg/cimg_dispatch.c
Normal file
164
libsrc/cimg/cimg_dispatch.c
Normal file
@ -0,0 +1,164 @@
|
|||||||
|
/* Function dispatch tables for cimg wrappers.
|
||||||
|
*/
|
||||||
|
|
||||||
|
/*
|
||||||
|
|
||||||
|
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 <vips/vips.h>
|
||||||
|
|
||||||
|
#ifdef WITH_DMALLOC
|
||||||
|
#include <dmalloc.h>
|
||||||
|
#endif /*WITH_DMALLOC*/
|
||||||
|
|
||||||
|
static int
|
||||||
|
greyc_vec( im_object *argv )
|
||||||
|
{
|
||||||
|
IMAGE *src = (IMAGE *) argv[0];
|
||||||
|
IMAGE *dst = (IMAGE *) argv[1];
|
||||||
|
|
||||||
|
int iterations = *((int *) argv[2]);
|
||||||
|
double amplitude = *((double *) argv[3]);
|
||||||
|
double sharpness = *((double *) argv[4]);
|
||||||
|
double anisotropy = *((double *) argv[5]);
|
||||||
|
double alpha = *((double *) argv[6]);
|
||||||
|
double sigma = *((double *) argv[7]);
|
||||||
|
double dl = *((double *) argv[8]);
|
||||||
|
double da = *((double *) argv[9]);
|
||||||
|
double gauss_prec = *((double *) argv[10]);
|
||||||
|
int interpolation = *((int *) argv[11]);
|
||||||
|
int fast_approx = *((int *) argv[12]);
|
||||||
|
|
||||||
|
if( im_greyc_mask( src, dst, NULL,
|
||||||
|
iterations,
|
||||||
|
amplitude, sharpness, anisotropy,
|
||||||
|
alpha, sigma,
|
||||||
|
dl, da, gauss_prec,
|
||||||
|
interpolation, fast_approx ) )
|
||||||
|
return( -1 );
|
||||||
|
|
||||||
|
return( 0 );
|
||||||
|
}
|
||||||
|
|
||||||
|
static im_arg_desc greyc_arg_types[] = {
|
||||||
|
IM_INPUT_IMAGE( "src" ),
|
||||||
|
IM_OUTPUT_IMAGE( "dst" ),
|
||||||
|
IM_INPUT_INT( "iterations" ),
|
||||||
|
IM_INPUT_DOUBLE( "amplitude" ),
|
||||||
|
IM_INPUT_DOUBLE( "sharpness" ),
|
||||||
|
IM_INPUT_DOUBLE( "anisotropy" ),
|
||||||
|
IM_INPUT_DOUBLE( "alpha" ),
|
||||||
|
IM_INPUT_DOUBLE( "sigma" ),
|
||||||
|
IM_INPUT_DOUBLE( "dl" ),
|
||||||
|
IM_INPUT_DOUBLE( "da" ),
|
||||||
|
IM_INPUT_DOUBLE( "gauss_prec" ),
|
||||||
|
IM_INPUT_INT( "interpolation" ),
|
||||||
|
IM_INPUT_INT( "fast_approx" )
|
||||||
|
};
|
||||||
|
|
||||||
|
static im_function greyc_desc = {
|
||||||
|
"im_greyc", /* Name */
|
||||||
|
"noise-removing filter", /* Description */
|
||||||
|
(im_fn_flags) (IM_FN_TRANSFORM | IM_FN_PIO),/* Flags */
|
||||||
|
greyc_vec, /* Dispatch function */
|
||||||
|
IM_NUMBER( greyc_arg_types ), /* Size of arg list */
|
||||||
|
greyc_arg_types /* Arg list */
|
||||||
|
};
|
||||||
|
|
||||||
|
static int
|
||||||
|
greyc_mask_vec( im_object *argv )
|
||||||
|
{
|
||||||
|
IMAGE *src = (IMAGE *) argv[0];
|
||||||
|
IMAGE *dst = (IMAGE *) argv[1];
|
||||||
|
IMAGE *mask = (IMAGE *) argv[2];
|
||||||
|
|
||||||
|
int iterations = *((int *) argv[3]);
|
||||||
|
double amplitude = *((double *) argv[4]);
|
||||||
|
double sharpness = *((double *) argv[5]);
|
||||||
|
double anisotropy = *((double *) argv[6]);
|
||||||
|
double alpha = *((double *) argv[7]);
|
||||||
|
double sigma = *((double *) argv[8]);
|
||||||
|
double dl = *((double *) argv[9]);
|
||||||
|
double da = *((double *) argv[10]);
|
||||||
|
double gauss_prec = *((double *) argv[11]);
|
||||||
|
int interpolation = *((int *) argv[12]);
|
||||||
|
int fast_approx = *((int *) argv[13]);
|
||||||
|
|
||||||
|
if( im_greyc_mask( src, dst, mask,
|
||||||
|
iterations,
|
||||||
|
amplitude, sharpness, anisotropy,
|
||||||
|
alpha, sigma,
|
||||||
|
dl, da, gauss_prec,
|
||||||
|
interpolation, fast_approx ) )
|
||||||
|
return( -1 );
|
||||||
|
|
||||||
|
return( 0 );
|
||||||
|
}
|
||||||
|
|
||||||
|
static im_arg_desc greyc_mask_arg_types[] = {
|
||||||
|
IM_INPUT_IMAGE( "src" ),
|
||||||
|
IM_OUTPUT_IMAGE( "dst" ),
|
||||||
|
IM_INPUT_IMAGE( "mask" ),
|
||||||
|
IM_INPUT_INT( "iterations" ),
|
||||||
|
IM_INPUT_DOUBLE( "amplitude" ),
|
||||||
|
IM_INPUT_DOUBLE( "sharpness" ),
|
||||||
|
IM_INPUT_DOUBLE( "anisotropy" ),
|
||||||
|
IM_INPUT_DOUBLE( "alpha" ),
|
||||||
|
IM_INPUT_DOUBLE( "sigma" ),
|
||||||
|
IM_INPUT_DOUBLE( "dl" ),
|
||||||
|
IM_INPUT_DOUBLE( "da" ),
|
||||||
|
IM_INPUT_DOUBLE( "gauss_prec" ),
|
||||||
|
IM_INPUT_INT( "interpolation" ),
|
||||||
|
IM_INPUT_INT( "fast_approx" )
|
||||||
|
};
|
||||||
|
|
||||||
|
static im_function greyc_mask_desc = {
|
||||||
|
"im_greyc_mask", /* Name */
|
||||||
|
"noise-removing filter, with a mask", /* Description */
|
||||||
|
(im_fn_flags) (IM_FN_TRANSFORM | IM_FN_PIO),/* Flags */
|
||||||
|
greyc_mask_vec, /* Dispatch function */
|
||||||
|
IM_NUMBER( greyc_mask_arg_types ),/* Size of arg list */
|
||||||
|
greyc_mask_arg_types /* Arg list */
|
||||||
|
};
|
||||||
|
|
||||||
|
static im_function *function_list[] = {
|
||||||
|
&greyc_desc,
|
||||||
|
&greyc_mask_desc
|
||||||
|
};
|
||||||
|
|
||||||
|
/* Package of functions.
|
||||||
|
*/
|
||||||
|
im_package im__cimg = {
|
||||||
|
"cimg",
|
||||||
|
IM_NUMBER( function_list ),
|
||||||
|
function_list
|
||||||
|
};
|
||||||
Loading…
x
Reference in New Issue
Block a user