Pd-cvs March 2008

pd-cvs@lists.iem.at

20 participants
221 discussions

SF.net SVN: pure-data: [9571] trunk/externals/Makefile
by eighthave＠users.sourceforge.net 12 Mar '08

12 Mar '08

Revision: 9571 http://pure-data.svn.sourceforge.net/pure-data/?rev=9571&view=rev Author: eighthave Date: 2008-03-11 21:28:04 -0700 (Tue, 11 Mar 2008) Log Message: ----------- added 'apple' lib to the default build on Mac OS X Modified Paths: -------------- trunk/externals/Makefile Modified: trunk/externals/Makefile =================================================================== --- trunk/externals/Makefile 2008-03-12 04:26:06 UTC (rev 9570) +++ trunk/externals/Makefile 2008-03-12 04:28:04 UTC (rev 9571) @@ -131,7 +131,7 @@ LIB_TARGETS += pdlua else ifeq ($(OS_NAME),darwin) - LIB_TARGETS += hid hidio pdp pidip gem2pdp aka.wiiremote iem16 usbhid pdlua + LIB_TARGETS += hid hidio pdp pidip gem2pdp aka.wiiremote iem16 usbhid pdlua apple else # GNU/Linux, BSD, IRIX, etc. LIB_TARGETS += hid hidio pdp pidip gem2pdp hdspm_mixer iem16 postlude @@ -304,7 +304,42 @@ -rm -f -- $(externals_src)/io/aka.wiiremote/*.bak -rm -f -- $(externals_src)/io/aka.wiiremote/*.*~ + + #------------------------------------------------------------------------------# +# APPLE +APPLE_NAME=apple +APPLE_OBJECTS := $(wildcard $(externals_src)/apple/*.c) +apple: $(APPLE_OBJECTS:.c=.$(EXTENSION)) + +apple_install: apple + install -d $(objectsdir)/$(APPLE_NAME) + $(scripts_src)/generate-libdir-metafile.sh $(objectsdir) $(APPLE_NAME) \ + --author "Hans-Christoph Steiner" \ + --description "support for Apple-specific functions" \ + --license "GPLv2 or later" + install -p $(APPLE_OBJECTS:.c=.$(EXTENSION)) $(objectsdir)/$(APPLE_NAME) + install -d $(helpdir)/$(APPLE_NAME) + install -p $(externals_src)/apple/*-help.pd \ + $(helpdir)/$(APPLE_NAME) +# install -d $(manualsdir)/$(APPLE_NAME) +# install -p $(externals_src)/apple/manual.txt \ +# $(manualsdir)/$(APPLE_NAME) +# install -d $(readmesdir) +# install -p $(externals_src)/apple/README \ +# $(readmesdir)/$(APPLE_NAME).txt +# install -d $(examplesdir)/$(APPLE_NAME) +# install -p $(externals_src)/apple/examples/*.pd \ +# $(examplesdir)/$(APPLE_NAME) + +apple_clean: + -rm -f -- $(APPLE_OBJECTS:.c=.$(EXTENSION)) + -rm -f -- $(APPLE_OBJECTS:.c=.o) + -rm -f -- $(externals_src)/apple/*.bak + -rm -f -- $(externals_src)/apple/*.*~ + + +#------------------------------------------------------------------------------# # BASSEMU BASSEMU_NAME=bassemu BASSEMU_OBJECTS := $(wildcard $(externals_src)/bassemu/*.c) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: pure-data: [9570] trunk/externals/apple/iodisplay-help.pd
by eighthave＠users.sourceforge.net 12 Mar '08

12 Mar '08

Revision: 9570 http://pure-data.svn.sourceforge.net/pure-data/?rev=9570&view=rev Author: eighthave Date: 2008-03-11 21:26:06 -0700 (Tue, 11 Mar 2008) Log Message: ----------- added other key types from IOGraphicsTypes.h Modified Paths: -------------- trunk/externals/apple/iodisplay-help.pd Modified: trunk/externals/apple/iodisplay-help.pd =================================================================== --- trunk/externals/apple/iodisplay-help.pd 2008-03-12 04:20:55 UTC (rev 9569) +++ trunk/externals/apple/iodisplay-help.pd 2008-03-12 04:26:06 UTC (rev 9570) @@ -1,13 +1,28 @@ -#N canvas 293 113 462 312 10; +#N canvas 738 22 521 540 10; #X msg 127 72 bang; #X obj 149 97 hsl 128 15 0 1 0 0 empty empty empty -2 -8 0 10 -262144 --1 -1 5800 1; +-1 -1 3100 1; #X floatatom 162 121 5 0 0 0 - - -; +#X text 81 287 some other possibilities (from IOKit/graphics/IOGraphicsTypes.h): +; +#X text 114 319 brightness; +#X text 114 339 contrast; +#X text 114 359 horizontal-position; +#X text 114 379 horizontal-size; +#X text 114 399 vertical-position; +#X text 114 419 trapezoid; +#X text 114 439 pincushion; +#X text 114 459 parallelogram; +#X text 254 319 rotation; +#X text 254 339 theatre-mode; +#X text 254 359 theatre-mode-window; +#X text 254 379 oscn; +#X text 254 399 vbst; +#X text 254 419 commit; +#X text 254 439 defaults; +#X obj 128 202 pddp/print; #X obj 127 155 iodisplay brightness; -#X obj 132 191 route brightness; -#X floatatom 131 225 5 0 0 0 - - -; -#X connect 0 0 3 0; +#X connect 0 0 20 0; #X connect 1 0 2 0; -#X connect 1 0 3 0; -#X connect 3 0 4 0; -#X connect 4 0 5 0; +#X connect 1 0 20 0; +#X connect 20 0 19 0; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: pure-data: [9569] trunk/externals
by eighthave＠users.sourceforge.net 12 Mar '08

12 Mar '08

