From 30a617797008eb7b9cb4243d64c8b95085b68ad5 Mon Sep 17 00:00:00 2001 From: Henrik Wallin <hedda@lysator.liu.se> Date: Mon, 1 Mar 1999 22:47:47 +0100 Subject: [PATCH] The functions in search.c are added. Rev: src/modules/Image/Makefile.in:1.19 Rev: src/modules/Image/image.c:1.114 Rev: src/modules/Image/image.h:1.24 --- src/modules/Image/Makefile.in | 4 ++-- src/modules/Image/image.c | 36 ++++++++++++++++++++++++++++++----- src/modules/Image/image.h | 17 ++++++++++++++++- 3 files changed, 49 insertions(+), 8 deletions(-) diff --git a/src/modules/Image/Makefile.in b/src/modules/Image/Makefile.in index 11e4ce8b0c..3547a4f951 100644 --- a/src/modules/Image/Makefile.in +++ b/src/modules/Image/Makefile.in @@ -1,9 +1,9 @@ -# $Id: Makefile.in,v 1.18 1999/01/22 01:01:09 mirar Exp $ +# $Id: Makefile.in,v 1.19 1999/03/01 21:47:47 hedda Exp $ SRCDIR=@srcdir@ VPATH=@srcdir@:@srcdir@/../..:../.. OBJS = image.o font.o togif.o matrix.o pnm.o blit.o \ pattern.o dct.o operator.o x.o colortable.o polyfill.o \ - orient.o colors.o + orient.o colors.o search.o MODNAME=image MODULE_SUBDIRS=encodings MODULE_ARCHIVES=encodings/encodings.a diff --git a/src/modules/Image/image.c b/src/modules/Image/image.c index 29f20e6c75..35e8600df6 100644 --- a/src/modules/Image/image.c +++ b/src/modules/Image/image.c @@ -1,9 +1,9 @@ -/* $Id: image.c,v 1.113 1999/02/24 03:18:03 mirar Exp $ */ +/* $Id: image.c,v 1.114 1999/03/01 21:47:42 hedda Exp $ */ /* **! module Image **! note -**! $Id: image.c,v 1.113 1999/02/24 03:18:03 mirar Exp $ +**! $Id: image.c,v 1.114 1999/03/01 21:47:42 hedda Exp $ **! class image **! **! The main object of the <ref>Image</ref> module, this object @@ -97,7 +97,7 @@ #include "stralloc.h" #include "global.h" -RCSID("$Id: image.c,v 1.113 1999/02/24 03:18:03 mirar Exp $"); +RCSID("$Id: image.c,v 1.114 1999/03/01 21:47:42 hedda Exp $"); #include "pike_macros.h" #include "object.h" #include "constants.h" @@ -3763,7 +3763,7 @@ void pike_module_init(void) ADD_FUNCTION("sumf",image_sumf,tFunc(,tArr(tInt)),0); /* function(:array(int)) */ ADD_FUNCTION("average",image_average,tFunc(,tArr(tInt)),0); - + /* function(:array(int))|" "function(int,int,int:array(int)) */ ADD_FUNCTION("find_min",image_find_min,tOr(tFunc(,tArr(tInt)),tFunc(tInt tInt tInt,tArr(tInt))),0); @@ -3784,7 +3784,33 @@ void pike_module_init(void) ADD_FUNCTION("orient4",image_orient4,tFunc(,tArr(tObj)),0); /* function(:object) */ ADD_FUNCTION("orient",image_orient,tFunc(,tObj),0); - + + /* function(:object) */ + ADD_FUNCTION("phaseh",image_phaseh,tFunc(,tObj),0); + /* function(:object) */ + ADD_FUNCTION("phasev",image_phasev,tFunc(,tObj),0); + /* function(:object) */ + ADD_FUNCTION("phasehv",image_phasehv,tFunc(,tObj),0); + /* function(:object) */ + ADD_FUNCTION("phasevh",image_phasevh,tFunc(,tObj),0); + /* function(int|float,object:object)" + "|function(int|float,object,object,object:object)" + "|function(int|float,object,object,int:object)" + "|function(int|float,object,object,object,object,int:object) */ + ADD_FUNCTION("match_phase",image_match_phase, + tOr4(tFunc(tOr(tInt,tFloat) tObj,tObj),tFunc(tOr(tInt,tFloat) tObj tObj tObj,tObj),tFunc(tOr(tInt,tFloat) tObj tObj tInt,tObj),tFunc(tOr(tInt,tFloat) tObj tObj tObj tObj tInt,tObj)),0); + ADD_FUNCTION("match_norm",image_match_norm, + tOr4(tFunc(tOr(tInt,tFloat) tObj,tObj),tFunc(tOr(tInt,tFloat) tObj tObj tObj,tObj),tFunc(tOr(tInt,tFloat) tObj tObj tInt,tObj),tFunc(tOr(tInt,tFloat) tObj tObj tObj tObj tInt,tObj)),0); + ADD_FUNCTION("match_norm_corr",image_match_norm_corr, + tOr4(tFunc(tOr(tInt,tFloat) tObj,tObj),tFunc(tOr(tInt,tFloat) tObj tObj tObj,tObj),tFunc(tOr(tInt,tFloat) tObj tObj tInt,tObj),tFunc(tOr(tInt,tFloat) tObj tObj tObj tObj tInt,tObj)),0); + ADD_FUNCTION("match",image_match, + tOr4(tFunc(tOr(tInt,tFloat) tObj,tObj),tFunc(tOr(tInt,tFloat) tObj tObj tObj,tObj),tFunc(tOr(tInt,tFloat) tObj tObj tInt,tObj),tFunc(tOr(tInt,tFloat) tObj tObj tObj tObj tInt,tObj)),0); + + /* function(array(array(int|array(int))), void|int ...:object) */ + ADD_FUNCTION("apply_max",image_apply_max,tFuncV(tArr(tArr(tOr(tInt,tArr(tInt)))),tOr(tVoid,tInt),tObj),0); + /* function(object,object,object,object,int|void,int|void:string) */ + ADD_FUNCTION("make_ascii",image_make_ascii,tFunc(tObj tObj tObj tObj tOr(tInt,tVoid),tStr),0); + /* function(void|int:object) */ ADD_FUNCTION("test",image_test,tFunc(tOr(tVoid,tInt),tObj),0); diff --git a/src/modules/Image/image.h b/src/modules/Image/image.h index 539320c299..14ba00f0c7 100644 --- a/src/modules/Image/image.h +++ b/src/modules/Image/image.h @@ -1,7 +1,7 @@ /* **! module Image **! note -**! $Id: image.h,v 1.23 1999/01/26 02:02:33 mirar Exp $ +**! $Id: image.h,v 1.24 1999/03/01 21:47:35 hedda Exp $ */ #ifdef PIKE_IMAGE_IMAGE_H @@ -180,3 +180,18 @@ void image_polyfill(INT32 args); void image_orient(INT32 args); void image_orient4(INT32 args); + +/* search.c */ + +void image_match_phase(INT32 args); +void image_match_norm(INT32 args); +void image_match_norm_corr(INT32 args); +void image_match(INT32 args); + +void image_phaseh(INT32 args); +void image_phasev(INT32 args); +void image_phasehv(INT32 args); +void image_phasevh(INT32 args); +void image_apply_max(INT32 args); + +void image_make_ascii(INT32 args); -- GitLab