This commit is contained in:
John Cupitt 2008-10-15 20:09:22 +00:00
parent 61db0a62b0
commit c45988c4a7
7 changed files with 427 additions and 0 deletions

View File

@ -4,6 +4,7 @@ pkginclude_HEADERS = \
VImage.h \
VMask.h \
vipscpp.h \
vobject.h \
colour.h \
debug.h \
dispatch.h \

View File

@ -0,0 +1,69 @@
/* Various interpolators.
*
* J.Cupitt, 15/10/08
*/
/*
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
*/
#ifndef IM_INTERPOLATE_H
#define IM_INTERPOLATE_H
#ifdef __cplusplus
extern "C" {
#endif /*__cplusplus*/
#define TYPE_MODEL (model_get_type())
#define MODEL( obj ) \
(G_TYPE_CHECK_INSTANCE_CAST( (obj), TYPE_MODEL, Model ))
#define MODEL_CLASS( klass ) \
(G_TYPE_CHECK_CLASS_CAST( (klass), TYPE_MODEL, ModelClass))
#define IS_MODEL( obj ) \
(G_TYPE_CHECK_INSTANCE_TYPE( (obj), TYPE_MODEL ))
#define IS_MODEL_CLASS( klass ) \
(G_TYPE_CHECK_CLASS_TYPE( (klass), TYPE_MODEL ))
#define MODEL_GET_CLASS( obj ) \
(G_TYPE_INSTANCE_GET_CLASS( (obj), TYPE_MODEL, ModelClass ))
struct _Model {
iContainer parent;
/* My instance vars.
*/
};
typedef struct _ModelClass {
iContainerClass parent_class;
} ModelClass;
#ifdef __cplusplus
}
#endif /*__cplusplus*/
#endif /*IM_REGION_H*/

View File

@ -89,11 +89,13 @@ extern "C" {
#include <glib.h>
#include <gmodule.h>
#include <glib-object.h>
/* Needed for 'unused' below. Remove this when we remove that.
*/
#include <time.h>
#include <vips/vobject.h>
#include <vips/version.h>
#include <vips/rect.h>

84
include/vips/vobject.h Normal file
View File

@ -0,0 +1,84 @@
/* abstract base class for all vips objects
*/
/*
Copyright (C) 1991-2003 The National Gallery
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU 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 General Public License for more details.
You should have received a copy of the GNU 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
*/
#define TYPE_VOBJECT (vobject_get_type())
#define VOBJECT( obj ) \
(G_TYPE_CHECK_INSTANCE_CAST( (obj), TYPE_VOBJECT, VObject ))
#define VOBJECT_CLASS( klass ) \
(G_TYPE_CHECK_CLASS_CAST( (klass), TYPE_VOBJECT, VObjectClass))
#define IS_VOBJECT( obj ) \
(G_TYPE_CHECK_INSTANCE_TYPE( (obj), TYPE_VOBJECT ))
#define IS_VOBJECT_CLASS( klass ) \
(G_TYPE_CHECK_CLASS_TYPE( (klass), TYPE_VOBJECT ))
#define VOBJECT_GET_CLASS( obj ) \
(G_TYPE_INSTANCE_GET_CLASS( (obj), TYPE_VOBJECT, VObjectClass ))
/* Handy vobject_destroy() shortcut.
*/
#define IDESTROY( O ) { \
if( O ) { \
(void) vobject_destroy( VOBJECT( O ) ); \
( O ) = NULL; \
} \
}
typedef struct _VObject {
GObject parent_object;
/* True when created ... the 1 reference that gobject makes is
* 'floating' and not owned by anyone. Do _sink() after every _ref()
* to transfer ownership to the parent container. Upshot: no need to
* _unref() after _add() in _new().
*/
gboolean floating;
/* Stop destroy loops with this.
*/
gboolean in_destruction;
} VObject;
typedef struct _VObjectClass {
GObjectClass parent_class;
/* End object's lifetime, just like gtk_object_destroy.
*/
void (*destroy)( VObject * );
/* Something about the object has changed. Should use glib's properties
* but fix this later.
*/
void (*changed)( VObject * );
} VObjectClass;
void *vobject_destroy( VObject *vobject );
void *vobject_changed( VObject *vobject );
void vobject_sink( VObject *vobject );
GType vobject_get_type( void );

View File

@ -1,6 +1,7 @@
noinst_LTLIBRARIES = libiofuncs.la
libiofuncs_la_SOURCES = \
vobject.c \
meta.c \
base64.h \
base64.c \

216
libsrc/iofuncs/vobject.c Normal file
View File