Revision: 9569 http://pure-data.svn.sourceforge.net/pure-data/?rev=9569&view=rev Author: eighthave Date: 2008-03-11 21:20:55 -0700 (Tue, 11 Mar 2008) Log Message: ----------- added first object for a new library to support Apple-specific hardware and software functions, like screen brightness Added Paths: ----------- trunk/externals/apple/ trunk/externals/apple/Makefile trunk/externals/apple/brightness-help.pd trunk/externals/apple/brightness.pd trunk/externals/apple/iodisplay-help.pd trunk/externals/apple/iodisplay.c trunk/externals/apple/iodisplay.libs Added: trunk/externals/apple/Makefile =================================================================== --- trunk/externals/apple/Makefile (rev 0) +++ trunk/externals/apple/Makefile 2008-03-12 04:20:55 UTC (rev 9569) @@ -0,0 +1,17 @@ +TARGET := $(shell pwd | sed 's|.*/$.*$$$|\1|') +EXTERNALS_ROOT := $(shell pwd | sed 's|^$/.*externals$.*|\1|') + +default: + make -C $(EXTERNALS_ROOT) $(TARGET) + +install: + make -C $(EXTERNALS_ROOT) $(TARGET)_install + +clean: + make -C $(EXTERNALS_ROOT) $(TARGET)_clean + +test_locations: + make -C $(EXTERNALS_ROOT) test_locations + +etags: + etags *.[ch] ~/code/pure-data/trunk/pd/src/*.[ch] /usr/include/*.h /usr/include/sys/*.h Added: trunk/externals/apple/brightness-help.pd =================================================================== --- trunk/externals/apple/brightness-help.pd (rev 0) +++ trunk/externals/apple/brightness-help.pd 2008-03-12 04:20:55 UTC (rev 9569) @@ -0,0 +1,11 @@ +#N canvas 293 113 450 300 10; +#X msg 127 72 bang; +#X floatatom 127 186 5 0 0 0 - - -; +#X obj 149 97 hsl 128 15 0 1 0 0 empty empty empty -2 -8 0 10 -262144 +-1 -1 6800 1; +#X floatatom 162 121 5 0 0 0 - - -; +#X obj 127 155 brightness; +#X connect 0 0 4 0; +#X connect 2 0 3 0; +#X connect 2 0 4 0; +#X connect 4 0 1 0; Added: trunk/externals/apple/brightness.pd =================================================================== --- trunk/externals/apple/brightness.pd (rev 0) +++ trunk/externals/apple/brightness.pd 2008-03-12 04:20:55 UTC (rev 9569) @@ -0,0 +1,11 @@ +#N canvas 0 22 454 304 10; +#X obj 135 113 iodisplay brightness; +#X obj 135 141 route brightness; +#X obj 131 49 inlet; +#X obj 135 184 outlet; +#X obj 132 79 route float bang; +#X connect 0 0 1 0; +#X connect 1 0 3 0; +#X connect 2 0 4 0; +#X connect 4 0 0 0; +#X connect 4 1 0 0; Added: trunk/externals/apple/iodisplay-help.pd =================================================================== --- trunk/externals/apple/iodisplay-help.pd (rev 0) +++ trunk/externals/apple/iodisplay-help.pd 2008-03-12 04:20:55 UTC (rev 9569) @@ -0,0 +1,13 @@ +#N canvas 293 113 462 312 10; +#X msg 127 72 bang; +#X obj 149 97 hsl 128 15 0 1 0 0 empty empty empty -2 -8 0 10 -262144 +-1 -1 5800 1; +#X floatatom 162 121 5 0 0 0 - - -; +#X obj 127 155 iodisplay brightness; +#X obj 132 191 route brightness; +#X floatatom 131 225 5 0 0 0 - - -; +#X connect 0 0 3 0; +#X connect 1 0 2 0; +#X connect 1 0 3 0; +#X connect 3 0 4 0; +#X connect 4 0 5 0; Added: trunk/externals/apple/iodisplay.c =================================================================== --- trunk/externals/apple/iodisplay.c (rev 0) +++ trunk/externals/apple/iodisplay.c 2008-03-12 04:20:55 UTC (rev 9569) @@ -0,0 +1,124 @@ +/* --------------------------------------------------------------------------*/ +/* */ +/* control the iodisplay of the display on Apple Mac OS X */ +/* Written by Hans-Christoph Steiner <hans(a)at.or.at> */ +/* */ +/* Copyright (c) 2008 Free Software Foundation */ +/* */ +/* 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. */ +/* */ +/* See file LICENSE for further informations on licensing terms. */ +/* */ +/* 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, */ +/* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +/* */ +/* --------------------------------------------------------------------------*/ + +#include <IOKit/graphics/IOGraphicsLib.h> +#include <ApplicationServices/ApplicationServices.h> +#include <m_pd.h> + +#define DEBUG(x) +//#define DEBUG(x) x + +/*------------------------------------------------------------------------------ + * CLASS DEF + */ + +static t_class *iodisplay_class; + +typedef struct _iodisplay { + t_object x_obj; + t_float parameter_value; + io_service_t io_service; + CGDirectDisplayID target_display; + t_symbol* parameter; +} t_iodisplay; + +/*------------------------------------------------------------------------------ + * IMPLEMENTATION + */ + +static void iodisplay_output(t_iodisplay* x) +{ + DEBUG(post("iodisplay_output");); + CFStringRef cfs_parameter; + CGDisplayErr err; + t_atom output_atom; + + cfs_parameter = CFStringCreateWithCString(kCFAllocatorDefault, + x->parameter->s_name, + kCFStringEncodingASCII); + err = IODisplayGetFloatParameter(x->io_service, kNilOptions, + cfs_parameter, &(x->parameter_value)); + if (err != kIOReturnSuccess) + pd_error(x,"[iodisplay]: couldn't get %s value", x->parameter->s_name); + + SETFLOAT(&output_atom, x->parameter_value); + outlet_anything(x->x_obj.ob_outlet, x->parameter, 1, &output_atom); +} + + +static void iodisplay_float(t_iodisplay* x, t_float f) +{ + DEBUG(post("iodisplay_float");); + CFStringRef cfs_parameter; + CGDisplayErr err; + + if (f < 0.) x->parameter_value = 0.; + else if (f > 1.) x->parameter_value = 1.; + else x->parameter_value = f; + + cfs_parameter = CFStringCreateWithCString(kCFAllocatorDefault, + x->parameter->s_name, + kCFStringEncodingASCII); + err = IODisplaySetFloatParameter(x->io_service, kNilOptions, + cfs_parameter, x->parameter_value); + if (err != kIOReturnSuccess) + pd_error(x,"[iodisplay]: couldn't set %s", x->parameter->s_name); +} + + +static void iodisplay_free(t_iodisplay* x) +{ + DEBUG(post("iodisplay_free");); +} + + +static void *iodisplay_new(t_symbol *s) +{ + DEBUG(post("iodisplay_new");); + t_iodisplay *x = (t_iodisplay *)pd_new(iodisplay_class); + + x->target_display = CGMainDisplayID(); + x->io_service = CGDisplayIOServicePort(x->target_display); + x->parameter = s; + + symbolinlet_new(&x->x_obj, &x->parameter); + outlet_new(&x->x_obj, &s_anything); + + return (x); +} + +void iodisplay_setup(void) +{ + iodisplay_class = class_new(gensym("iodisplay"), + (t_newmethod)iodisplay_new, + (t_method)iodisplay_free, + sizeof(t_iodisplay), + CLASS_DEFAULT, + A_DEFSYMBOL, 0); + + /* add inlet datatype methods */ + class_addbang(iodisplay_class,(t_method) iodisplay_output); + class_addfloat(iodisplay_class,(t_method) iodisplay_float); +} Added: trunk/externals/apple/iodisplay.libs =================================================================== --- trunk/externals/apple/iodisplay.libs (rev 0) +++ trunk/externals/apple/iodisplay.libs 2008-03-12 04:20:55 UTC (rev 9569) @@ -0,0 +1 @@ +-framework IOKit This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: pure-data: [9568] trunk/externals/OSCx
by eighthave＠users.sourceforge.net 12 Mar '08

12 Mar '08

Revision: 9568 http://pure-data.svn.sourceforge.net/pure-data/?rev=9568&view=rev Author: eighthave Date: 2008-03-11 16:31:15 -0700 (Tue, 11 Mar 2008) Log Message: ----------- added -fPIC and changed wildcard to support 64-bit builds on GNU/Linux Modified Paths: -------------- trunk/externals/OSCx/configure trunk/externals/OSCx/configure.ac Modified: trunk/externals/OSCx/configure =================================================================== --- trunk/externals/OSCx/configure 2008-03-11 23:00:31 UTC (rev 9567) +++ trunk/externals/OSCx/configure 2008-03-11 23:31:15 UTC (rev 9568) @@ -4409,8 +4409,8 @@ esac else case $host in - *86-*-linux*) - CFLAGS="$CFLAGS -DUNIX -Wall -Wimplicit -Wunused -Wmissing-prototypes -O2" + *86*-linux*) + CFLAGS="$CFLAGS -DUNIX -Wall -Wimplicit -Wunused -Wmissing-prototypes -O2 -fPIC" LDFLAGS="-Wl,-export_dynamic -shared" pd_suffix=pd_linux LIBS="-lc -lm" Modified: trunk/externals/OSCx/configure.ac =================================================================== --- trunk/externals/OSCx/configure.ac 2008-03-11 23:00:31 UTC (rev 9567) +++ trunk/externals/OSCx/configure.ac 2008-03-11 23:31:15 UTC (rev 9568) @@ -77,8 +77,8 @@ esac else case $host in - *86-*-linux*) - CFLAGS="$CFLAGS -DUNIX -Wall -Wimplicit -Wunused -Wmissing-prototypes -O2" + *86*-linux*) + CFLAGS="$CFLAGS -DUNIX -Wall -Wimplicit -Wunused -Wmissing-prototypes -O2 -fPIC" LDFLAGS="-Wl,-export_dynamic -shared" dnl we could test for bad glibc here, but don't pd_suffix=pd_linux This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: pure-data: [9567] trunk/externals/pidip/system/pidip.c
by sevyves＠users.sourceforge.net 12 Mar '08

12 Mar '08

Revision: 9567 http://pure-data.svn.sourceforge.net/pure-data/?rev=9567&view=rev Author: sevyves Date: 2008-03-11 16:00:31 -0700 (Tue, 11 Mar 2008) Log Message: ----------- Pidip 0.12.22 Modified Paths: -------------- trunk/externals/pidip/system/pidip.c Modified: trunk/externals/pidip/system/pidip.c =================================================================== --- trunk/externals/pidip/system/pidip.c 2008-03-11 22:57:13 UTC (rev 9566) +++ trunk/externals/pidip/system/pidip.c 2008-03-11 23:00:31 UTC (rev 9567) @@ -79,6 +79,7 @@ void pdp_icedthe_tilde_setup(void); void pdp_fdiff_setup(void); void pdp_hue_setup(void); + void pdp_dot_setup(void); #ifdef __APPLE__ void pdp_ieee1394_setup(void); @@ -173,6 +174,7 @@ pdp_icedthe_tilde_setup(); pdp_fdiff_setup(); pdp_hue_setup(); + pdp_dot_setup(); #ifdef __APPLE__ pdp_ieee1394_setup(); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: pure-data: [9566] trunk/externals/pidip
by sevyves＠users.sourceforge.net 11 Mar '08

