...
 
Commits (9)
......@@ -178,3 +178,9 @@ v0.12: 2003/06/21
Port ia32 MMX assembly code to GCC extensions (MMX support on amd64)
Add V4L2 support to pdp_v4l (merge with pdp_v4l2)
Distill system/zl (Zwizwa Lib) from PDP and libprim/PF code.
0.14.1:
Port SCAF MMX code to x86_64 ABI
Revive pdp_opengl (3dp)
Bugfixes
# Makefile for pure data externals in lib creb.
# Needs Makefile.pdlibbuilder to work.
lib.name = creb
# all C and C++ files in subdirs are source files per class
class.sources = $(wildcard modules/*.c modules++/*.cc)
datafiles = \
$(wildcard doc/*-help.pd abs/*.pd) \
creb-meta.pd \
CHANGES.LOG \
COPYING \
README \
TODO
################################################################################
### pdlibbuilder ###############################################################
################################################################################
# Include Makefile.pdlibbuilder from this directory, or else from externals
# root directory in pd-extended configuration.
include $(firstword $(wildcard Makefile.pdlibbuilder ../Makefile.pdlibbuilder))
################################################################################
### creb extra targets #########################################################
################################################################################
# if creb still doesn't have a meta.pd file, create it on the fly
define meta
#N canvas 48 350 450 300 10;\
\n#X text 9 18 AUTHOR Tom Schouten <tom@zwizwa.be>;\
\n#X text 9 42 DESCRIPTION This is a collection of pd externals. My bag of tricks.;\
\n#X text 9 79 LICENSE GNU GPL 2;\
\n#X text 9 105 VERSION 0.9.2;
endef
all: creb-meta.pd
creb-meta.pd:
@echo "$(meta)" > creb-meta.pd
# install files with idiosyncratic source/destination paths
install-data: install-creb-extras
install-creb-extras: all
$(INSTALL_DIR) $(installpath)/manual && \
$(INSTALL_DATA) doc/reference.txt $(installpath)/manual
$(INSTALL_DIR) $(installpath)/examples && \
$(INSTALL_DATA) $(wildcard doc/examples/*.pd) $(installpath)/examples
#N canvas 0 33 718 865 10;
#N canvas 0 29 958 1049 10;
#X obj 83 95 pdp_v4l;
#X obj 83 35 inlet;
#X obj 91 182 outlet;
......
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
This diff is collapsed.
......@@ -7,7 +7,7 @@ AC_HEADER_STDC
dnl TAG REPO WHEN RELEASE VERSION CHANGES !!!
dnl After changing version, do "make mrproper ; sh bootstrap"
PDP_VERSION=0.14.1
PDP_VERSION=0.14.2
AC_SUBST(PDP_VERSION)
......
pdp (1:0.14.1-6) unstable; urgency=medium
pdp (1:0.14.1+darcs20180201-1) unstable; urgency=medium
* New upstream version 0.14.1+darcs20180201
* Refreshed patches
* Dropped those applied upstream
* Fixed spelling error in function declaration
* Enabled full hardening
* Adopted package into multimedia-team
* Updated Vcs-* stanzas to salsa.d.o
* Switched URLs to https://
* Removed trailing whitespace in debian/*
* Removed obsolete d/git-tuneclone.sh script
* Added d/copyright_hints
* Updated d/copyright
* Added d/copyright_hints
* Bumped dh compat to 11
* Bumped standards version to 4.1.3
-- IOhannes m zmölnig (Debian/GNU) <umlaeute@debian.org> Thu, 01 Feb 2018 23:26:54 +0100
-- IOhannes m zmölnig (Debian/GNU) <umlaeute@debian.org> Tue, 06 Feb 2018 14:48:40 +0100
pdp (1:0.14.1-5) unstable; urgency=medium
......
Source: pdp
Section: graphics
Priority: optional
Maintainer: Paul Brossier <piem@debian.org>
Maintainer: Debian Multimedia Maintainers <debian-multimedia@lists.debian.org>
Uploaders:
IOhannes m zmölnig (Debian/GNU) <umlaeute@debian.org>,
Paul Brossier <piem@debian.org>,
Build-Depends:
debhelper (>=11~),
docbook-to-man,
......
......@@ -5,7 +5,7 @@ Source: http://zwizwa.be/pdp/
License: GPL-2+
Files: *
Copyright: 2002-2013, Tom Schouten <tom@zwizwa.be>
Copyright: 2002-2016, Tom Schouten <tom@zwizwa.be>
License: GPL-2+
Files: modules/image_special/pdp_cog.c
......@@ -31,7 +31,7 @@ Copyright:
2003, Pablo Martin <caedes@sindominio.net>
2004-2005, Guenter Geiger <geiger@debian.org>
2009, Paul Brossier <piem@debian.org>
2012-2013, IOhannes m zmölnig <zmoelnig@iem.at>
2012-2018, IOhannes m zmölnig <zmoelnig@iem.at>
License: GPL-2+
License: GPL-2+
......
......@@ -8,6 +8,7 @@ Files: ./.header.html
./CHANGES.LOG
./Makefile
./Makefile.config.in
./Makefile.creb
./README-12
./TODO
./abstractions/pdp_affine.pd
......@@ -68,8 +69,6 @@ Files: ./.header.html
./debian/patches/fix_includes.patch
./debian/patches/fix_install.patch
./debian/patches/fix_typos.patch
./debian/patches/fix_v4l.patch
./debian/patches/fix_verbosity.patch
./debian/patches/hardening.patch
./debian/patches/help_input.patch
./debian/patches/install_extra-pdp.patch
......@@ -101,6 +100,7 @@ Files: ./.header.html
./debug/gdb_pdp_load_rt
./debug/quicktime_crashtest.pd
./debug/teststuff.c
./doc/debian-builddep
./doc/examples/example01.pd
./doc/examples/example02.pd
./doc/examples/example03.pd
......@@ -247,6 +247,9 @@ Files: ./.header.html
./opengl/system/pdp_3dp_base.c
./opengl/system/setup.c
./opengl/test/arm.pd
./opengl/test/example01.gdb
./opengl/test/example01.pd
./opengl/test/example01.sh
./opengl/test/meshtest.pd
./opengl/test/pdp_ogl_draw_limb.pd
./opengl/test/textest.pd
......@@ -464,12 +467,6 @@ Copyright: 2003, Tom Schouten <tom@zwizwa.be>
License: GPL-2+
FIXME
Files: ./configure
./scaf/configure
Copyright: 1992-1996, 1998-2012, Free Software Foundation, Inc.
License: FSFUL
FIXME
Files: ./scaf/compiler/kernel.scaf
./scaf/rules/carules.scaf
Copyright: Tom Schouten <tom@zwizwa.be> )
......@@ -514,6 +511,11 @@ Copyright: 2003, martin pi <pi@attacksyour.net>
License: GPL-2+
FIXME
Files: ./debian/copyright_hints
Copyright: -format/1.0/
License: UNKNOWN
FIXME
Files: ./system/zl/README
Copyright: 2003-2013, Tom Schouten <tom@zwizwa.be>
License: UNKNOWN
......
Author: Debian
Description: prepend $(DESTDIR) to installation targets
--- pdp.orig/Makefile
+++ pdp/Makefile
--- pd-pdp.orig/Makefile
+++ pd-pdp/Makefile
@@ -65,19 +65,19 @@
......
......@@ -3,8 +3,8 @@ Author: IOhannes m zmölnig
Last-Update: 2014-09-01
---
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
--- pdp.orig/opengl/modules/pdp_3d_windowcontext.c
+++ pdp/opengl/modules/pdp_3d_windowcontext.c
--- pd-pdp.orig/opengl/modules/pdp_3d_windowcontext.c
+++ pd-pdp/opengl/modules/pdp_3d_windowcontext.c
@@ -22,6 +22,7 @@
#include <GL/gl.h>
#include "pdp_opengl.h"
......
......@@ -3,8 +3,8 @@ Author: IOhannes m zmölnig
Last-Update: 2013-12-18
---
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
--- pdp.orig/Makefile
+++ pdp/Makefile
--- pd-pdp.orig/Makefile
+++ pd-pdp/Makefile
@@ -76,6 +76,7 @@
install -m 644 doc/reference.txt $(DESTDIR)$(prefix)/lib/pd/extra/pdp
install -m 644 doc/introduction/*.pd $(DESTDIR)$(prefix)/lib/pd/extra/pdp/introduction
......
Author: IOhannes m zmölnig
Description: Fixing spelling mistakes
--- pdp.orig/include/pdp_packet.h
+++ pdp/include/pdp_packet.h
--- pd-pdp.orig/include/pdp_packet.h
+++ pd-pdp/include/pdp_packet.h
@@ -135,7 +135,7 @@
union /* each packet type has a unique subheader */
......@@ -11,8 +11,8 @@ Description: Fixing spelling mistakes
struct _image image; /* (nonstandard internal) 16 bit signed planar bitmap image format */
struct _bitmap bitmap; /* (standard) bitmap image (fourcc coded) */
//t_ca ca; /* cellular automaton state data */
--- pdp.orig/modules/image_io/pdp_qt.c
+++ pdp/modules/image_io/pdp_qt.c
--- pd-pdp.orig/modules/image_io/pdp_qt.c
+++ pd-pdp/modules/image_io/pdp_qt.c
@@ -344,7 +344,7 @@
break;
......@@ -31,8 +31,8 @@ Description: Fixing spelling mistakes
break;
}
--- pdp.orig/opengl/modules/pdp_3d_state.c
+++ pdp/opengl/modules/pdp_3d_state.c
--- pd-pdp.orig/opengl/modules/pdp_3d_state.c
+++ pd-pdp/opengl/modules/pdp_3d_state.c
@@ -93,7 +93,7 @@
else if (s == gensym("blend_add")) {x->x_setup = _blend_add; x->x_thing = GL_BLEND;}
else if (s == gensym("depth_test")) {x->x_setup = 0; x->x_thing = GL_DEPTH_TEST;}
......@@ -42,8 +42,8 @@ Description: Fixing spelling mistakes
else {
post ("3dp_state: unknown flag %s", s->s_name);
pd_free((void *)x);
--- pdp.orig/system/zl/v4l.c
+++ pdp/system/zl/v4l.c
--- pd-pdp.orig/system/zl/v4l.c
+++ pd-pdp/system/zl/v4l.c
@@ -499,9 +499,9 @@
}
}
......@@ -65,3 +65,14 @@ Description: Fixing spelling mistakes
return -1;
}
}
--- pd-pdp.orig/opengl/include/pdp_3Dcontext.h
+++ pd-pdp/opengl/include/pdp_3Dcontext.h
@@ -69,7 +69,7 @@
/* window specific methods */
void pdp_packet_3Dcontext_win_resize(int packet, int width, int height);
- void pdp_pacekt_3Dcontext_event_out(int packet, t_outlet *outlet);
+ void pdp_packet_3Dcontext_event_out(int packet, t_outlet *outlet);
void pdp_packet_3Dcontext_win_cursor(int packet, bool toggle);
void pdp_packet_3Dcontext_win_swapbuffers(int packet);
Description: remove non-existant v4l2-controls
there's no V4L2_CID_HCENTER nor V4L2_CID_VCENTER
Author: IOhannes m zmölnig
Last-Update: 2013-12-18
---
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
--- pdp.orig/system/zl/v4l.h
+++ pdp/system/zl/v4l.h
@@ -193,8 +193,6 @@
ZL_V4L_CTRL(GAIN) \
ZL_V4L_CTRL(HFLIP) \
ZL_V4L_CTRL(VFLIP) \
- ZL_V4L_CTRL(HCENTER) \
- ZL_V4L_CTRL(VCENTER) \
ZL_V4L_CTRL(POWER_LINE_FREQUENCY) \
ZL_V4L_CTRL(HUE_AUTO) \
ZL_V4L_CTRL(WHITE_BALANCE_TEMPERATURE) \
Description: silence overly verbose output
ino need to print a debugging line each time a window is moved
Author: IOhannes m zmölnig
Last-Update: 2013-12-18
---
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
--- pdp.orig/system/zl/xwindow.c
+++ pdp/system/zl/xwindow.c
@@ -184,7 +184,7 @@
w->winwidth = e->xconfigure.width;
w->winheight = e->xconfigure.height;
- ZL_LOG("ConfigureNotify %d %d", w->winwidth, w->winheight);
+ //ZL_LOG("ConfigureNotify %d %d", w->winwidth, w->winheight);
/* Workaround for weird window sizes 42592x42379
that cause BadValue for XV. */
Author: IOhannes m zmölnig
Descriptions: allow pdp to be compiled with hardening flags
--- pdp.orig/scaf/Makefile
+++ pdp/scaf/Makefile
@@ -26,7 +26,7 @@
--- pd-pdp.orig/scaf/Makefile
+++ pd-pdp/scaf/Makefile
@@ -27,7 +27,7 @@
pdp_scaf.pd_linux: pdp_scaf_all
rm -f pdp_scaf.pd_linux
......@@ -11,8 +11,8 @@ Descriptions: allow pdp to be compiled with hardening flags
install: all
install -d $(prefix)/lib/scaf
--- pdp.orig/Makefile
+++ pdp/Makefile
--- pd-pdp.orig/Makefile
+++ pd-pdp/Makefile
@@ -26,7 +26,7 @@
linux: pdp_all
......
......@@ -8,8 +8,8 @@ Origin: Debian
Last-Update: 2013-11-12
---
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
--- pdp.orig/doc/objects/pdp_help_input.pd
+++ pdp/doc/objects/pdp_help_input.pd
--- pd-pdp.orig/doc/objects/pdp_help_input.pd
+++ pd-pdp/doc/objects/pdp_help_input.pd
@@ -1,4 +1,4 @@
-#N canvas 683 29 681 161 10;
+#N canvas 679 51 681 161 10;
......
......@@ -3,8 +3,8 @@ Author: IOhannes m zmölnig
Last-Update: 2013-10-09
---
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
--- pdp.orig/Makefile
+++ pdp/Makefile
--- pd-pdp.orig/Makefile
+++ pd-pdp/Makefile
@@ -65,18 +65,17 @@
......
Author: Debian
Description: treat kFreeBSD the same as linux
--- pdp.orig/configure
+++ pdp/configure
@@ -3494,7 +3494,7 @@
ARCH=`uname -s`
-if test $ARCH == Linux;
+if test $ARCH == "Linux" -o $ARCH == "GNU/kFreeBSD" -o $ARCH == "GNU";
then
PDP_LIBRARY_NAME=pdp.pd_linux
--- pdp.orig/configure.ac
+++ pdp/configure.ac
--- pd-pdp.orig/configure.ac
+++ pd-pdp/configure.ac
@@ -137,7 +137,7 @@
AC_CHECK_LIB(m,sin)
......@@ -22,8 +11,8 @@ Description: treat kFreeBSD the same as linux
then
PDP_LIBRARY_NAME=pdp.pd_linux
--- pdp.orig/system/zl/v4l.c
+++ pdp/system/zl/v4l.c
--- pd-pdp.orig/system/zl/v4l.c
+++ pd-pdp/system/zl/v4l.c
@@ -43,7 +43,9 @@
#include <sys/ioctl.h>
#include <sys/types.h>
......
Description: remove hard-coded mmx from opengl/Makefile.config
--- pdp-0.14.1.orig/opengl/Makefile.config
+++ pdp-0.14.1/opengl/Makefile.config
--- pd-pdp.orig/opengl/Makefile.config
+++ pd-pdp/opengl/Makefile.config
@@ -5,7 +5,7 @@
#PD_EXECUTABLE=/path_to_pd_dir/bin/pd
PD_CPPFLAGS=
......
......@@ -3,9 +3,9 @@ Author: IOhannes m zmölnig
Last-Update: 2013-12-18
---
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
--- pdp.orig/scaf/Makefile
+++ pdp/scaf/Makefile
@@ -29,12 +29,12 @@
--- pd-pdp.orig/scaf/Makefile
+++ pd-pdp/scaf/Makefile
@@ -30,12 +30,12 @@
gcc -rdynamic -shared -o pdp_scaf.pd_linux pdp/*.o $(PDP_CA_LIBS) $(LDFLAGS)
install: all
......
......@@ -3,8 +3,8 @@ Author: IOhannes m zmölnig
Last-Update: 2013-12-18
---
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
--- pdp.orig/scaf/configure.ac
+++ pdp/scaf/configure.ac
--- pd-pdp.orig/scaf/configure.ac
+++ pd-pdp/scaf/configure.ac
@@ -34,14 +34,14 @@
if test PD_OK == "no";
......
......@@ -11,8 +11,8 @@ Author: IOhannes m zmölnig
Last-Update: 2013-10-29
---
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
--- pdp.orig/system/pdp.c
+++ pdp/system/pdp.c
--- pd-pdp.orig/system/pdp.c
+++ pd-pdp/system/pdp.c
@@ -22,6 +22,11 @@
#include "pdp_config.h"
#include "pdp_post.h"
......
......@@ -6,8 +6,6 @@ fix_typos.patch
hardening.patch
searchpath_check.patch
help_input.patch
fix_v4l.patch
fix_verbosity.patch
scaf_configure.patch
scaf_build.patch
fix_install.patch
......
......@@ -5,8 +5,8 @@ Author: Debian
Last-Update: 2013-12-18
---
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
--- pdp.orig/Makefile
+++ pdp/Makefile
--- pd-pdp.orig/Makefile
+++ pd-pdp/Makefile
@@ -65,8 +65,6 @@
......@@ -16,8 +16,8 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
install -d $(prefix)/lib/pd/extra
install -m 755 $(PDP_LIBRARY_NAME) $(prefix)/lib/pd/extra
install -m 755 -d $(prefix)/include/pdp
--- pdp.orig/opengl/Makefile
+++ pdp/opengl/Makefile
--- pd-pdp.orig/opengl/Makefile
+++ pd-pdp/opengl/Makefile
@@ -35,7 +35,6 @@
# $(CC) -o pdp_opengl.pd_pd_darwin modules/*.o system/*.o $(LDFLAGS) -g -bundle -bundle_loader $(PD_EXECUTABLE)
......@@ -26,9 +26,9 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
install -d $(prefix)/lib/pd/extra
install -m 755 $(PDP_OPENGL_LIBRARY_NAME) $(prefix)/lib/pd/extra
install -m 644 abstractions/*.pd $(prefix)/lib/pd/extra
--- pdp.orig/scaf/Makefile
+++ pdp/scaf/Makefile
@@ -36,8 +36,5 @@
--- pd-pdp.orig/scaf/Makefile
+++ pd-pdp/scaf/Makefile
@@ -37,8 +37,5 @@
install -m 644 compiler/scafmacro.s $(prefix)/lib/scaf || echo failed
install -m 644 compiler/optim.rules $(prefix)/lib/scaf || echo failed
install -m 755 rules/carules.scafo $(prefix)/lib/scaf/default.scafo || echo failed
......
......@@ -8,9 +8,9 @@ Origin: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=758569
Last-Update: 2014-09-01
---
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
--- pdp.orig/system/image/pdp_imageproc_gcc_mmx.c
+++ pdp/system/image/pdp_imageproc_gcc_mmx.c
@@ -1021,6 +1021,24 @@
--- pd-pdp.orig/system/image/pdp_imageproc_gcc_mmx.c
+++ pd-pdp/system/image/pdp_imageproc_gcc_mmx.c
@@ -1024,6 +1024,24 @@
x->height = h;
}
......@@ -35,7 +35,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
static INLINE void
bilin_pixel(t_resample_zoom_rotate *p, word_t *out, __m64 xy_32) {
@@ -1067,26 +1085,12 @@
@@ -1070,26 +1088,12 @@
/* Before fetch, set coords to 0 if they are out-of-bounds,
effecitively implementing wrap-around addressing. */
s16 *im = p->cbrd.csrc.image;
......@@ -66,7 +66,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
/* Perform bilinear interpolation using fractional coordinates. */
word_t w_y0 = w_x0_y0 + (((w_x1_y0 - w_x0_y0) * frac_x) >> 16);
@@ -1217,8 +1221,15 @@
@@ -1220,8 +1224,15 @@
*l = config;
}
......@@ -84,7 +84,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
/* convert floating point center and zoom data to incremental linear remapping vectors */
static void pdp_imageproc_resample_clmd_init_from_id_zrd(t_resample_clmd *l, t_resample_id *i, t_resample_zrd *z)
@@ -1234,18 +1245,14 @@
@@ -1237,18 +1248,14 @@
double c = cos(angle);
double s = sin(angle);
......@@ -109,41 +109,46 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
pdp_imageproc_resample_cookedlinmap_init(l, tl_x, tl_y, row_inc_x, row_inc_y, col_inc_x, col_inc_y);
--- pdp.orig/system/type/pdp_bitmap.c
+++ pdp/system/type/pdp_bitmap.c
@@ -509,6 +509,11 @@
--- pd-pdp.orig/system/type/pdp_bitmap.c
+++ pd-pdp/system/type/pdp_bitmap.c
@@ -523,6 +523,11 @@
return new_p;
}
+static inline u8 _map(s32 pixel){
+s32 mask = ~(pixel>>16);
+return ((pixel >> 7) & mask);
+ s32 mask = ~(pixel>>16);
+ return ((pixel >> 7) & mask);
+}
+
static int _pdp_packet_bitmap_convert_mchp_to_rgb8(int packet, t_pdp_symbol *dest_template)
static int _pdp_packet_bitmap_convert_mchp_to_rgb8(
int packet, t_pdp_symbol __attribute__((unused)) *dest_template)
{
t_pdp *header = pdp_packet_header(packet);
@@ -522,10 +527,6 @@
@@ -536,12 +541,6 @@
int nb_channels = image->depth;
int new_p, i;
// static inline u8 _map(s32 pixel){
- // static inline u8 _map(s32 pixel){
- inline u8 _map(s32 pixel){
- s32 mask = ~(pixel>>16);
- return ((pixel >> 7) & mask);
- }
-
switch(nb_channels){
default: return -1;
--- pdp.orig/system/zl/xwindow.c
+++ pdp/system/zl/xwindow.c
@@ -318,8 +318,9 @@
case 1:
--- pd-pdp.orig/system/zl/xwindow.c
+++ pd-pdp/system/zl/xwindow.c
@@ -329,10 +329,10 @@
}
}
+static void handle(void *x, XEvent *e) {}
+
void zl_xwindow_drop_events(zl_xwindow_p x) {
- void handle(void *x, XEvent *e) {}
zl_xwindow_for_events(x, handle, NULL);
-void zl_xwindow_drop_events(zl_xwindow_p x) {
- void handle(void __attribute__((unused)) *x,
+static void handle_event0(void __attribute__((unused)) *x,
XEvent __attribute__((unused)) *e) {}
- zl_xwindow_for_events(x, handle, NULL);
+void zl_xwindow_drop_events(zl_xwindow_p x) {
+ zl_xwindow_for_events(x, handle_event0, NULL);
}
void zl_xwindow_warppointer(zl_xwindow_p xwin, int x, int y)
......@@ -2,8 +2,7 @@
export PDP_EXTRA_CFLAGS = -fPIC -Wno-error $(CPPFLAGS) $(CFLAGS)
DPKG_EXPORT_BUILDFLAGS = 1
DEB_BUILD_MAINT_OPTIONS=hardening=-format,+fortify,+stackprotector,+relro
export DEB_BUILD_MAINT_OPTIONS
export DEB_BUILD_MAINT_OPTIONS=hardening=+all
include /usr/share/dpkg/buildflags.mk
......
libv4l-dev
libgsl0-dev
libz-dev
libpng12-dev
libx11-dev
libxv-dev
libquicktime-dev
libgl1-mesa-dev
libsdl1.2-dev
......@@ -943,3 +943,218 @@ x86_64, but at least it works.
- example05.pd : multiple window render contexts
- example06.pd : bug in scaf CA grid -> texture conversion ?
Entry: glxcontext
Date: Sat Dec 21 17:55:00 EST 2013
void zl_3Dcontext_glx_setup(void) {
...
glx_env.glx = zl_glx_new();
...
}
There's some confusion about context and drawables... Find out
exactly what the relation is between these. The bug is probably just
a misunderstanding of what is what.
glXMakeCurrent takes:
- Display
- GLXDrawable (window)
- GLXContext
When a 3dp window is closed and reopened, the drawable should change,
but the display and context should remain the same.
The problem seems to be that the drawable is gone. Maybe this is just
a flush problem?
Or, does the closing of the window also delete the context?
no
Something non-obvious is going on here. It doesn't look like the
swapbuffer call is the source of the problem, just a symptom.
X Error of failed request: BadMatch (invalid parameter attributes)
Major opcode of failed request: 154 (GLX)
Minor opcode of failed request: 11 (X_GLXSwapBuffers)
Serial number of failed request: 320
Current serial number in output stream: 321
I'm guessing this is just fallout from a dangling reference issue.
Entry: Cleanup
Date: Sun Dec 22 14:43:23 EST 2013
So I really want to clean up PDP to make it maintainable. What that
means in practice is to _remove_ stuff.
One of the complications is the procqueue. I wonder if it is actually
used for anything essential. It can probably be replaced with
abstract interpretation.
The problem here is time. This is not someting for an incremental
job. Or at least, the increments will be fairly large.
Entry: Debug GLX error
Date: Mon Dec 30 17:35:38 EST 2013
..
glXSwapBuffers(0x7fb9f0000950,0x1600003)
glXSwapBuffers(0x7fb9f0000950,0x1600003)
zl_3Dcontext_free(0x1d2baf0,(nil))
glXSwapBuffers(0x7fb9f0000950,0x160000a)
glXSwapBuffers(0x7fb9f0000950,0x160000a)
glXSwapBuffers(0x7fb9f0000950,0x160000a)
X Error of failed request: BadMatch (invalid parameter attributes)
Major opcode of failed request: 154 (GLX)
Minor opcode of failed request: 11 (X_GLXSwapBuffers)
Serial number of failed request: 592
Current serial number in output stream: 594
I'd like to really know what is going on here, i.e. go into the
graphics driver and see why it raises a BadMatch, which is not what
it's supposed to do. At least I find no valid reason.
Maybe mesa debug would help here?
Entry: Better errors on Acer Revo / Ubuntu
Date: Mon Jan 6 11:36:08 EST 2014
glXSwapBuffers(0xb35004e0,0x1800003)
glXSwapBuffers(0xb35004e0,0x1800003)
glXSwapBuffers(0xb35004e0,0x1800003)
glXSwapBuffers(0xb35004e0,0x1800003)
zl_3Dcontext_free(0x87364e8,(nil))
glXSwapBuffers(0xb35004e0,0x180000a)
glXSwapBuffers(0xb35004e0,0x180000a)
X Error of failed request: GLXBadDrawable
Major opcode of failed request: 153 (GLX)
Minor opcode of failed request: 11 (X_GLXSwapBuffers)
Serial number of failed request: 81
Current serial number in output stream: 82
Entry: Main 3D rendering objects
Date: Mon Jan 6 11:36:55 EST 2014
The problem is one of organization.
- X server connection
- GLX contex
- X window (drawable)
How to fix? Probably best to trace all gl calls. Is there a simple
way to do this without manual edit?
Entry: gdb
Date: Mon Jan 6 12:13:00 EST 2014
Is this just me getting old and confused, or did the buggy nature of
emacs / gdb just get worse over time?
I'm gessing the problem is that the process stdout/stderr is not
tagged with target-stream-output '@'.
Entry: zl updates
Date: Sat Aug 16 12:08:04 EDT 2014
Looks like this broke:
pdp_3d_windowcontext.c:133:5: warning: implicit declaration of function ‘pdp_packet_3Dcontext_event_out’ [-Wimplicit-function-declaration]
pdp_packet_3Dcontext_event_out(p, x->x_eventout);
Entry: __attribute__((unused))
Date: Sat Aug 16 12:08:16 EDT 2014
A useful warning, so added the attribute to all dummy variables.
Entry: cleanup
Date: Mon Jan 6 13:52:35 EST 2014
Is there a way to clean up PDP to make it easier to maintain?
What I want to do is to reduce everything to a libprim core, then port
it to the existing PDP api. I.e. I want to toss it all out.
This however is not realistic without a design of what PDP is supposed
to be. The trouble is feature creep.
Obtaining a design would require a review of each file to understand
how it actually works and where it is broken due to bad interactions.
Some elements of the API that are a bit crooked:
- planar processing (e.g. chanmask)
- autoconvert
- procqueue
- refcount mechanism
- dpd / 3dp "serial programming" idea
Practically, moving part by part to libprim or other libraries is
probably the best approach.
I don't have the time/energy/motivation to turn this into a large sprint.
The best I can do for now is incremental increases.
Entry: Picking up again
Date: Sat Oct 31 08:59:29 EDT 2015
For those who lost track: this got off the rails a little. PDP/PF
have been stepping-stone projects towards learning more about
designing programs, virtual machines, programming languages and
compilers. The idea has been to keep PDP and PF up with the
development in that area, which has largely been infeasbile due to the
large amount of design errors made in the process. Today, another
attempt to fix things.
Current state:
libprim: simple object system
zl: bindings to (linux) libraries
The idea was to build PF and possibly PDP on those two libraries, and
then use RAI to generate DSP code.
Entry: PF fixes
Date: Mon Nov 2 07:57:08 EST 2015
Spent this weekend propagating some changes in libprim/leaf to
libprim/pf:
- leaf_object has a built in rc count, which is used to create
composite (tree-structured) leaf objects.
- removed the RC wrapper used in PF, and renamed the LIN wrapper to
UNIQ.
It looks like the PF design is sound, however its implementation could
probably be made a little simpler.
......@@ -155,7 +155,7 @@ t_class *pdp_del_class;
void *pdp_del_new(t_floatarg forder, t_floatarg fdel)
void *pdp_del_new(t_floatarg forder, t_floatarg __attribute__((unused)) fdel)
{
int order = (int)forder;
int del;
......
......@@ -55,7 +55,7 @@ static void pdp_description_input_dpd(t_pdp_description *x, t_symbol *s, t_float
}
static void pdp_description_free(t_pdp_description *x)
static void pdp_description_free(t_pdp_description __attribute__((unused)) *x)
{
}
......@@ -64,7 +64,9 @@ t_class *pdp_description_class;
static void *pdp_description_new(t_symbol *s, int argc, t_atom *argv)
static void *pdp_description_new(t_symbol __attribute__((unused)) *s,
int __attribute__((unused)) argc,
t_atom __attribute__((unused)) *argv)
{
t_pdp_description *x = (t_pdp_description *)pd_new(pdp_description_class);
......
......@@ -79,7 +79,7 @@ static void pdp_inspect_input_0(t_pdp_inspect *x, t_symbol *s, t_floatarg f)
static void pdp_inspect_free(t_pdp_inspect *x)
static void pdp_inspect_free(t_pdp_inspect __attribute__((unused)) *x)
{
}
......
......@@ -97,7 +97,9 @@ static t_class *metro_class;
static void *metro_new(t_symbol *s, int argc, t_atom *argv)
static void *metro_new(t_symbol __attribute__((unused)) *s,
int __attribute__((unused)) argc,
__attribute__((unused)) t_atom *argv)
{
t_metro *x = (t_metro *)pd_new(metro_class);
x->x_outlet = outlet_new(&x->x_obj, &s_bang);
......
......@@ -87,7 +87,7 @@ static void pdp_route_route(t_pdp_route *x, t_floatarg f)
static void pdp_route_free(t_pdp_route *x)
static void pdp_route_free(t_pdp_route __attribute__((unused)) *x)
{
}
......
......@@ -125,7 +125,8 @@ t_class *pdp_trigger_class;
static void *pdp_trigger_new(t_symbol *s, int argc, t_atom *argv)
static void *pdp_trigger_new(t_symbol __attribute__((unused)) *s,
int argc, t_atom *argv)
{
t_pdp_trigger *x = (t_pdp_trigger *)pd_new(pdp_trigger_class);
t_atom defarg[2], *ap;
......
......@@ -115,7 +115,7 @@ static void _wait_until_done(t_pdp_udp_send *x)
}
static void _remove_packet_from_queue(t_pdp_udp_send *x)
static void _remove_packet_from_queue(t_pdp_udp_send __attribute__((unused)) *x)
{
}
......
......@@ -234,7 +234,7 @@ static void pdp_v4l_bang(t_pdp_v4l *x) {
/* Get raw image data */
unsigned char *newimage = NULL;
zl_v4l_next(&x->zl, &newimage);
zl_v4l_next(&x->zl, &newimage, 0);
if (NULL == newimage) return;
unsigned int fourcc;
......@@ -306,7 +306,8 @@ static void pdp_v4l_free(t_pdp_v4l *x) {
pdp_v4l_close(x);
}
static void pdp_v4l_norm(t_pdp_v4l *x, t_symbol *s) {
static void pdp_v4l_norm(t_pdp_v4l __attribute__((unused)) *x,
t_symbol __attribute__((unused)) *s) {
#ifdef HAVE_V4L1
unsigned int norm;
if (gensym("PAL") == s) norm = VIDEO_MODE_PAL;
......@@ -372,7 +373,7 @@ t_class *pdp_v4l_class;
void *pdp_v4l_new(t_symbol *vdef, t_symbol *format)
void *pdp_v4l_new(t_symbol __attribute__((unused)) *vdef, t_symbol *format)
{
t_pdp_v4l *x = (t_pdp_v4l *)pd_new(pdp_v4l_class);
......
......@@ -166,7 +166,7 @@ t_class *pdp_grey2array_class;
void *pdp_array2grey_new(t_symbol *s, t_symbol *r)
void *pdp_array2grey_new(t_symbol *s, t_symbol __attribute__((unused)) *r)
{
t_pdp_array *x = (t_pdp_array *)pd_new(pdp_array2grey_class);
pdp_array_array(x, s);
......
......@@ -105,7 +105,7 @@ t_class *pdp_chrot_class;
void *pdp_chrot_new(t_floatarg f)
void *pdp_chrot_new(t_floatarg __attribute__((unused)) f)
{
t_pdp_chrot *x = (t_pdp_chrot *)pd_new(pdp_chrot_class);
......
......@@ -42,7 +42,8 @@ typedef struct pdp_mat_vec_struct
#define GETDOUBLE(x) (double)GETFLOAT(x)
static void pdp_mat_vec_list_in(t_pdp_mat_vec *x, t_symbol *s, int argc, t_atom *argv)
static void pdp_mat_vec_list_in(t_pdp_mat_vec *x, t_symbol __attribute__((unused)) *s,
int argc, t_atom *argv)
{
int i;
int vp = -1;
......@@ -175,7 +176,7 @@ void *pdp_mat_vec_list2vec_new(t_symbol *type)
}
void *pdp_mat_vec_vec2list_new(t_symbol *type)
void *pdp_mat_vec_vec2list_new(t_symbol __attribute__((unused)) *type)
{
t_pdp_mat_vec *x = pdp_mat_vec_base_new();
x->x_out = outlet_new((t_object *)x, &s_anything);
......
#N canvas 426 142 799 779 10;
#N canvas 0 29 681 737 10;
#X floatatom 126 37 5 0 0 0 - - -;
#X obj 56 20 bng 15 250 50 0 empty empty empty 0 -6 0 8 -262144 -1
-1;
......@@ -113,7 +113,7 @@
#X obj 59 54 metro 20;
#X obj 238 207 * 0.05;
#X obj 9 570 spigot;
#X obj 76 546 tgl 15 0 empty empty empty 0 -6 0 8 -262144 -1 -1 1 1
#X obj 76 546 tgl 15 0 empty empty empty 0 -6 0 8 -262144 -1 -1 0 1
;
#X obj 612 122 + 1;
#X text 28 521 texture feedback;
......@@ -122,6 +122,7 @@
#X text 549 734 ---;
#X text 549 787 ---;
#X obj 59 176 3dp_mouserotate;
#X msg 188 47 close;
#X connect 0 0 108 1;
#X connect 1 0 108 0;
#X connect 2 0 108 0;
......@@ -255,3 +256,4 @@
#X connect 112 0 101 1;
#X connect 112 0 105 0;
#X connect 118 0 54 0;
#X connect 119 0 95 0;
set breakpoint pending on
break glXSwapBuffers
run
#N canvas 0 30 1438 868 10;
#X floatatom 126 37 5 0 0 0 - - -, f 5;
#X obj 56 20 bng 15 250 50 0 empty empty empty 0 -6 0 8 -262144 -1
-1;
#X msg 83 19 stop;
#X floatatom 360 431 5 0 0 0 - - -, f 5;
#X obj 59 103 3dp_push;
#X floatatom 672 189 5 0 0 0 - - -, f 5;
#X obj 546 244 3dp_view transx 3;
#X obj 546 270 3dp_light;
#X obj 612 97 f;
#X floatatom 641 98 5 0 0 0 - - -, f 5;
#X floatatom 669 370 5 0 0 0 - - -, f 5;
#X obj 182 491 arm 3;
#X obj 182 514 arm 3;
#X obj 182 537 arm 3;
#X obj 182 467 arm 3;
#X floatatom 360 455 5 0 0 0 - - -, f 5;
#X floatatom 359 478 5 0 0 0 - - -, f 5;
#X floatatom 358 501 5 0 0 0 - - -, f 5;
#X floatatom 358 524 5 0 0 0 - - -, f 5;
#X obj 182 584 arm 3;
#X obj 182 607 arm 3;
#X obj 182 630 arm 3;
#X obj 182 560 arm 3;
#X floatatom 358 548 5 0 0 0 - - -, f 5;
#X floatatom 358 571 5 0 0 0 - - -, f 5;
#X floatatom 358 594 5 0 0 0 - - -, f 5;
#X obj 59 224 3dp_view roty;
#X obj 284 449 * 1;
#X obj 284 589 * -1;
#X obj 182 653 arm 3;
#X floatatom 358 617 5 0 0 0 - - -, f 5;
#X obj 284 635 * -1.5;
#X obj 663 686 s roty;
#X floatatom 615 611 5 0 0 0 - - -, f 5;
#X floatatom 671 585 5 0 0 0 - - -, f 5;
#X obj 673 616 s scale;
#X floatatom 359 388 5 0 0 0 - - -, f 5;
#X obj 284 473 * -1.01;
#X obj 284 496 * 0.99;
#X obj 284 519 * -1.01;
#X obj 284 542 * 2.1;
#X obj 284 566 * -1.7;
#X obj 182 425 3dp_draw cube 1.4;
#X obj 182 809 3dp_draw cube 1.4;
#X msg 597 536 4;
#X obj 59 151 3dp_view transz -3;
#X obj 546 216 3dp_view roty 54;
#X obj 669 392 s cubesize;
#X msg 360 345 3.15;
#X msg 126 17 20;
#X obj 284 612 * 0.11;
#X floatatom 672 220 5 0 0 0 - - -, f 5;
#X msg 612 72 0;
#X obj 342 311 * 1;
#X obj 59 201 3dp_view rotx;
#X floatatom 164 187 5 0 0 0 - - -, f 5;
#X floatatom 358 641 5 0 0 0 - - -, f 5;
#X obj 182 700 arm 3;
#X obj 182 724 arm 3;
#X obj 182 748 arm 3;
#X obj 182 677 arm 3;
#X floatatom 359 664 5 0 0 0 - - -, f 5;
#X floatatom 359 688 5 0 0 0 - - -, f 5;
#X floatatom 360 712 5 0 0 0 - - -, f 5;
#X obj 284 706 * -1;
#X obj 182 771 arm 3;
#X floatatom 360 735 5 0 0 0 - - -, f 5;
#X obj 283 753 * -1.5;
#X obj 284 659 * 2.1;
#X obj 284 682 * -1.7;
#X obj 283 730 * 0.11;
#X obj 9 334 3dp_push;
#X obj 182 399 3dp_view transz;
#X floatatom 282 369 5 0 0 0 - - -, f 5;
#X obj 131 371 3dp_view transz;
#X obj 231 338 * -1;
#X msg 282 341 2;
#X obj 564 401 s drawtorus;
#X obj 564 374 tgl 15 0 empty empty empty 0 -6 0 8 -262144 -1 -1 1
1;
#X obj 674 496 s torusr1;
#X floatatom 672 473 5 0 0 0 - - -, f 5;
#X floatatom 667 419 5 0 0 0 - - -, f 5;
#X obj 669 442 s torusr2;
#X msg 564 349 1;
#X obj 597 645 *;
#X obj 59 126 3dp_push;
#X obj 9 364 3dp_push;
#X obj 9 437 3dp_view rotx;
#X floatatom 96 416 5 0 0 0 - - -, f 5;
#X obj 9 471 3dp_draw sphere 30 40;
#X obj 9 593 3dp_snap;
#X obj 473 487 / 1000;
#X floatatom 473 461 5 0 0 0 - - -, f 5;
#X obj 430 8 loadbang;
#X obj 430 31 bng 15 250 50 0 empty empty empty 0 -6 0 8 -262144 -1
-1;
#X obj 59 77 3dp_windowcontext;
#X obj 59 274 3dp_push;
#X obj 110 303 pdp_t p b;
#X obj 9 307 pdp_t p b;
#X msg 349 252 400;
#X msg 311 252 -400;
#X obj 342 287 +;
#X msg 473 434 3;
#X text 544 189 light source;
#X obj 59 248 3dp_view scale 0.4;
#X obj 640 157 s counter;
#X obj 245 169 r counter;
#X text 694 98 speed;
#X obj 59 54 metro 20;
#X obj 238 207 * 0.05;
#X obj 9 570 spigot;
#X obj 76 546 tgl 15 0 empty empty empty 0 -6 0 8 -262144 -1 -1 0 1
;
#X obj 612 122 + 1;
#X text 28 521 texture feedback;
#X text 486 751 "no-bots in no-sphere";
#X text 459 768 a double dance of 13 segments;
#X text 549 734 ---;
#X text 549 787 ---;
#X obj 59 176 3dp_mouserotate;
#X msg 188 47 close;
#X obj 285 51 delay 5000;
#X connect 0 0 108 1;
#X connect 1 0 108 0;
#X connect 2 0 108 0;
#X connect 3 0 27 1;
#X connect 4 0 85 0;
#X connect 4 1 46 0;
#X connect 5 0 46 1;
#X connect 6 0 7 0;
#X connect 8 0 112 0;
#X connect 9 0 112 1;
#X connect 10 0 47 0;
#X connect 11 0 12 0;
#X connect 12 0 13 0;
#X connect 13 0 22 0;
#X connect 14 0 11 0;
#X connect 15 0 37 1;
#X connect 16 0 38 1;
#X connect 17 0 39 1;
#X connect 18 0 40 1;
#X connect 19 0 20 0;
#X connect 20 0 21 0;
#X connect 21 0 29 0;
#X connect 22 0 19 0;
#X connect 23 0 41 1;
#X connect 24 0 28 1;
#X connect 25 0 50 1;
#X connect 26 0 104 0;
#X connect 27 0 37 0;
#X connect 27 0 14 1;
#X connect 28 0 50 0;
#X connect 28 0 20 1;
#X connect 29 0 60 0;
#X connect 30 0 31 1;
#X connect 31 0 29 1;
#X connect 31 0 68 0;
#X connect 33 0 84 1;
#X connect 34 0 35 0;
#X connect 36 0 42 2;
#X connect 36 0 43 2;
#X connect 37 0 38 0;
#X connect 37 0 11 1;
#X connect 38 0 39 0;
#X connect 38 0 12 1;
#X connect 39 0 40 0;
#X connect 39 0 13 1;
#X connect 40 0 41 0;
#X connect 40 0 22 1;
#X connect 41 0 28 0;
#X connect 41 0 19 1;
#X connect 42 0 14 0;
#X connect 44 0 34 0;
#X connect 45 0 118 0;
#X connect 46 0 6 0;
#X connect 48 0 36 0;
#X connect 48 0 102 0;
#X connect 48 0 76 0;
#X connect 48 0 83 0;
#X connect 49 0 0 0;
#X connect 50 0 31 0;
#X connect 50 0 21 1;
#X connect 51 0 6 1;
#X connect 52 0 8 0;
#X connect 53 0 27 0;
#X connect 54 0 26 0;
#X connect 55 0 54 1;
#X connect 56 0 68 1;
#X connect 57 0 58 0;
#X connect 58 0 59 0;
#X connect 59 0 65 0;
#X connect 60 0 57 0;
#X connect 61 0 69 1;
#X connect 62 0 64 1;
#X connect 63 0 70 1;
#X connect 64 0 70 0;
#X connect 64 0 58 1;
#X connect 65 0 43 0;
#X connect 66 0 67 1;
#X connect 67 0 65 1;
#X connect 68 0 69 0;
#X connect 68 0 60 1;
#X connect 69 0 64 0;
#X connect 69 0 57 1;
#X connect 70 0 67 0;
#X connect 70 0 59 1;
#X connect 71 0 86 0;
#X connect 71 1 74 0;
#X connect 72 0 42 0;
#X connect 73 0 72 1;
#X connect 73 0 75 0;
#X connect 74 0 42 0;
#X connect 75 0 74 1;
#X connect 76 0 73 0;
#X connect 78 0 77 0;
#X connect 80 0 79 0;
#X connect 81 0 82 0;
#X connect 83 0 78 0;
#X connect 84 0 32 0;
#X connect 85 0 45 0;
#X connect 86 0 87 0;
#X connect 87 0 89 0;
#X connect 88 0 87 1;
#X connect 89 0 110 0;
#X connect 90 1 89 1;
#X connect 91 0 33 0;
#X connect 92 0 91 0;
#X connect 93 0 94 0;
#X connect 93 0 120 0;
#X connect 94 0 1 0;
#X connect 94 0 48 0;
#X connect 95 0 4 0;
#X connect 95 1 118 1;
#X connect 96 0 98 0;
#X connect 96 1 97 0;
#X connect 97 0 72 0;
#X connect 97 1 100 0;
#X connect 98 0 71 0;
#X connect 98 1 99 0;
#X connect 99 0 101 0;
#X connect 100 0 101 0;
#X connect 101 0 53 0;
#X connect 102 0 92 0;
#X connect 102 0 44 0;
#X connect 104 0 96 0;
#X connect 106 0 109 0;
#X connect 108 0 95 0;
#X connect 108 0 8 0;
#X connect 109 0 26 1;
#X connect 110 0 90 0;
#X connect 111 0 110 1;
#X connect 112 0 8 1;
#X connect 112 0 84 0;
#X connect 112 0 101 1;
#X connect 112 0 105 0;
#X connect 118 0 54 0;
#X connect 119 0 95 0;
#X connect 120 0 119 0;
#!/bin/bash
cd $(dirname $0)
PD=/usr/local/bin/pd
PDP=/home/tom/pdp
exec gdb -x example01.gdb -i=mi --args $PD \
-nogui -nrt -noprefs \
-path $PDP \
-path $PDP/abstractions \
-path $PDP/opengl \
-path $PDP/opengl/abstractions \
-lib pdp \
-lib pdp_opengl \
example01.pd
File mode changed from 100644 to 100755
......@@ -32,7 +32,7 @@
#include <stdarg.h>
static void pdp_base_debug(t_pdp_base *b, t_floatarg f)
static void pdp_base_debug(t_pdp_base *b, t_floatarg __attribute__((unused)) f)
{
int i;
post("debug");
......
......@@ -55,18 +55,19 @@ typedef struct _pdp_control
static t_pdp_control *pdp_control_list;
static void pdp_control_info(t_pdp_control *x)
static void pdp_control_info(t_pdp_control __attribute__((unused)) *x)
{
}
static void pdp_control_collectgarbage(t_pdp_control *x)
static void pdp_control_collectgarbage(t_pdp_control __attribute__((unused)) *x)
{
int nb_packets_freed = pdp_pool_collect_garbage();
post("pdp_control: freed %d packets", nb_packets_freed);
}
static void pdp_control_set_mem_limit(t_pdp_control *x, t_floatarg f)
static void pdp_control_set_mem_limit(t_pdp_control __attribute__((unused)) *x,
t_floatarg f)
{
int limit = (int)f;
if (limit < 0) limit = 0;
......@@ -76,7 +77,7 @@ static void pdp_control_set_mem_limit(t_pdp_control *x, t_floatarg f)
}
static void pdp_control_thread(t_pdp_control *x, t_floatarg f)
static void pdp_control_thread(t_pdp_control __attribute__((unused)) *x, t_floatarg f)
{
int t = (int)f;
......@@ -170,7 +171,7 @@ void pdp_control_notify_broadcast(t_pdp_control_method_notify *notify)
/************************* notify class methods *************************/
void pdp_control_notify_drop(int packet)
void pdp_control_notify_drop(int __attribute__((unused)) packet)
{
dropped_packets++;
......
......@@ -51,7 +51,7 @@ static void pdp_ut_addscaleclip_float(t_pdp_ut_addscaleclip *x, t_floatarg f)
outlet_float(x->x_outlet0, f);
}
static void pdp_ut_addscaleclip_free(t_pdp_ut_addscaleclip *x){}
static void pdp_ut_addscaleclip_free(t_pdp_ut_addscaleclip __attribute__((unused)) *x){}
void *pdp_ut_addscaleclip_new(t_floatarg offset, t_floatarg scale, t_floatarg min, t_floatarg max)
{
......@@ -120,7 +120,7 @@ static void pdp_ut_logmap_comp_float(t_pdp_ut_map *x, t_floatarg f)
outlet_float(x->x_outlet0, f);
}
static void pdp_ut_map_free(t_pdp_ut_map *x){}
static void pdp_ut_map_free(t_pdp_ut_map __attribute__((unused)) *x){}
void pdp_ut_map_init(t_pdp_ut_map *x, t_floatarg min, t_floatarg max)
......@@ -211,7 +211,7 @@ static void pdp_ut_rgb2ycrcb_blue (t_pdp_ut_rgb2ycrcb* x, t_floatarg f) {x->x
static void pdp_ut_rgb2ycrcb_free (t_pdp_ut_rgb2ycrcb* x) {}
static void pdp_ut_rgb2ycrcb_free (t_pdp_ut_rgb2ycrcb __attribute__((unused)) *x) {}
static void* pdp_ut_rgb2ycrcb_new(void)
{
t_pdp_ut_rgb2ycrcb *x = (t_pdp_ut_rgb2ycrcb *)pd_new(pdp_ut_rgb2ycrcb_class);
......
include Makefile.config
all: pdp_scaf.pd_linux
pdp_scaf_all:
......
......@@ -11,7 +11,7 @@ PDP_CA_LIBS = @LIBS@
DEFAULT_RULES_LIB = @DEFAULT_RULES_LIB@
PDP_CA_AFLAGS =
#--gstabs
PDP_CA_CFLAGS = -DPD -O2 -funroll-loops -fomit-frame-pointer -ffast-math \
PDP_CA_CFLAGS = -DPD -fPIC -O2 -funroll-loops -fomit-frame-pointer -ffast-math \
-Wall -W -Wstrict-prototypes -I../include -I../../include \
-Wno-unused -Wno-parentheses -Wno-switch -g $(PDP_CFLAGS) $(PD_CFLAGS) \
-DPDP_CA_RULES_LIB=\"$(DEFAULT_RULES_LIB)\"
......
This diff is collapsed.
......@@ -66,7 +66,7 @@ static t_pdp_symbol *pdp_packet_ca_get_description(int packet)
}
/* create a new ca packet */
int pdp_packet_new_ca(int encoding, int width, int height)
int pdp_packet_new_ca(int __attribute__((unused)) encoding, int width, int height)
{
int p;
int w = (int)width;
......@@ -279,12 +279,12 @@ void pdp_ca2image_setup(void);
void pdp_image2ca_setup(void);
static int _ca_to_image(int packet, t_pdp_symbol *template)
static int _ca_to_image(int packet, t_pdp_symbol __attribute__((unused)) *template)
{
return pdp_type_ca2grey(packet);
}
static int _image_to_ca(int packet, t_pdp_symbol *template)
static int _image_to_ca(int packet, t_pdp_symbol __attribute__((unused)) *template)
{
// convert with default threshold == 0.5
return pdp_type_grey2ca(packet, 0.5f);
......
......@@ -87,7 +87,8 @@ int pdp_packet_compat(int packet0, int packet1)
/* logic operators */
void pdp_imageproc_xor_process(void *x, u32 width, u32 height, s16 *image, s16 *image2)
void pdp_imageproc_xor_process(void __attribute__((unused)) *x,
u32 width, u32 height, s16 *image, s16 *image2)
{
u32 *plane = (u32 *)image;
u32 *plane2 = (u32 *)image2;
......@@ -99,7 +100,8 @@ void pdp_imageproc_xor_process(void *x, u32 width, u32 height, s16 *image, s16 *
}
}
void pdp_imageproc_and_process(void *x, u32 width, u32 height, s16 *image, s16 *image2)
void pdp_imageproc_and_process(void __attribute__((unused)) *x,
u32 width, u32 height, s16 *image, s16 *image2)
{
u32 *plane = (u32 *)image;
u32 *plane2 = (u32 *)image2;
......@@ -111,7 +113,8 @@ void pdp_imageproc_and_process(void *x, u32 width, u32 height, s16 *image, s16 *
}
}
void pdp_imageproc_or_process(void *x, u32 width, u32 height, s16 *image, s16 *image2)
void pdp_imageproc_or_process(void __attribute__((unused)) *x,
u32 width, u32 height, s16 *image, s16 *image2)
{
u32 *plane = (u32 *)image;
u32 *plane2 = (u32 *)image2;
......@@ -123,7 +126,8 @@ void pdp_imageproc_or_process(void *x, u32 width, u32 height, s16 *image, s16 *i
}
}
void pdp_imageproc_not_process(void *x, u32 width, u32 height, s16 *image)
void pdp_imageproc_not_process(void __attribute__((unused)) *x,
u32 width, u32 height, s16 *image)
{
u32 *plane = (u32 *)image;
int count = (width * height) >> 1;
......@@ -134,7 +138,8 @@ void pdp_imageproc_not_process(void *x, u32 width, u32 height, s16 *image)
}
}
void pdp_imageproc_mask_process(void *x, u32 width, u32 height, s16 *image)
void pdp_imageproc_mask_process(void __attribute__((unused)) *x,
u32 width, u32 height, s16 *image)
{
uptr mask = (uptr)x;
u32 *plane = (u32 *)image;
......@@ -270,13 +275,15 @@ void pdp_imageproc_plasma_process(void *x, u32 width, u32 height, s16 *image)
void pdp_imageproc_zero_process(void *x, u32 width, u32 height, s16 *image)
void pdp_imageproc_zero_process(void __attribute__((unused)) *x,
u32 width, u32 height, s16 *image)
{
int bytesize = (width * height) << 1;
memset(image, 0, bytesize);
}
void pdp_imageproc_constant_process(void *x, u32 width, u32 height, s16 *image)
void pdp_imageproc_constant_process(void __attribute__((unused)) *x,
u32 width, u32 height, s16 *image)
{
int i;
uptr value = (uptr)x;
......@@ -316,7 +323,8 @@ static inline void _decouple(s32 *invec)
*invec &= 0xfffeffff;
}
void pdp_imageproc_abs_process(void *x, u32 width, u32 height, s16 *image)
void pdp_imageproc_abs_process(void __attribute__((unused)) *x,
u32 width, u32 height, s16 *image)
{
int i;
s32 *wimage = (s32 *)image;
......@@ -331,7 +339,8 @@ void pdp_imageproc_abs_process(void *x, u32 width, u32 height, s16 *image)
}
}
void pdp_imageproc_zthresh_process(void *x, u32 width, u32 height, s16 *image)
void pdp_imageproc_zthresh_process(void __attribute__((unused)) *x,
u32 width, u32 height, s16 *image)
{
int i;
s32 *wimage = (s32 *)image;
......@@ -394,7 +403,8 @@ void pdp_imageproc_softthresh_process(void *x, u32 width, u32 height, s16 *image
/* turns an image into a positive andmask */
void pdp_imageproc_ispositive_process(void *x, u32 width, u32 height, s16 *image)
void pdp_imageproc_ispositive_process(void __attribute__((unused)) *x,
u32 width, u32 height, s16 *image)
{
int i;
s32 *wimage = (s32 *)image;
......@@ -406,7 +416,8 @@ void pdp_imageproc_ispositive_process(void *x, u32 width, u32 height, s16 *image
}
/* get sign */
void pdp_imageproc_sign_process(void *x, u32 width, u32 height, s16 *image)
void pdp_imageproc_sign_process(void __attribute__((unused)) *x,
u32 width, u32 height, s16 *image)
{
int i;
s32 *wimage = (s32 *)image;
......@@ -418,7 +429,8 @@ void pdp_imageproc_sign_process(void *x, u32 width, u32 height, s16 *image)
}
/* flip left <-> right */
void pdp_imageproc_flip_lr_process(void *dummy, u32 width, u32 height, s16 *image)
void pdp_imageproc_flip_lr_process(void __attribute__((unused)) *x,
u32 width, u32 height, s16 *image)
{
u32 y;
s16 tmp, *l, *r;
......@@ -439,7 +451,8 @@ void pdp_imageproc_flip_lr_process(void *dummy, u32 width, u32 height, s16 *imag
void pdp_llconv_flip_top_bottom(s16 *data, int width, int height, int pixelsize);
void pdp_imageproc_flip_tb_process(void *dummy, u32 width, u32 height, s16 *image)