@ -0,0 +1,216 @@
/* abstract base class for all vips objects
*
* Edited from nip's base class, 15/10/08
*/
/*
Copyright (C) 1991-2003 The National Gallery
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU 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 General Public License for more details.
You should have received a copy of the GNU 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
*/
/*
#define DEBUG
*/
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif /*HAVE_CONFIG_H*/
#include <vips/intl.h>
#include <stdio.h>
#include <vips/vips.h>
#include <vips/internal.h>
#ifdef WITH_DMALLOC
#include <dmalloc.h>
#endif /*WITH_DMALLOC*/
/* Our signals.
*/
enum {
SIG_DESTROY, /* End lifetime */
SIG_CHANGED, /* VObject has changed somehow */
SIG_LAST
};
static GObjectClass *parent_class = NULL;
static guint vobject_signals[SIG_LAST] = { 0 };
/* Don't emit "destroy" immediately, do it from the _dispose handler.
*/
void *
vobject_destroy( VObject *vobject )
{
#ifdef DEBUG
printf( "vobject_destroy: " );
vobject_print( vobject );
#endif /*DEBUG*/
if( !vobject->in_destruction )
g_object_run_dispose( G_OBJECT( vobject ) );
return( NULL );
}
void *
vobject_changed( VObject *vobject )
{
g_return_val_if_fail( vobject != NULL, NULL );
g_return_val_if_fail( IS_VOBJECT( vobject ), NULL );
#ifdef DEBUG
printf( "vobject_changed: " );
vobject_print( vobject );
#endif /*DEBUG*/
g_signal_emit( G_OBJECT( vobject ), vobject_signals[SIG_CHANGED], 0 );
return( NULL );
}
static void
vobject_dispose( GObject *gobject )
{
VObject *vobject = VOBJECT( gobject );
#ifdef DEBUG
printf( "vobject_dispose: " );
vobject_print( vobject );
#endif /*DEBUG*/
if( !vobject->in_destruction ) {
vobject->in_destruction = TRUE;
g_signal_emit( G_OBJECT( vobject ),
vobject_signals[SIG_DESTROY], 0 );
vobject->in_destruction = FALSE;
}
G_OBJECT_CLASS( parent_class )->dispose( gobject );
}
static void
vobject_finalize( GObject *gobject )
{
#ifdef DEBUG
VObject *vobject = VOBJECT( gobject );
printf( "vobject_finalize: " );
vobject_print( vobject );
#endif /*DEBUG*/
/* Unlike GTK, we allow floating objects to be finalized. Handy if a
* _new() fails. So don't assert( !vobject->floating );
*/
G_OBJECT_CLASS( parent_class )->finalize( gobject );
}
static void
vobject_real_destroy( VObject *vobject )
{
}
static void
vobject_real_changed( VObject *vobject )
{
}
static void
vobject_class_init( VObjectClass *class )
{
GObjectClass *gobject_class = G_OBJECT_CLASS( class );
parent_class = g_type_class_peek_parent( class );
gobject_class->dispose = vobject_dispose;
gobject_class->finalize = vobject_finalize;
class->destroy = vobject_real_destroy;
class->changed = vobject_real_changed;
vobject_signals[SIG_DESTROY] = g_signal_new( "destroy",
G_TYPE_FROM_CLASS( gobject_class ),
G_SIGNAL_RUN_CLEANUP | G_SIGNAL_NO_RECURSE | G_SIGNAL_NO_HOOKS,
G_STRUCT_OFFSET( VObjectClass, destroy ),
NULL, NULL,
g_cclosure_marshal_VOID__VOID,
G_TYPE_NONE, 0 );
vobject_signals[SIG_CHANGED] = g_signal_new( "changed",
G_OBJECT_CLASS_TYPE( gobject_class ),
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET( VObjectClass, changed ),
NULL, NULL,
g_cclosure_marshal_VOID__VOID,
G_TYPE_NONE, 0 );
}
static void
vobject_init( VObject *vobject )
{
#ifdef DEBUG
printf( "vobject_init: " );
vobject_print( vobject );
#endif /*DEBUG*/
vobject->floating = TRUE;
vobject->in_destruction = FALSE;
}
GType
vobject_get_type( void )
{
static GType vobject_type = 0;
if( !vobject_type ) {
static const GTypeInfo info = {
sizeof( VObjectClass ),
NULL, /* base_init */
NULL, /* base_finalize */
(GClassInitFunc) vobject_class_init,
NULL, /* class_finalize */
NULL, /* class_data */
sizeof( VObject ),
32, /* n_preallocs */
(GInstanceInitFunc) vobject_init,
};
vobject_type = g_type_register_static( G_TYPE_OBJECT,
"VObject", &info, 0 );
}
return( vobject_type );
}
void
vobject_sink( VObject *vobject )
{
g_assert( IS_VOBJECT( vobject ) );
if( vobject->floating ) {
vobject->floating = FALSE;
g_object_unref( G_OBJECT( vobject ) );
}
}

View File

@ -0,0 +1,54 @@
/* im_interpolate ... abstract base class for various interpolators
*
* J. Cupitt, 15/10/08
*/
/*
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
*/
/*
#define 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 <limits.h>
#include <vips/vips.h>
#include <vips/internal.h>
#ifdef WITH_DMALLOC
#include <dmalloc.h>
#endif /*WITH_DMALLOC*/