11 Mar '08

Revision: 9566 http://pure-data.svn.sourceforge.net/pure-data/?rev=9566&view=rev Author: sevyves Date: 2008-03-11 15:57:13 -0700 (Tue, 11 Mar 2008) Log Message: ----------- Pidip 0.12.22 Modified Paths: -------------- trunk/externals/pidip/CHANGES.LOG trunk/externals/pidip/Makefile.in trunk/externals/pidip/configure.ac trunk/externals/pidip/include/xwindow-private.h trunk/externals/pidip/modules/Makefile.in trunk/externals/pidip/modules/pdp_capture.c Modified: trunk/externals/pidip/CHANGES.LOG =================================================================== --- trunk/externals/pidip/CHANGES.LOG 2008-03-11 22:56:31 UTC (rev 9565) +++ trunk/externals/pidip/CHANGES.LOG 2008-03-11 22:57:13 UTC (rev 9566) @@ -1,3 +1,6 @@ +0.12.22 ( codename Visual Junk ) + added pdp_dot : matrix printer effect + 0.12.21 ( codename Sa'ha Pidip ) fixed synchronisation in pdp_theonice~ Modified: trunk/externals/pidip/Makefile.in =================================================================== --- trunk/externals/pidip/Makefile.in 2008-03-11 22:56:31 UTC (rev 9565) +++ trunk/externals/pidip/Makefile.in 2008-03-11 22:57:13 UTC (rev 9566) @@ -5,8 +5,6 @@ PDP_PIDIP_LIBS = @PDP_PIDIP_LIBS@ IMLIB_CFLAGS = @IMLIB_CFLAGS@ IMLIB_LIBS = @IMLIB_LIBS@ -MAGICK_CFLAGS = @MAGICK_CFLAGS@ -MAGICK_LIBS = @MAGICK_LIBS@ THEORA_LIBS = @THEORA_LIBS@ PDP_PIDIP_INCLUDES = @PDP_PIDIP_INCLUDES@ PDP_PIDIP_VERSION = @PDP_PIDIP_VERSION@ @@ -16,13 +14,13 @@ PDP_PIDIP_TARBALL = $(PDP_PIDIP_DISTRO).tar.gz -PDP_PIDIP_CFLAGS = $(MPEG4IP_CFLAGS) $(MAGICK_CFLAGS) $(IMLIB_CFLAGS) \ +PDP_PIDIP_CFLAGS = $(MPEG4IP_CFLAGS) $(IMLIB_CFLAGS) \ -DPD -DX_DISPLAY_MISSING -O2 -funroll-loops -fomit-frame-pointer -ffast-math \ -Wall -W -Wstrict-prototypes \ -Wno-unused -Wno-parentheses -Wno-switch \ -DPDP_PIDIP_VERSION=\"$(PDP_PIDIP_VERSION)\" -g -PDP_PIDIP_CPPFLAGS = $(MPEG4IP_CFLAGS) $(MAGICK_CFLAGS) $(IMLIB_CFLAGS) \ +PDP_PIDIP_CPPFLAGS = $(MPEG4IP_CFLAGS) $(IMLIB_CFLAGS) \ -DPD -DX_DISPLAY_MISSING -O2 -funroll-loops -fomit-frame-pointer -ffast-math \ -Wall -W -Wstrict-prototypes \ -Wno-unused -Wno-parentheses -Wno-switch \ @@ -42,12 +40,12 @@ pidip.pd_darwin: pdp_pidip_all rm -f pidip.pd_darwin - g++ -bundle -undefined dynamic_lookup -headerpad_max_install_names -o pidip.pd_darwin modules/*.o system/*.o -L/sw/lib $(THEORA_LIBS) $(PDP_PIDIP_LIBS) $(IMLIB_LIBS) $(MAGICK_LIBS) + g++ -bundle -undefined dynamic_lookup -headerpad_max_install_names -o pidip.pd_darwin modules/*.o system/*.o -L/sw/lib $(THEORA_LIBS) $(PDP_PIDIP_LIBS) $(IMLIB_LIBS) strip -x pidip.pd_darwin pidip.pd_linux: pdp_pidip_all rm -f pidip.pd_linux - g++ -export_dynamic -shared -o pidip.pd_linux modules/*.o system/*.o $(THEORA_LIBS) $(PDP_PIDIP_LIBS) $(IMLIB_LIBS) $(MAGICK_LIBS) + g++ -export_dynamic -shared -o pidip.pd_linux modules/*.o system/*.o $(THEORA_LIBS) $(PDP_PIDIP_LIBS) $(IMLIB_LIBS) strip --strip-unneeded pidip.pd_linux clean: @@ -69,10 +67,10 @@ pdp_colorgrid.o: pdp_colorgrid.c ./tk2c.bash < $*.tk > $*.tk2c - PWD=`pwd`; cc -DPWD=\"$(PWD)\" $(PDP_PIDIP_CFLAGS) $(PDP_PIDIP_INCLUDES) -o $*.o -c $*.c + PWD=`pwd`; cc -DPWD=\"$(PWD)\" $(PDP_PIDIP_INCLUDES) $(PDP_PIDIP_CFLAGS) -o $*.o -c $*.c .c.o: - gcc $(PDP_PIDIP_CFLAGS) $(PDP_PIDIP_INCLUDES) -o $*.o -c $*.c + gcc $(PDP_PIDIP_INCLUDES) $(PDP_PIDIP_CFLAGS) -o $*.o -c $*.c .cpp.o: - g++ $(PDP_PIDIP_CPPFLAGS) $(PDP_PIDIP_INCLUDES) -o $*.o -c $*.cpp + g++ $(PDP_PIDIP_INCLUDES) $(PDP_PIDIP_CPPFLAGS) -o $*.o -c $*.cpp Modified: trunk/externals/pidip/configure.ac =================================================================== --- trunk/externals/pidip/configure.ac 2008-03-11 22:56:31 UTC (rev 9565) +++ trunk/externals/pidip/configure.ac 2008-03-11 22:57:13 UTC (rev 9566) @@ -4,7 +4,7 @@ AC_CANONICAL_HOST AC_CONFIG_HEADER(include/pidip_config.h) -PDP_PIDIP_VERSION="0.12.21" +PDP_PIDIP_VERSION="0.12.22" PD_DIR=/usr/local/pd PDP_DIR=/usr/local/pd/pdp FFMPEG_SOURCE_DIR=/SOURCES/ffmpeg @@ -18,6 +18,7 @@ THEORA_LIBS= enable_ffmpeg=no enable_mpeg4ip=no +enable_lcapture=no # Check for DarwinPorts and/or Fink on Mac OS X/Darwin case "$host" in @@ -65,6 +66,12 @@ fi fi +AC_ARG_WITH(enable-capture, [ --enable-capture capture optional object ( only works with Image Magick <= 6.0.7 )]) +if ! test -z "${enable_capture}" +then + enable_lcapture=yes +fi + AC_ARG_WITH(ffmpeg, [ --with-ffmpeg=PATH ffmpeg source tree]) if ! test -z "${with_ffmpeg}" then @@ -116,8 +123,7 @@ AC_MSG_ERROR(Cannot find imlib2: Is imlib2-config in the path?) ) AC_CHECK_LIB(Magick, XWindowByProperty, - [ PDP_CAPTURE_OBJECT="$PDP_CAPTURE_OBJECT pdp_capture.o" - AC_DEFINE(HAVE_IMAGE_MAGICK, 1, image magick capture capability) + [ PDP_CAPTURE_OBJECT="$PDP_CAPTURE_OBJECT" MAGICK_LIBS="-L/usr/X11R6/lib -lMagick `Magick-config --libs` `Magick-config --ldflags`" MAGICK_CFLAGS="-I/usr/X11R6/include `Magick-config --cflags` " ], echo "Image Magick not found : not building pdp_capture", @@ -215,6 +221,15 @@ exit -1 fi +if test $enable_lcapture == yes; +then + PDP_CAPTURE_OBJECT="pdp_capture.o" + AC_DEFINE(HAVE_IMAGE_MAGICK, 1, image magick capture capability) + PDP_PIDIP_LIBS="$MAGICK_LIBS $PDP_PIDIP_LIBS" + PDP_PIDIP_INCLUDES="$MAGICK_CFLAGS $PDP_PIDIP_INCLUDES" + echo "building pdp_capture." +fi + if test $enable_ffmpeg == yes; then echo -n "looking for ffmpeg sources (required) ... " @@ -252,8 +267,6 @@ fi AC_SUBST(PDP_PIDIP_VERSION) -AC_SUBST(MAGICK_LIBS) -AC_SUBST(MAGICK_CFLAGS) AC_SUBST(IMLIB_LIBS) AC_SUBST(IMLIB_CFLAGS) AC_SUBST(THEORA_LIBS) Modified: trunk/externals/pidip/include/xwindow-private.h =================================================================== --- trunk/externals/pidip/include/xwindow-private.h 2008-03-11 22:56:31 UTC (rev 9565) +++ trunk/externals/pidip/include/xwindow-private.h 2008-03-11 22:57:13 UTC (rev 9566) @@ -1,11 +1,11 @@ /* - Copyright 1999-2005 ImageMagick Studio LLC, a non-profit organization + Copyright 1999-2008 ImageMagick Studio LLC, a non-profit organization dedicated to making software imaging solutions freely available. You may not use this file except in compliance with the License. obtain a copy of the License at - http://www.imagemagick.org/www/Copyright.html + http://www.imagemagick.org/script/license.php Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, @@ -13,16 +13,16 @@ See the License for the specific language governing permissions and limitations under the License. - ImageMagick X11 window methods. + MagickCore X11 window methods. */ -#ifndef _MAGICK_XWINDOW_PRIVATE_H -#define _MAGICK_XWINDOW_PRIVATE_H +#ifndef _MAGICKCORE_XWINDOW_PRIVATE_H +#define _MAGICKCORE_XWINDOW_PRIVATE_H #if defined(__cplusplus) || defined(c_plusplus) extern "C" { #endif -#if defined(HasX11) +#if defined(MAGICKCORE_X11_DELEGATE) #include <X11/Xos.h> #include <X11/Xlib.h> @@ -31,6 +31,8 @@ #include <X11/keysym.h> #include <X11/Xresource.h> #include <X11/Xutil.h> +#include "magick/exception.h" +#include "magick/geometry.h" #include "magick/quantize.h" #if defined(__cplusplus) || defined(c_plusplus) @@ -64,7 +66,26 @@ #define MaxNumberPens 11 #define MaxNumberFonts 11 #define MaxXWindows 12 +#undef index +#define ThrowXWindowException(severity,tag,context) \ +{ \ + ExceptionInfo \ + exception; \ + \ + GetExceptionInfo(&exception); \ + (void) ThrowMagickException(&exception,GetMagickModule(),severity, \ + tag == (const char *) NULL ? "unknown" : tag,"`%s': %s",context, \ + strerror(errno)); \ + CatchException(&exception); \ + (void) DestroyExceptionInfo(&exception); \ +} +#define ThrowXWindowFatalException(severity,tag,context) \ +{ \ + ThrowXWindowException(severity,tag,context); \ + _exit(1); \ +} + typedef enum { ForegroundStencil, @@ -243,12 +264,15 @@ colormap; unsigned int - border_width, + border_width; + + unsigned long delay; MagickBooleanType color_recovery, - confirm_exit; + confirm_exit, + confirm_edit; char *display_gamma; @@ -492,12 +516,11 @@ XError(Display *,XErrorEvent *); extern MagickExport MagickBooleanType - IsTrue(const char *), XAnnotateImage(Display *,const XPixelInfo *,XAnnotateInfo *,Image *), XDrawImage(Display *,const XPixelInfo *,XDrawInfo *,Image *), XGetWindowColor(Display *,XWindows *,char *), XMagickProgressMonitor(const char *,const MagickOffsetType, - const MagickSizeType,void *), + const MagickSizeType,void *), XMakeImage(Display *,const XResourceInfo *,XWindowInfo *,Image *,unsigned int, unsigned int), XQueryColorDatabase(const char *,XColor *), @@ -559,6 +582,15 @@ *XInitializeWindows(Display *,XResourceInfo *), *XSetWindows(XWindows *); +static inline MagickRealType XPixelIntensity(const XColor *pixel) +{ + MagickRealType + intensity; + + intensity=0.299*pixel->red+0.587*pixel->green+0.114*pixel->blue; + return(intensity); +} + #endif #if defined(__cplusplus) || defined(c_plusplus) Modified: trunk/externals/pidip/modules/Makefile.in =================================================================== --- trunk/externals/pidip/modules/Makefile.in 2008-03-11 22:56:31 UTC (rev 9565) +++ trunk/externals/pidip/modules/Makefile.in 2008-03-11 22:57:13 UTC (rev 9566) @@ -20,7 +20,7 @@ pdp_disintegration.o pdp_distance.o pdp_theorin~.o \ pdp_theorout~.o pdp_cropper.o pdp_background.o \ pdp_mapper.o pdp_theonice~.o pdp_icedthe~.o\ - pdp_fdiff.o pdp_hue.o pdp_qtext.o \ + pdp_fdiff.o pdp_hue.o pdp_dot.o pdp_qtext.o \ @PDP_CAPTURE_OBJECT@ @PDP_STREAMING_OBJECTS@ # pdp_xcanvas.o pdp_aa.o all_modules: $(OBJECTS) Modified: trunk/externals/pidip/modules/pdp_capture.c =================================================================== --- trunk/externals/pidip/modules/pdp_capture.c 2008-03-11 22:56:31 UTC (rev 9565) +++ trunk/externals/pidip/modules/pdp_capture.c 2008-03-11 22:57:13 UTC (rev 9566) @@ -39,6 +39,7 @@ // trick to handle Image Magick compatibility #if MagickLibVersion >= 0x618 #include "../include/xwindow-private.h" +#include "../include/quantum-private.h" #endif static char *pdp_capture_version = "pdp_capture: version 0.1, capture of screen written by Yves Degoyon (ydegoyon(a)free.fr)"; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: pure-data: [9565] trunk/externals/pidip/modules/pdp_dot.c
by sevyves＠users.sourceforge.net 11 Mar '08

11 Mar '08

Revision: 9565 http://pure-data.svn.sourceforge.net/pure-data/?rev=9565&view=rev Author: sevyves Date: 2008-03-11 15:56:31 -0700 (Tue, 11 Mar 2008) Log Message: ----------- Pidip 0.12.22 Added Paths: ----------- trunk/externals/pidip/modules/pdp_dot.c Added: trunk/externals/pidip/modules/pdp_dot.c =================================================================== --- trunk/externals/pidip/modules/pdp_dot.c (rev 0) +++ trunk/externals/pidip/modules/pdp_dot.c 2008-03-11 22:56:31 UTC (rev 9565) @@ -0,0 +1,348 @@ +/* + * PiDiP module + * Copyright (c) by Yves Degoyon ( ydegoyon(a)free.fr ) + * + * 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., 675 Mass Ave, Cambridge, MA 02139, USA. + * + */ + +/* This object is a dot matrix filter + */ + +#include "pdp.h" +#include "yuv.h" +#include <math.h> +#include <stdio.h> + +static char *pdp_dot_version = "pdp_dot: dot matrix filter version 0.1 written by Yves Degoyon (ydegoyon(a)free.fr)"; + +typedef struct pdp_dot_struct +{ + t_object x_obj; + + int x_packet0; + int x_packet1; + int x_queue_id; + int x_dropped; + + int x_vwidth; + int x_vheight; + int x_vsize; + + int x_nbx; + int x_nby; + char *x_mask; // pre-calculated mask + + t_outlet *x_pdp_output; // output packets + +} t_pdp_dot; + +static void pdp_dot_update_mask(t_pdp_dot *x) +{ + int dotsizeX, dotsizeY; + int ray; + int curX=0, curY=0; + char *pfY; + int px, py; + + dotsizeX = (int) ( x->x_vwidth / x->x_nbx ); + dotsizeY = (int) ( x->x_vheight / x->x_nby ); + ray = (dotsizeX>dotsizeY) ? (dotsizeY/2):(dotsizeX/2); + + // post( "dotsizeX=%d dotsizeY=%d", dotsizeX, dotsizeY ); + + pfY = x->x_mask; + curY=0; + + while ( curY <= ( x->x_vheight - dotsizeY ) ) + { + curX=0; + while ( curX <= ( x->x_vwidth - dotsizeX ) ) + { + for(py=0; py<dotsizeY; py++) + { + for(px=0; px<dotsizeX; px++) + { + if ( sqrt( pow( (px-(dotsizeX/2)), 2 ) + pow( (py-(dotsizeY/2)), 2 ) ) < ray ) + { + *(pfY+(curY+py)*x->x_vwidth+(curX+px))=1; + } + else + { + *(pfY+(curY+py)*x->x_vwidth+(curX+px))=0; + } + } + } + curX += dotsizeX; + // post ( "curX=%d", curX ); + } + curY += dotsizeY; + // post ( "curY=%d", curY ); + } +} + +static void pdp_dot_allocate(t_pdp_dot *x) +{ + x->x_mask = (char *) getbytes ( x->x_vsize*sizeof(char*) ); + + if ( !x->x_mask ) + { + post( "pdp_dot : severe error : cannot allocate buffer !!! "); + return; + } + +} + +static void pdp_dot_nbx(t_pdp_dot *x, t_floatarg fnbx ) +{ + if ( ( (int)fnbx > 5 ) && ( (int)fnbx <= x->x_vwidth ) ) + { + x->x_nbx = (int) fnbx; + pdp_dot_update_mask( x ); + } +} + +static void pdp_dot_nby(t_pdp_dot *x, t_floatarg fnby ) +{ + if ( ( (int)fnby > 5 ) && ( (int)fnby <= x->x_vheight ) ) + { + x->x_nby = (int) fnby; + pdp_dot_update_mask( x ); + } +} + +static void pdp_dot_free_ressources(t_pdp_dot *x) +{ + if ( x->x_mask ) freebytes ( x->x_mask, x->x_vsize*sizeof(char*) ); +} + +static void pdp_dot_process_yv12(t_pdp_dot *x) +{ + t_pdp *header = pdp_packet_header(x->x_packet0); + short int *data = (short int *)pdp_packet_data(x->x_packet0); + t_pdp *newheader = pdp_packet_header(x->x_packet1); + short int *newdata = (short int *)pdp_packet_data(x->x_packet1); + int i; + int px=0, py=0; + short int *pfY, *pfU, *pfV; + char *pmY; + double meanY, meanU, meanV; + int dotsizeX, dotsizeY; + int nbpixs, curX=0, curY=0; + + // allocate all ressources + if ( ( (int)header->info.image.width != x->x_vwidth ) || + ( (int)header->info.image.height != x->x_vheight ) ) + { + pdp_dot_free_ressources( x ); + x->x_vwidth = header->info.image.width; + x->x_vheight = header->info.image.height; + x->x_vsize = x->x_vwidth*x->x_vheight; + pdp_dot_allocate( x ); + pdp_dot_update_mask( x ); + post( "pdp_dot : reallocated buffers" ); + } + + memcpy( newdata, data, x->x_vsize+(x->x_vsize>>1)<<1 ); + + dotsizeX = (int) ( x->x_vwidth / x->x_nbx ); + dotsizeY = (int) ( x->x_vheight / x->x_nby ); + + // post( "dotsizeX=%d dotsizeY=%d", dotsizeX, dotsizeY ); + + pmY = x->x_mask; + pfY = newdata; + pfV = newdata+x->x_vsize; + pfU = newdata+x->x_vsize+(x->x_vsize>>2); + nbpixs=0; + curY=0; + + while ( curY <= ( x->x_vheight - dotsizeY ) ) + { + curX=0; + while ( curX <= ( x->x_vwidth - dotsizeX ) ) + { + meanY=0; + meanU=0; + meanV=0; + nbpixs=0; + for(py=0; py<dotsizeY; py++) + { + for(px=0; px<dotsizeX; px++) + { + meanY += (double)*(pfY+(curY+py)*x->x_vwidth+(curX+px)); + meanU += (double)*(pfU+((curY+py)>>1)*(x->x_vwidth>>1)+((curX+px)>>1)); + meanV += (double)*(pfV+((curY+py)>>1)*(x->x_vwidth>>1)+((curX+px)>>1)); + nbpixs++; + } + } + for(py=0; py<dotsizeY; py++) + { + for(px=0; px<dotsizeX; px++) + { + *(pfY+(curY+py)*x->x_vwidth+(curX+px))=(meanY/nbpixs)*(*(pmY+(curY+py)*x->x_vwidth+(curX+px))); + *(pfU+((curY+py)>>1)*(x->x_vwidth>>1)+((curX+px)>>1))=(meanU/nbpixs)*(*(pmY+(curY+py)*x->x_vwidth+(curX+px))); + *(pfV+((curY+py)>>1)*(x->x_vwidth>>1)+((curX+px)>>1))=(meanV/nbpixs)*(*(pmY+(curY+py)*x->x_vwidth+(curX+px))); + } + } + curX += dotsizeX; + // post ( "curX=%d", curX ); + } + if ( curX < x->x_vwidth ) + { + curX -= dotsizeX; + for(py=0; py<dotsizeY; py++) + { + for(px=curX; px<x->x_vwidth; px++) + { + if ( (curY+py) < x->x_vheight ) + { + *(pfY+(curY+py)*x->x_vwidth+(px))=0; + } + } + } + } + curY += dotsizeY; + // post ( "curY=%d", curY ); + } + if ( curY < x->x_vheight ) + { + curY -= dotsizeY; + for(py=curY; py<x->x_vheight; py++) + { + for(px=0; px<x->x_vwidth; px++) + { + *(pfY+(py)*x->x_vwidth+(px))=0; + } + } + } + + newheader->info.image.encoding = header->info.image.encoding; + newheader->info.image.width = x->x_vwidth; + newheader->info.image.height = x->x_vheight; + + return; +} + +static void pdp_dot_sendpacket(t_pdp_dot *x) +{ + /* release the packet */ + pdp_packet_mark_unused(x->x_packet0); + x->x_packet0 = -1; + + /* unregister and propagate if valid dest packet */ + pdp_packet_pass_if_valid(x->x_pdp_output, &x->x_packet1); +} + +static void pdp_dot_process(t_pdp_dot *x) +{ + int encoding; + t_pdp *header = 0; + + /* check if image data packets are compatible */ + if ( (header = pdp_packet_header(x->x_packet0)) + && (PDP_IMAGE == header->type)){ + + /* pdp_dot_process inputs and write into active inlet */ + switch(pdp_packet_header(x->x_packet0)->info.image.encoding) + { + + case PDP_IMAGE_YV12: + x->x_packet1 = pdp_packet_clone_rw(x->x_packet0); + pdp_queue_add(x, pdp_dot_process_yv12, pdp_dot_sendpacket, &x->x_queue_id); + break; + + case PDP_IMAGE_GREY: + // should write something to handle these one day + // but i don't use this mode + break; + + default: + /* don't know the type, so dont pdp_dot_process */ + break; + + } + } + +} + +static void pdp_dot_input_0(t_pdp_dot *x, t_symbol *s, t_floatarg f) +{ + /* if this is a register_ro message or register_rw message, register with packet factory */ + + if (s== gensym("register_rw")) + { + x->x_dropped = pdp_packet_convert_ro_or_drop(&x->x_packet0, (int)f, pdp_gensym("image/YCrCb/*") ); + } + + if ((s == gensym("process")) && (-1 != x->x_packet0) && (!x->x_dropped)) + { + pdp_dot_process(x); + } +} + +static void pdp_dot_free(t_pdp_dot *x) +{ + int i; + + pdp_packet_mark_unused(x->x_packet0); + pdp_dot_free_ressources( x ); +} + +t_class *pdp_dot_class; + +void *pdp_dot_new(void) +{ + int i; + + t_pdp_dot *x = (t_pdp_dot *)pd_new(pdp_dot_class); + inlet_new(&x->x_obj, &x->x_obj.ob_pd, &s_float, gensym("nbx")); + inlet_new(&x->x_obj, &x->x_obj.ob_pd, &s_float, gensym("nby")); + + x->x_pdp_output = outlet_new(&x->x_obj, &s_anything); + + x->x_packet0 = -1; + x->x_packet1 = -1; + x->x_vwidth = -1; + x->x_vheight = -1; + x->x_vsize = -1; + + x->x_nbx = 100; + x->x_nby = 100; + + return (void *)x; +} + + +#ifdef __cplusplus +extern "C" +{ +#endif + + +void pdp_dot_setup(void) +{ + // post( pdp_dot_version ); + pdp_dot_class = class_new(gensym("pdp_dot"), (t_newmethod)pdp_dot_new, + (t_method)pdp_dot_free, sizeof(t_pdp_dot), 0, A_NULL); + + class_addmethod(pdp_dot_class, (t_method)pdp_dot_input_0, gensym("pdp"), A_SYMBOL, A_DEFFLOAT, A_NULL); + class_addmethod(pdp_dot_class, (t_method)pdp_dot_nbx, gensym("nbx"), A_DEFFLOAT, A_NULL); + class_addmethod(pdp_dot_class, (t_method)pdp_dot_nby, gensym("nby"), A_DEFFLOAT, A_NULL); +} + +#ifdef __cplusplus +} +#endif This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: pure-data: [9564] trunk/externals/pidip/include/quantum-private .h
by sevyves＠users.sourceforge.net 11 Mar '08

11 Mar '08

Revision: 9564 http://pure-data.svn.sourceforge.net/pure-data/?rev=9564&view=rev Author: sevyves Date: 2008-03-11 15:55:43 -0700 (Tue, 11 Mar 2008) Log Message: ----------- necessary for newer image magick Added Paths: ----------- trunk/externals/pidip/include/quantum-private.h Added: trunk/externals/pidip/include/quantum-private.h =================================================================== --- trunk/externals/pidip/include/quantum-private.h (rev 0) +++ trunk/externals/pidip/include/quantum-private.h 2008-03-11 22:55:43 UTC (rev 9564) @@ -0,0 +1,731 @@ +/* + Copyright 1999-2008 ImageMagick Studio LLC, a non-profit organization + dedicated to making software imaging solutions freely available. + + You may not use this file except in compliance with the License. + obtain a copy of the License at + + http://www.imagemagick.org/script/license.php + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + + MagickCore quantum inline methods. +*/ +#ifndef _MAGICKCORE_QUANTUM_PRIVATE_H +#define _MAGICKCORE_QUANTUM_PRIVATE_H + +#if defined(__cplusplus) || defined(c_plusplus) +extern "C" { +#endif + +typedef struct _QuantumState +{ + EndianType + endian; + + double + minimum, + scale; + + unsigned long + pixel, + bits; + + const unsigned long + *mask; +} QuantumState; + +static inline MagickRealType ClipToQuantum(const MagickRealType value) +{ + if (value <= 0.0) + return(0.0); + if (value >= QuantumRange) + return((MagickRealType) QuantumRange); + return(value); +} + +static inline void InitializeQuantumState(const QuantumInfo *quantum_info, + const EndianType endian,QuantumState *quantum_state) +{ + static const unsigned long mask[32] = + { + 0x00000000UL, 0x00000001UL, 0x00000003UL, 0x00000007UL, 0x0000000fUL, + 0x0000001fUL, 0x0000003fUL, 0x0000007fUL, 0x000000ffUL, 0x000001ffUL, + 0x000003ffUL, 0x000007ffUL, 0x00000fffUL, 0x00001fffUL, 0x00003fffUL, + 0x00007fffUL, 0x0000ffffUL, 0x0001ffffUL, 0x0003ffffUL, 0x0007ffffUL, + 0x000fffffUL, 0x001fffffUL, 0x003fffffUL, 0x007fffffUL, 0x00ffffffUL, + 0x01ffffffUL, 0x03ffffffUL, 0x07ffffffUL, 0x0fffffffUL, 0x1fffffffUL, + 0x3fffffffUL, 0x7fffffffUL + }; + + (void) ResetMagickMemory(quantum_state,0,sizeof(&quantum_state)); + quantum_state->endian=endian; + quantum_state->minimum=quantum_info->minimum; + quantum_state->scale=quantum_info->scale; + quantum_state->bits=0; + quantum_state->mask=mask; +} + +static inline void PopCharPixel(const unsigned char pixel, + unsigned char **pixels) +{ + *(*pixels)++=(unsigned char) (pixel); +} + +static inline void PopDoublePixel(const QuantumState *quantum_state, + const double pixel,unsigned char **pixels) +{ + unsigned char + quantum[8]; + + *((double *) quantum)=(double) (pixel*quantum_state->scale+ + quantum_state->minimum); + if (quantum_state->endian != LSBEndian) + { + *(*pixels)++=quantum[7]; + *(*pixels)++=quantum[6]; + *(*pixels)++=quantum[5]; + *(*pixels)++=quantum[4]; + *(*pixels)++=quantum[3]; + *(*pixels)++=quantum[2]; + *(*pixels)++=quantum[1]; + *(*pixels)++=quantum[0]; + return; + } + *(*pixels)++=quantum[0]; + *(*pixels)++=quantum[1]; + *(*pixels)++=quantum[2]; + *(*pixels)++=quantum[3]; + *(*pixels)++=quantum[4]; + *(*pixels)++=quantum[5]; + *(*pixels)++=quantum[6]; + *(*pixels)++=quantum[7]; +} + +static inline void PopFloatPixel(const QuantumState *quantum_state, + const float pixel,unsigned char **pixels) +{ + unsigned char + quantum[4]; + + *((float *) quantum)=(float) ((double) pixel*quantum_state->scale+ + quantum_state->minimum); + if (quantum_state->endian != LSBEndian) + { + *(*pixels)++=quantum[3]; + *(*pixels)++=quantum[2]; + *(*pixels)++=quantum[1]; + *(*pixels)++=quantum[0]; + return; + } + *(*pixels)++=quantum[0]; + *(*pixels)++=quantum[1]; + *(*pixels)++=quantum[2]; + *(*pixels)++=quantum[3]; +} + +static inline void PopLongPixel(const QuantumState *quantum_state, + const unsigned long pixel,unsigned char **pixels) +{ + if (quantum_state->endian != LSBEndian) + { + *(*pixels)++=(unsigned char) ((pixel) >> 24); + *(*pixels)++=(unsigned char) ((pixel) >> 16); + *(*pixels)++=(unsigned char) ((pixel) >> 8); + *(*pixels)++=(unsigned char) (pixel); + return; + } + *(*pixels)++=(unsigned char) (pixel); + *(*pixels)++=(unsigned char) ((pixel) >> 8); + *(*pixels)++=(unsigned char) ((pixel) >> 16); + *(*pixels)++=(unsigned char) ((pixel) >> 24); +} + +static inline void PopQuantumPixel(QuantumState *quantum_state, + const unsigned long depth,const unsigned long pixel,unsigned char **pixels) +{ + register long + i; + + register unsigned long + quantum_bits; + + if (quantum_state->bits == 0UL) + quantum_state->bits=8UL; + for (i=(long) depth; i > 0L; ) + { + quantum_bits=(unsigned long) i; + if (quantum_bits > quantum_state->bits) + quantum_bits=quantum_state->bits; + i-=quantum_bits; + if (quantum_state->bits == 8) + *(*pixels)='\0'; + quantum_state->bits-=quantum_bits; + *(*pixels)|=(((pixel >> i) &~ ((~0UL) << quantum_bits)) << + quantum_state->bits); + if (quantum_state->bits == 0UL) + { + (*pixels)++; + quantum_state->bits=8UL; + } + } +} + +static inline void PopQuantumLongPixel(QuantumState *quantum_state, + const unsigned long depth,const unsigned long pixel,unsigned char **pixels) +{ + register long + i; + + unsigned long + quantum_bits; + + if (quantum_state->bits == 0UL) + quantum_state->bits=32UL; + for (i=(long) depth; i > 0; ) + { + quantum_bits=(unsigned long) i; + if (quantum_bits > quantum_state->bits) + quantum_bits=quantum_state->bits; + quantum_state->pixel|=(((pixel >> (depth-i)) & + quantum_state->mask[quantum_bits]) << (32UL-quantum_state->bits)); + i-=quantum_bits; + quantum_state->bits-=quantum_bits; + if (quantum_state->bits == 0U) + { + PopLongPixel(quantum_state,quantum_state->pixel,pixels); + quantum_state->pixel=0U; + quantum_state->bits=32UL; + } + } +} + +static inline void PopShortPixel(const QuantumState *quantum_state, + const unsigned short pixel,unsigned char **pixels) +{ + if (quantum_state->endian != LSBEndian) + { + *(*pixels)++=(unsigned char) ((pixel) >> 8); + *(*pixels)++=(unsigned char) (pixel); + return; + } + *(*pixels)++=(unsigned char) (pixel); + *(*pixels)++=(unsigned char) ((pixel) >> 8); +} + +static inline unsigned char PushCharPixel(const unsigned char **pixels) +{ + unsigned char + pixel; + + pixel=(unsigned char) *(*pixels)++; + return(pixel); +} + +static inline IndexPacket PushColormapIndex(Image *image, + const unsigned long index) +{ + assert(image != (Image *) NULL); + assert(image->signature == MagickSignature); + if (index < image->colors) + return((IndexPacket) index); + (void) ThrowMagickException(&image->exception,GetMagickModule(), + CorruptImageError,"InvalidColormapIndex","`%s'",image->filename); + return((IndexPacket) 0); +} + +static inline double PushDoublePixel(const QuantumState *quantum_state, + const unsigned char **pixels) +{ + double + pixel; + + unsigned char + quantum[8]; + + if (quantum_state->endian != LSBEndian) + { + quantum[7]=(*(*pixels)++); + quantum[6]=(*(*pixels)++); + quantum[5]=(*(*pixels)++); + quantum[5]=(*(*pixels)++); + quantum[3]=(*(*pixels)++); + quantum[2]=(*(*pixels)++); + quantum[1]=(*(*pixels)++); + quantum[0]=(*(*pixels)++); + pixel=(*((double *) quantum)); + pixel-=quantum_state->minimum; + pixel*=quantum_state->scale; + return(pixel); + } + quantum[0]=(*(*pixels)++); + quantum[1]=(*(*pixels)++); + quantum[2]=(*(*pixels)++); + quantum[3]=(*(*pixels)++); + quantum[4]=(*(*pixels)++); + quantum[5]=(*(*pixels)++); + quantum[6]=(*(*pixels)++); + quantum[7]=(*(*pixels)++); + pixel=(*((double *) quantum)); + pixel-=quantum_state->minimum; + pixel*=quantum_state->scale; + return(pixel); +} + +static inline float PushFloatPixel(const QuantumState *quantum_state, + const unsigned char **pixels) +{ + float + pixel; + + unsigned char + quantum[4]; + + if (quantum_state->endian != LSBEndian) + { + quantum[3]=(*(*pixels)++); + quantum[2]=(*(*pixels)++); + quantum[1]=(*(*pixels)++); + quantum[0]=(*(*pixels)++); + pixel=(*((float *) quantum)); + pixel-=quantum_state->minimum; + pixel*=quantum_state->scale; + return(pixel); + } + quantum[0]=(*(*pixels)++); + quantum[1]=(*(*pixels)++); + quantum[2]=(*(*pixels)++); + quantum[3]=(*(*pixels)++); + pixel=(*((float *) quantum)); + pixel-=quantum_state->minimum; + pixel*=quantum_state->scale; + return(pixel); +} + +static inline unsigned long PushLongPixel(const QuantumState *quantum_state, + const unsigned char **pixels) +{ + unsigned long + pixel; + + if (quantum_state->endian != LSBEndian) + { + pixel=(unsigned long) (*(*pixels)++ << 24); + pixel|=(unsigned long) (*(*pixels)++ << 16); + pixel|=(unsigned long) (*(*pixels)++ << 8); + pixel|=(unsigned long) (*(*pixels)++); + return(pixel); + } + pixel=(unsigned long) (*(*pixels)++); + pixel|=(unsigned long) (*(*pixels)++ << 8); + pixel|=(unsigned long) (*(*pixels)++ << 16); + pixel|=(unsigned long) (*(*pixels)++ << 24); + return(pixel); +} + +static inline unsigned long PushQuantumPixel(QuantumState *quantum_state, + const unsigned long depth,const unsigned char **pixels) +{ + register long + i; + + register unsigned long + quantum_bits, + quantum; + + quantum=0UL; + for (i=(long) depth; i > 0L; ) + { + if (quantum_state->bits == 0UL) + { + quantum_state->pixel=(*(*pixels)++); + quantum_state->bits=8UL; + } + quantum_bits=(unsigned long) i; + if (quantum_bits > quantum_state->bits) + quantum_bits=quantum_state->bits; + i-=quantum_bits; + quantum_state->bits-=quantum_bits; + quantum=(quantum << quantum_bits) | ((quantum_state->pixel >> + quantum_state->bits) &~ ((~0UL) << quantum_bits)); + } + return(quantum); +} + +static inline unsigned long PushQuantumLongPixel(QuantumState *quantum_state, + const unsigned long depth,const unsigned char **pixels) +{ + register long + i; + + register unsigned long + quantum, + quantum_bits; + + quantum=0UL; + for (i=(long) depth; i > 0; ) + { + if (quantum_state->bits == 0) + { + quantum_state->pixel=PushLongPixel(quantum_state,pixels); + quantum_state->bits=32UL; + } + quantum_bits=(unsigned long) i; + if (quantum_bits > quantum_state->bits) + quantum_bits=quantum_state->bits; + quantum|=(((quantum_state->pixel >> (32UL-quantum_state->bits)) & + quantum_state->mask[quantum_bits]) << (depth-i)); + i-=quantum_bits; + quantum_state->bits-=quantum_bits; + } + return(quantum); +} + +static inline unsigned short PushShortPixel(const QuantumState *quantum_state, + const unsigned char **pixels) +{ + unsigned short + pixel; + + if (quantum_state->endian != LSBEndian) + { + pixel=(unsigned short) (*(*pixels)++ << 8); + pixel|=(unsigned short) (*(*pixels)++); + return(pixel); + } + pixel=(unsigned short) (*(*pixels)++); + pixel|=(unsigned short) (*(*pixels)++ << 8); + return(pixel); +} + +static inline Quantum ScaleAnyToQuantum(const QuantumAny quantum, + const unsigned long depth) +{ + MagickRealType + scale; + + scale=(MagickRealType) ((double) QuantumRange/(pow(2.0,1.0*depth)-1.0)); + return((Quantum) (scale*quantum+0.5)); +} + +static inline QuantumAny ScaleQuantumToAny(const Quantum quantum, + const unsigned long depth) +{ + MagickRealType + scale; + + scale=(MagickRealType) ((double) QuantumRange/(pow(2.0,1.0*depth)-1.0)); + return((QuantumAny) (quantum/scale+0.5)); +} + +#if (MAGICKCORE_QUANTUM_DEPTH == 8) +static inline Quantum ScaleCharToQuantum(const unsigned char value) +{ + return((Quantum) value); +} + +static inline Quantum ScaleLongToQuantum(const unsigned long value) +{ +#if !defined(MAGICKCORE_HDRI_SUPPORT) + return((Quantum) ((value+8421504UL)/16843009UL)); +#else + return((Quantum) (value/16843008.0)); +#endif +} + +static inline Quantum ScaleMapToQuantum(const MagickRealType value) +{ +#if defined(MAGICKCORE_HDRI_SUPPORT) + return((Quantum) value); +#else + if (value <= 0.0) + return(0); + if (value >= MaxMap) + return((Quantum) QuantumRange); + return((Quantum) (value+0.5)); +#endif +} + +static inline unsigned long ScaleQuantumToLong(const Quantum quantum) +{ +#if !defined(MAGICKCORE_HDRI_SUPPORT) + return((unsigned long) (16843009UL*quantum)); +#else + if (quantum <= 0.0) + return(0UL); + if ((16843008.0*quantum) >= 4294967295.0) + return(4294967295UL); + return((unsigned long) (16843008.0*quantum)); +#endif +} + +static inline unsigned long ScaleQuantumToMap(const Quantum quantum) +{ + if (quantum <= 0) + return(0UL); + if (quantum >= (Quantum) MaxMap) + return((unsigned long) MaxMap); +#if !defined(MAGICKCORE_HDRI_SUPPORT) + return((unsigned long) quantum); +#else + return((unsigned long) (quantum+0.5)); +#endif +} + +static inline unsigned short ScaleQuantumToShort(const Quantum quantum) +{ +#if !defined(MAGICKCORE_HDRI_SUPPORT) + return((unsigned short) (257UL*quantum)); +#else + if (quantum <= 0.0) + return(0); + if ((257.0*quantum) >= 65535.0) + return(65535); + return((unsigned short) (257.0*quantum)); +#endif +} + +static inline Quantum ScaleShortToQuantum(const unsigned short value) +{ +#if !defined(MAGICKCORE_HDRI_SUPPORT) + return((Quantum) ((value+128UL)/257UL)); +#else + return((Quantum) (value/257.0)); +#endif +} +#elif (MAGICKCORE_QUANTUM_DEPTH == 16) +static inline Quantum ScaleCharToQuantum(const unsigned char value) +{ +#if !defined(MAGICKCORE_HDRI_SUPPORT) + return((Quantum) (257UL*value)); +#else + return((Quantum) (257.0*value)); +#endif +} + +static inline Quantum ScaleLongToQuantum(const unsigned long value) +{ +#if !defined(MAGICKCORE_HDRI_SUPPORT) + return((Quantum) ((value+32768UL)/65537UL)); +#else + return((Quantum) (value/65537.0)); +#endif +} + +static inline Quantum ScaleMapToQuantum(const MagickRealType value) +{ +#if defined(MAGICKCORE_HDRI_SUPPORT) + return((Quantum) value); +#else + if (value <= 0.0) + return(0); + if (value >= MaxMap) + return((Quantum) QuantumRange); + return((Quantum) (value+0.5)); +#endif +} + +static inline unsigned long ScaleQuantumToLong(const Quantum quantum) +{ +#if !defined(MAGICKCORE_HDRI_SUPPORT) + return((unsigned long) (65537UL*quantum)); +#else + if (quantum <= 0.0) + return(0UL); + if ((65537.0*quantum) >= 4294967295.0) + return(4294967295UL); + return((unsigned long) (65537.0*quantum)); +#endif +} + +static inline unsigned long ScaleQuantumToMap(const Quantum quantum) +{ + if (quantum <= 0) + return(0); + if ((1UL*quantum) >= MaxMap) + return((unsigned long) MaxMap); +#if !defined(MAGICKCORE_HDRI_SUPPORT) + return((unsigned long) quantum); +#else + return((unsigned long) (quantum+0.5)); +#endif +} + +static inline unsigned short ScaleQuantumToShort(const Quantum quantum) +{ +#if !defined(MAGICKCORE_HDRI_SUPPORT) + return((unsigned short) quantum); +#else + if (quantum <= 0.0) + return(0); + if (quantum >= 65535.0) + return(65535); + return((unsigned short) (quantum+0.5)); +#endif +} + +static inline Quantum ScaleShortToQuantum(const unsigned short value) +{ + return((Quantum) value); +} +#elif (MAGICKCORE_QUANTUM_DEPTH == 32) +static inline Quantum ScaleCharToQuantum(const unsigned char value) +{ +#if !defined(MAGICKCORE_HDRI_SUPPORT) + return((Quantum) (16843009UL*value)); +#else + return((Quantum) (16843009.0*value)); +#endif +} + +static inline Quantum ScaleLongToQuantum(const unsigned long value) +{ + return((Quantum) value); +} + +static inline Quantum ScaleMapToQuantum(const MagickRealType value) +{ +#if defined(MAGICKCORE_HDRI_SUPPORT) + return((Quantum) (65537.0*value)); +#else + if (value <= 0.0) + return(0); + if (value >= MaxMap) + return(QuantumRange); + return((Quantum) (65537UL*value)); +#endif +} + +static inline unsigned long ScaleQuantumToLong(const Quantum quantum) +{ + return((unsigned long) quantum); +} + +static inline unsigned long ScaleQuantumToMap(const Quantum quantum) +{ + if (quantum <= 0.0) + return(0); + if ((quantum/65537.0) >= (MagickRealType) MaxMap) + return((unsigned long) MaxMap); +#if !defined(MAGICKCORE_HDRI_SUPPORT) + { + unsigned long + pixel; + + pixel=(unsigned long) ((quantum+MagickULLConstant(32768))/ + MagickULLConstant(65537)); + return(pixel); + } +#else + return((unsigned long) (quantum/65537.0)); +#endif +} + +static inline unsigned short ScaleQuantumToShort(const Quantum quantum) +{ +#if !defined(MAGICKCORE_HDRI_SUPPORT) + unsigned short + pixel; + + pixel=(unsigned short) ((quantum+MagickULLConstant(32768))/ + MagickULLConstant(65537)); + return(pixel); +#else + if (quantum <= 0.0) + return(0); + if ((quantum/65537.0) >= 65535.0) + return(65535); + return((unsigned short) (quantum/65537.0)); +#endif +} + +static inline Quantum ScaleShortToQuantum(const unsigned short value) +{ +#if !defined(MAGICKCORE_HDRI_SUPPORT) + return((Quantum) (65537UL*value)); +#else + return((Quantum) (65537.0*value)); +#endif +} +#elif (MAGICKCORE_QUANTUM_DEPTH == 64) +static inline Quantum ScaleCharToQuantum(const unsigned char value) +{ +#if !defined(MAGICKCORE_HDRI_SUPPORT) + return((Quantum) (MagickULLConstant(71777214294589695)*value)); +#else + return((Quantum) (71777214294589695.0*value)); +#endif +} + +static inline Quantum ScaleLongToQuantum(const unsigned long value) +{ +#if !defined(MAGICKCORE_HDRI_SUPPORT) + return((Quantum) (4294967295UL*value)); +#else + return((Quantum) (4294967295.0*value)); +#endif +} + +static inline Quantum ScaleMapToQuantum(const MagickRealType value) +{ +#if defined(MAGICKCORE_HDRI_SUPPORT) + return((Quantum) (281479271612415.0*value)); +#else + if (value <= 0.0) + return(0); + if (value >= MaxMap) + return(QuantumRange); + return((Quantum) (MagickULLConstant(281479271612415)*value)); +#endif +} + +static inline unsigned long ScaleQuantumToLong(const Quantum quantum) +{ +#if !defined(MAGICKCORE_HDRI_SUPPORT) + return((unsigned long) ((quantum+2147483648.0)/4294967297.0)); +#else + return((unsigned long) (quantum/4294967297.0)); +#endif +} + +static inline unsigned long ScaleQuantumToMap(const Quantum quantum) +{ + if (quantum <= 0.0) + return(0); + if ((quantum/281479271612415.0) >= (MagickRealType) MaxMap) + return((unsigned long) MaxMap); +#if !defined(MAGICKCORE_HDRI_SUPPORT) + return((unsigned long) ((quantum+2147450879.0)/281479271612415.0)); +#else + return((unsigned long) (quantum/281479271612415.0)); +#endif +} + +static inline unsigned short ScaleQuantumToShort(const Quantum quantum) +{ +#if !defined(MAGICKCORE_HDRI_SUPPORT) + return((unsigned short) ((quantum+2147450879.0)/281479271612415.0)); +#else + return((unsigned short) (quantum/281479271612415.0)); +#endif +} + +static inline Quantum ScaleShortToQuantum(const unsigned short value) +{ +#if !defined(MAGICKCORE_HDRI_SUPPORT) + return((Quantum) (MagickULLConstant(281479271612415)*value)); +#else + return((Quantum) (281479271612415.0*value)); +#endif +} +#endif + +#if defined(__cplusplus) || defined(c_plusplus) +} +#endif + +#endif This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: pure-data: [9563] sources/flite/
by eighthave＠users.sourceforge.net 11 Mar '08

11 Mar '08

Revision: 9563 http://pure-data.svn.sourceforge.net/pure-data/?rev=9563&view=rev Author: eighthave Date: 2008-03-11 15:26:40 -0700 (Tue, 11 Mar 2008) Log Message: ----------- copying ${DIRNAME}.tar.gz into sources tree Added Paths: ----------- sources/flite/ Copied: sources/flite (from rev 9562, vendor/flite/1.3) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: pure-data: [9562] vendor/flite/1.3/
by eighthave＠users.sourceforge.net 11 Mar '08

11 Mar '08

Revision: 9562 http://pure-data.svn.sourceforge.net/pure-data/?rev=9562&view=rev Author: eighthave Date: 2008-03-11 15:26:34 -0700 (Tue, 11 Mar 2008) Log Message: ----------- tagging flite-1.3-release.tar.gz import Added Paths: ----------- vendor/flite/1.3/ Copied: vendor/flite/1.3 (from rev 9561, vendor/flite/current) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

← Newer
1
...
13
14
15
16
17
18
19
...
23
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

Pd-cvs March 2008