diff --git a/libdc1394-2.2.1.tar.bz2 b/libdc1394-2.2.1.tar.bz2 deleted file mode 100644 index ff622f0..0000000 --- a/libdc1394-2.2.1.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:871afba1fa1fea2c501b06be249fc56aa0dc5b3141c948089606fe051262f28c -size 434750 diff --git a/libdc1394-2.2.2.tar.bz2 b/libdc1394-2.2.2.tar.bz2 new file mode 100644 index 0000000..39b0431 --- /dev/null +++ b/libdc1394-2.2.2.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:cd65a50f06c1500360a5be12cefd9f6e7dc232d0e4f77585f7cffe6299b54ecc +size 461997 diff --git a/libdc1394-swab_fix.patch b/libdc1394-swab_fix.patch index 832e934..6d11494 100644 --- a/libdc1394-swab_fix.patch +++ b/libdc1394-swab_fix.patch @@ -1,10 +1,14 @@ ---- a/libdc1394-2.2.1/dc1394/conversions.c -+++ b/libdc1394-2.2.1/dc1394/conversions.c -@@ -22,11 +22,10 @@ +Index: libdc1394-2.2.2/dc1394/conversions.c +=================================================================== +--- libdc1394-2.2.2.orig/dc1394/conversions.c ++++ libdc1394-2.2.2/dc1394/conversions.c +@@ -20,13 +20,12 @@ + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ ++#define _XOPEN_SOURCE #include #include -+#define _XOPEN_SOURCE +#include #include "conversions.h" diff --git a/libdc1394-visibility.patch b/libdc1394-visibility.patch index 564f5e0..a01d5fb 100644 --- a/libdc1394-visibility.patch +++ b/libdc1394-visibility.patch @@ -1,7 +1,8 @@ -diff -urN libdc1394-2.2.1.orig/configure.in libdc1394-2.2.1/configure.in ---- libdc1394-2.2.1.orig/configure.in 2011-08-29 09:58:17.271211906 +0200 -+++ libdc1394-2.2.1/configure.in 2011-08-29 10:01:52.563014990 +0200 -@@ -132,6 +132,23 @@ +Index: libdc1394-2.2.2/configure.ac +=================================================================== +--- libdc1394-2.2.2.orig/configure.ac ++++ libdc1394-2.2.2/configure.ac +@@ -136,6 +136,23 @@ AC_TYPE_SIZE_T AC_FUNC_MMAP @@ -25,9 +26,10 @@ diff -urN libdc1394-2.2.1.orig/configure.in libdc1394-2.2.1/configure.in dnl --------------------------------------------------------------------------- dnl When making a release: dnl 1. If the library source code has changed at all since the last release, -diff -urN libdc1394-2.2.1.orig/dc1394/bayer.c libdc1394-2.2.1/dc1394/bayer.c ---- libdc1394-2.2.1.orig/dc1394/bayer.c 2011-08-29 09:58:17.274211906 +0200 -+++ libdc1394-2.2.1/dc1394/bayer.c 2011-08-29 10:01:52.564014989 +0200 +Index: libdc1394-2.2.2/dc1394/bayer.c +=================================================================== +--- libdc1394-2.2.2.orig/dc1394/bayer.c ++++ libdc1394-2.2.2/dc1394/bayer.c @@ -26,6 +26,7 @@ #include #include @@ -45,7 +47,7 @@ diff -urN libdc1394-2.2.1.orig/dc1394/bayer.c libdc1394-2.2.1/dc1394/bayer.c ClearBorders(uint8_t *rgb, int sx, int sy, int w) { int i, j; -@@ -61,7 +62,7 @@ +@@ -61,7 +62,7 @@ ClearBorders(uint8_t *rgb, int sx, int s } } @@ -54,7 +56,7 @@ diff -urN libdc1394-2.2.1.orig/dc1394/bayer.c libdc1394-2.2.1/dc1394/bayer.c ClearBorders_uint16(uint16_t * rgb, int sx, int sy, int w) { int i, j; -@@ -99,7 +100,7 @@ +@@ -99,7 +100,7 @@ ClearBorders_uint16(uint16_t * rgb, int /* 8-bits versions */ /* insprired by OpenCV's Bayer decoding */ @@ -63,7 +65,7 @@ diff -urN libdc1394-2.2.1.orig/dc1394/bayer.c libdc1394-2.2.1/dc1394/bayer.c dc1394_bayer_NearestNeighbor(const uint8_t *restrict bayer, uint8_t *restrict rgb, int sx, int sy, int tile) { const int bayerStep = sx; -@@ -184,7 +185,7 @@ +@@ -184,7 +185,7 @@ dc1394_bayer_NearestNeighbor(const uint8 } /* OpenCV's Bayer decoding */ @@ -72,7 +74,7 @@ diff -urN libdc1394-2.2.1.orig/dc1394/bayer.c libdc1394-2.2.1/dc1394/bayer.c dc1394_bayer_Bilinear(const uint8_t *restrict bayer, uint8_t *restrict rgb, int sx, int sy, int tile) { const int bayerStep = sx; -@@ -295,7 +296,7 @@ +@@ -295,7 +296,7 @@ dc1394_bayer_Bilinear(const uint8_t *res /* High-Quality Linear Interpolation For Demosaicing Of Bayer-Patterned Color Images, by Henrique S. Malvar, Li-wei He, and Ross Cutler, in ICASSP'04 */ @@ -81,7 +83,7 @@ diff -urN libdc1394-2.2.1.orig/dc1394/bayer.c libdc1394-2.2.1/dc1394/bayer.c dc1394_bayer_HQLinear(const uint8_t *restrict bayer, uint8_t *restrict rgb, int sx, int sy, int tile) { const int bayerStep = sx; -@@ -497,7 +498,7 @@ +@@ -497,7 +498,7 @@ dc1394_bayer_HQLinear(const uint8_t *res /* (Laroche,Claude A. "Apparatus and method for adaptively interpolating a full color image utilizing chrominance gradients" U.S. Patent 5,373,322) */ @@ -90,7 +92,7 @@ diff -urN libdc1394-2.2.1.orig/dc1394/bayer.c libdc1394-2.2.1/dc1394/bayer.c dc1394_bayer_EdgeSense(const uint8_t *restrict bayer, uint8_t *restrict rgb, int sx, int sy, int tile) { /* Removed due to patent concerns */ -@@ -505,7 +506,7 @@ +@@ -505,7 +506,7 @@ dc1394_bayer_EdgeSense(const uint8_t *re } /* coriander's Bayer decoding */ @@ -99,7 +101,7 @@ diff -urN libdc1394-2.2.1.orig/dc1394/bayer.c libdc1394-2.2.1/dc1394/bayer.c dc1394_bayer_Downsample(const uint8_t *restrict bayer, uint8_t *restrict rgb, int sx, int sy, int tile) { uint8_t *outR, *outG, *outB; -@@ -563,7 +564,7 @@ +@@ -563,7 +564,7 @@ dc1394_bayer_Downsample(const uint8_t *r } /* this is the method used inside AVT cameras. See AVT docs. */ @@ -108,7 +110,7 @@ diff -urN libdc1394-2.2.1.orig/dc1394/bayer.c libdc1394-2.2.1/dc1394/bayer.c dc1394_bayer_Simple(const uint8_t *restrict bayer, uint8_t *restrict rgb, int sx, int sy, int tile) { const int bayerStep = sx; -@@ -650,7 +651,7 @@ +@@ -650,7 +651,7 @@ dc1394_bayer_Simple(const uint8_t *restr /* 16-bits versions */ /* insprired by OpenCV's Bayer decoding */ @@ -117,7 +119,7 @@ diff -urN libdc1394-2.2.1.orig/dc1394/bayer.c libdc1394-2.2.1/dc1394/bayer.c dc1394_bayer_NearestNeighbor_uint16(const uint16_t *restrict bayer, uint16_t *restrict rgb, int sx, int sy, int tile, int bits) { const int bayerStep = sx; -@@ -735,7 +736,7 @@ +@@ -735,7 +736,7 @@ dc1394_bayer_NearestNeighbor_uint16(cons } /* OpenCV's Bayer decoding */ @@ -126,7 +128,7 @@ diff -urN libdc1394-2.2.1.orig/dc1394/bayer.c libdc1394-2.2.1/dc1394/bayer.c dc1394_bayer_Bilinear_uint16(const uint16_t *restrict bayer, uint16_t *restrict rgb, int sx, int sy, int tile, int bits) { const int bayerStep = sx; -@@ -835,7 +836,7 @@ +@@ -835,7 +836,7 @@ dc1394_bayer_Bilinear_uint16(const uint1 /* High-Quality Linear Interpolation For Demosaicing Of Bayer-Patterned Color Images, by Henrique S. Malvar, Li-wei He, and Ross Cutler, in ICASSP'04 */ @@ -135,7 +137,7 @@ diff -urN libdc1394-2.2.1.orig/dc1394/bayer.c libdc1394-2.2.1/dc1394/bayer.c dc1394_bayer_HQLinear_uint16(const uint16_t *restrict bayer, uint16_t *restrict rgb, int sx, int sy, int tile, int bits) { const int bayerStep = sx; -@@ -1045,7 +1046,7 @@ +@@ -1045,7 +1046,7 @@ dc1394_bayer_HQLinear_uint16(const uint1 } /* coriander's Bayer decoding */ @@ -144,7 +146,7 @@ diff -urN libdc1394-2.2.1.orig/dc1394/bayer.c libdc1394-2.2.1/dc1394/bayer.c dc1394_bayer_EdgeSense_uint16(const uint16_t *restrict bayer, uint16_t *restrict rgb, int sx, int sy, int tile, int bits) { /* Removed due to patent concerns */ -@@ -1053,7 +1054,7 @@ +@@ -1053,7 +1054,7 @@ dc1394_bayer_EdgeSense_uint16(const uint } /* coriander's Bayer decoding */ @@ -153,7 +155,7 @@ diff -urN libdc1394-2.2.1.orig/dc1394/bayer.c libdc1394-2.2.1/dc1394/bayer.c dc1394_bayer_Downsample_uint16(const uint16_t *restrict bayer, uint16_t *restrict rgb, int sx, int sy, int tile, int bits) { uint16_t *outR, *outG, *outB; -@@ -1113,7 +1114,7 @@ +@@ -1113,7 +1114,7 @@ dc1394_bayer_Downsample_uint16(const uin } /* coriander's Bayer decoding */ @@ -162,7 +164,7 @@ diff -urN libdc1394-2.2.1.orig/dc1394/bayer.c libdc1394-2.2.1/dc1394/bayer.c dc1394_bayer_Simple_uint16(const uint16_t *restrict bayer, uint16_t *restrict rgb, int sx, int sy, int tile, int bits) { uint16_t *outR, *outG, *outB; -@@ -1329,7 +1330,7 @@ +@@ -1329,7 +1330,7 @@ static const signed char bayervng_terms[ +1,+0,+2,+1,0,0x10 }, bayervng_chood[] = { -1,-1, -1,0, -1,+1, 0,+1, +1,+1, +1,0, +1,-1, 0,-1 }; @@ -171,7 +173,7 @@ diff -urN libdc1394-2.2.1.orig/dc1394/bayer.c libdc1394-2.2.1/dc1394/bayer.c dc1394_bayer_VNG(const uint8_t *restrict bayer, uint8_t *restrict dst, int sx, int sy, dc1394color_filter_t pattern) -@@ -1455,7 +1456,7 @@ +@@ -1455,7 +1456,7 @@ dc1394_bayer_VNG(const uint8_t *restrict } @@ -180,7 +182,7 @@ diff -urN libdc1394-2.2.1.orig/dc1394/bayer.c libdc1394-2.2.1/dc1394/bayer.c dc1394_bayer_VNG_uint16(const uint16_t *restrict bayer, uint16_t *restrict dst, int sx, int sy, dc1394color_filter_t pattern, int bits) -@@ -1631,7 +1632,7 @@ +@@ -1631,7 +1632,7 @@ static void cam_to_cielab (uint16_t cam[ */ #define TS 256 /* Tile Size */ @@ -189,7 +191,7 @@ diff -urN libdc1394-2.2.1.orig/dc1394/bayer.c libdc1394-2.2.1/dc1394/bayer.c dc1394_bayer_AHD(const uint8_t *restrict bayer, uint8_t *restrict dst, int sx, int sy, dc1394color_filter_t pattern) -@@ -1806,7 +1807,7 @@ +@@ -1806,7 +1807,7 @@ dc1394_bayer_AHD(const uint8_t *restrict return DC1394_SUCCESS; } @@ -198,7 +200,7 @@ diff -urN libdc1394-2.2.1.orig/dc1394/bayer.c libdc1394-2.2.1/dc1394/bayer.c dc1394_bayer_AHD_uint16(const uint16_t *restrict bayer, uint16_t *restrict dst, int sx, int sy, dc1394color_filter_t pattern, int bits) -@@ -1977,7 +1978,7 @@ +@@ -1977,7 +1978,7 @@ dc1394_bayer_AHD_uint16(const uint16_t * return DC1394_SUCCESS; } @@ -207,7 +209,7 @@ diff -urN libdc1394-2.2.1.orig/dc1394/bayer.c libdc1394-2.2.1/dc1394/bayer.c dc1394_bayer_decoding_8bit(const uint8_t *restrict bayer, uint8_t *restrict rgb, uint32_t sx, uint32_t sy, dc1394color_filter_t tile, dc1394bayer_method_t method) { switch (method) { -@@ -2003,7 +2004,7 @@ +@@ -2003,7 +2004,7 @@ dc1394_bayer_decoding_8bit(const uint8_t } @@ -216,7 +218,7 @@ diff -urN libdc1394-2.2.1.orig/dc1394/bayer.c libdc1394-2.2.1/dc1394/bayer.c dc1394_bayer_decoding_16bit(const uint16_t *restrict bayer, uint16_t *restrict rgb, uint32_t sx, uint32_t sy, dc1394color_filter_t tile, dc1394bayer_method_t method, uint32_t bits) { switch (method) { -@@ -2029,7 +2030,7 @@ +@@ -2029,7 +2030,7 @@ dc1394_bayer_decoding_16bit(const uint16 } @@ -225,7 +227,7 @@ diff -urN libdc1394-2.2.1.orig/dc1394/bayer.c libdc1394-2.2.1/dc1394/bayer.c Adapt_buffer_bayer(dc1394video_frame_t *in, dc1394video_frame_t *out, dc1394bayer_method_t method) { uint32_t bpp; -@@ -2118,7 +2119,7 @@ +@@ -2118,7 +2119,7 @@ Adapt_buffer_bayer(dc1394video_frame_t * return DC1394_MEMORY_ALLOCATION_FAILURE; } @@ -234,9 +236,10 @@ diff -urN libdc1394-2.2.1.orig/dc1394/bayer.c libdc1394-2.2.1/dc1394/bayer.c dc1394_debayer_frames(dc1394video_frame_t *in, dc1394video_frame_t *out, dc1394bayer_method_t method) { if ((methodDC1394_BAYER_METHOD_MAX)) -diff -urN libdc1394-2.2.1.orig/dc1394/capture.c libdc1394-2.2.1/dc1394/capture.c ---- libdc1394-2.2.1.orig/dc1394/capture.c 2011-08-29 09:58:17.276211906 +0200 -+++ libdc1394-2.2.1/dc1394/capture.c 2011-08-29 10:01:52.564014989 +0200 +Index: libdc1394-2.2.2/dc1394/capture.c +=================================================================== +--- libdc1394-2.2.2.orig/dc1394/capture.c ++++ libdc1394-2.2.2/dc1394/capture.c @@ -23,8 +23,9 @@ #include "control.h" #include "platform.h" @@ -248,7 +251,7 @@ diff -urN libdc1394-2.2.1.orig/dc1394/capture.c libdc1394-2.2.1/dc1394/capture.c dc1394_capture_setup (dc1394camera_t *camera, uint32_t num_dma_buffers, uint32_t flags) { -@@ -35,7 +36,7 @@ +@@ -35,7 +36,7 @@ dc1394_capture_setup (dc1394camera_t *ca return d->capture_setup (cpriv->pcam, num_dma_buffers, flags); } @@ -257,7 +260,7 @@ diff -urN libdc1394-2.2.1.orig/dc1394/capture.c libdc1394-2.2.1/dc1394/capture.c dc1394_capture_stop (dc1394camera_t *camera) { dc1394camera_priv_t * cpriv = DC1394_CAMERA_PRIV (camera); -@@ -45,7 +46,7 @@ +@@ -45,7 +46,7 @@ dc1394_capture_stop (dc1394camera_t *cam return d->capture_stop (cpriv->pcam); } @@ -266,7 +269,7 @@ diff -urN libdc1394-2.2.1.orig/dc1394/capture.c libdc1394-2.2.1/dc1394/capture.c dc1394_capture_get_fileno (dc1394camera_t * camera) { dc1394camera_priv_t * cpriv = DC1394_CAMERA_PRIV (camera); -@@ -55,7 +56,7 @@ +@@ -55,7 +56,7 @@ dc1394_capture_get_fileno (dc1394camera_ return d->capture_get_fileno (cpriv->pcam); } @@ -275,7 +278,7 @@ diff -urN libdc1394-2.2.1.orig/dc1394/capture.c libdc1394-2.2.1/dc1394/capture.c dc1394_capture_dequeue (dc1394camera_t * camera, dc1394capture_policy_t policy, dc1394video_frame_t **frame) { -@@ -66,7 +67,7 @@ +@@ -66,7 +67,7 @@ dc1394_capture_dequeue (dc1394camera_t * return d->capture_dequeue (cpriv->pcam, policy, frame); } @@ -284,7 +287,7 @@ diff -urN libdc1394-2.2.1.orig/dc1394/capture.c libdc1394-2.2.1/dc1394/capture.c dc1394_capture_enqueue (dc1394camera_t * camera, dc1394video_frame_t * frame) { dc1394camera_priv_t * cpriv = DC1394_CAMERA_PRIV (camera); -@@ -76,7 +77,7 @@ +@@ -76,7 +77,7 @@ dc1394_capture_enqueue (dc1394camera_t * return d->capture_enqueue (cpriv->pcam, frame); } @@ -293,9 +296,10 @@ diff -urN libdc1394-2.2.1.orig/dc1394/capture.c libdc1394-2.2.1/dc1394/capture.c dc1394_capture_is_frame_corrupt (dc1394camera_t * camera, dc1394video_frame_t * frame) { -diff -urN libdc1394-2.2.1.orig/dc1394/control.c libdc1394-2.2.1/dc1394/control.c ---- libdc1394-2.2.1.orig/dc1394/control.c 2011-08-29 09:58:17.276211906 +0200 -+++ libdc1394-2.2.1/dc1394/control.c 2011-08-29 10:01:52.566014987 +0200 +Index: libdc1394-2.2.2/dc1394/control.c +=================================================================== +--- libdc1394-2.2.2.orig/dc1394/control.c ++++ libdc1394-2.2.2/dc1394/control.c @@ -27,8 +27,9 @@ #include "internal.h" @@ -307,7 +311,7 @@ diff -urN libdc1394-2.2.1.orig/dc1394/control.c libdc1394-2.2.1/dc1394/control.c dc1394_camera_set_broadcast(dc1394camera_t *camera, dc1394bool_t pwr) { dc1394camera_priv_t * priv = DC1394_CAMERA_PRIV (camera); -@@ -38,7 +39,7 @@ +@@ -38,7 +39,7 @@ dc1394_camera_set_broadcast(dc1394camera return d->set_broadcast (priv->pcam, pwr); } @@ -316,7 +320,7 @@ diff -urN libdc1394-2.2.1.orig/dc1394/control.c libdc1394-2.2.1/dc1394/control.c dc1394_camera_get_broadcast(dc1394camera_t *camera, dc1394bool_t *pwr) { dc1394camera_priv_t * priv = DC1394_CAMERA_PRIV (camera); -@@ -48,7 +49,7 @@ +@@ -48,7 +49,7 @@ dc1394_camera_get_broadcast(dc1394camera return d->get_broadcast (priv->pcam, pwr); } @@ -325,7 +329,7 @@ diff -urN libdc1394-2.2.1.orig/dc1394/control.c libdc1394-2.2.1/dc1394/control.c dc1394_reset_bus (dc1394camera_t * camera) { dc1394camera_priv_t * priv = DC1394_CAMERA_PRIV (camera); -@@ -58,7 +59,7 @@ +@@ -58,7 +59,7 @@ dc1394_reset_bus (dc1394camera_t * camer return d->reset_bus (priv->pcam); } @@ -334,7 +338,7 @@ diff -urN libdc1394-2.2.1.orig/dc1394/control.c libdc1394-2.2.1/dc1394/control.c dc1394_read_cycle_timer (dc1394camera_t * camera, uint32_t * cycle_timer, uint64_t * local_time) { -@@ -69,7 +70,7 @@ +@@ -69,7 +70,7 @@ dc1394_read_cycle_timer (dc1394camera_t return d->read_cycle_timer (priv->pcam, cycle_timer, local_time); } @@ -343,7 +347,7 @@ diff -urN libdc1394-2.2.1.orig/dc1394/control.c libdc1394-2.2.1/dc1394/control.c dc1394_camera_get_node (dc1394camera_t *camera, uint32_t *node, uint32_t * generation) { -@@ -153,7 +154,7 @@ +@@ -153,7 +154,7 @@ update_camera_info (dc1394camera_t *came return DC1394_SUCCESS; } @@ -352,7 +356,7 @@ diff -urN libdc1394-2.2.1.orig/dc1394/control.c libdc1394-2.2.1/dc1394/control.c dc1394_camera_print_info(dc1394camera_t *camera, FILE* fd) { dc1394camera_priv_t * cpriv = DC1394_CAMERA_PRIV (camera); -@@ -197,7 +198,7 @@ +@@ -197,7 +198,7 @@ dc1394_camera_print_info(dc1394camera_t Collects the available features for the camera described by node and stores them in features. *****************************************************/ @@ -361,7 +365,7 @@ diff -urN libdc1394-2.2.1.orig/dc1394/control.c libdc1394-2.2.1/dc1394/control.c dc1394_feature_get_all(dc1394camera_t *camera, dc1394featureset_t *features) { uint32_t i, j; -@@ -218,7 +219,7 @@ +@@ -218,7 +219,7 @@ dc1394_feature_get_all(dc1394camera_t *c Stores the bounds and options associated with the feature described by feature->id *****************************************************/ @@ -370,7 +374,7 @@ diff -urN libdc1394-2.2.1.orig/dc1394/control.c libdc1394-2.2.1/dc1394/control.c dc1394_feature_get(dc1394camera_t *camera, dc1394feature_info_t *feature) { uint64_t offset; -@@ -340,7 +341,7 @@ +@@ -340,7 +341,7 @@ dc1394_feature_get(dc1394camera_t *camer Displays the bounds and options of the given feature *****************************************************/ @@ -379,7 +383,7 @@ diff -urN libdc1394-2.2.1.orig/dc1394/control.c libdc1394-2.2.1/dc1394/control.c dc1394_feature_print(dc1394feature_info_t *f, FILE *fd) { int fid= f->id; -@@ -469,7 +470,7 @@ +@@ -469,7 +470,7 @@ dc1394_feature_print(dc1394feature_info_ Displays the entire feature set stored in features *****************************************************/ @@ -388,7 +392,7 @@ diff -urN libdc1394-2.2.1.orig/dc1394/control.c libdc1394-2.2.1/dc1394/control.c dc1394_feature_print_all(dc1394featureset_t *features, FILE *fd) { uint32_t i, j; -@@ -492,7 +493,7 @@ +@@ -492,7 +493,7 @@ dc1394_feature_print_all(dc1394featurese return err; } @@ -397,7 +401,7 @@ diff -urN libdc1394-2.2.1.orig/dc1394/control.c libdc1394-2.2.1/dc1394/control.c dc1394_camera_reset(dc1394camera_t *camera) { dc1394error_t err; -@@ -501,7 +502,7 @@ +@@ -501,7 +502,7 @@ dc1394_camera_reset(dc1394camera_t *came return err; } @@ -406,7 +410,7 @@ diff -urN libdc1394-2.2.1.orig/dc1394/control.c libdc1394-2.2.1/dc1394/control.c dc1394_video_get_supported_modes(dc1394camera_t *camera, dc1394video_modes_t *modes) { dc1394error_t err; -@@ -579,7 +580,7 @@ +@@ -579,7 +580,7 @@ dc1394_video_get_supported_modes(dc1394c return err; } @@ -415,7 +419,7 @@ diff -urN libdc1394-2.2.1.orig/dc1394/control.c libdc1394-2.2.1/dc1394/control.c dc1394_video_get_supported_framerates(dc1394camera_t *camera, dc1394video_mode_t video_mode, dc1394framerates_t *framerates) { dc1394framerate_t framerate; -@@ -624,7 +625,7 @@ +@@ -624,7 +625,7 @@ dc1394_video_get_supported_framerates(dc } @@ -424,7 +428,7 @@ diff -urN libdc1394-2.2.1.orig/dc1394/control.c libdc1394-2.2.1/dc1394/control.c dc1394_video_get_framerate(dc1394camera_t *camera, dc1394framerate_t *framerate) { uint32_t value; -@@ -638,7 +639,7 @@ +@@ -638,7 +639,7 @@ dc1394_video_get_framerate(dc1394camera_ return err; } @@ -433,7 +437,7 @@ diff -urN libdc1394-2.2.1.orig/dc1394/control.c libdc1394-2.2.1/dc1394/control.c dc1394_video_set_framerate(dc1394camera_t *camera, dc1394framerate_t framerate) { dc1394error_t err; -@@ -652,7 +653,7 @@ +@@ -652,7 +653,7 @@ dc1394_video_set_framerate(dc1394camera_ return err; } @@ -442,7 +446,7 @@ diff -urN libdc1394-2.2.1.orig/dc1394/control.c libdc1394-2.2.1/dc1394/control.c dc1394_video_get_mode(dc1394camera_t *camera, dc1394video_mode_t *mode) { dc1394error_t err; -@@ -691,7 +692,7 @@ +@@ -691,7 +692,7 @@ dc1394_video_get_mode(dc1394camera_t *ca return err; } @@ -451,7 +455,7 @@ diff -urN libdc1394-2.2.1.orig/dc1394/control.c libdc1394-2.2.1/dc1394/control.c dc1394_video_set_mode(dc1394camera_t *camera, dc1394video_mode_t mode) { uint32_t format, min; -@@ -737,7 +738,7 @@ +@@ -737,7 +738,7 @@ dc1394_video_set_mode(dc1394camera_t *ca } @@ -460,7 +464,7 @@ diff -urN libdc1394-2.2.1.orig/dc1394/control.c libdc1394-2.2.1/dc1394/control.c dc1394_video_get_iso_speed(dc1394camera_t *camera, dc1394speed_t *speed) { dc1394error_t err; -@@ -767,7 +768,7 @@ +@@ -767,7 +768,7 @@ dc1394_video_get_iso_speed(dc1394camera_ return err; } @@ -469,7 +473,7 @@ diff -urN libdc1394-2.2.1.orig/dc1394/control.c libdc1394-2.2.1/dc1394/control.c dc1394_video_set_iso_speed(dc1394camera_t *camera, dc1394speed_t speed) { dc1394error_t err; -@@ -806,7 +807,7 @@ +@@ -806,7 +807,7 @@ dc1394_video_set_iso_speed(dc1394camera_ return err;; } @@ -478,7 +482,7 @@ diff -urN libdc1394-2.2.1.orig/dc1394/control.c libdc1394-2.2.1/dc1394/control.c dc1394_video_get_iso_channel(dc1394camera_t *camera, uint32_t * channel) { dc1394error_t err; -@@ -827,7 +828,7 @@ +@@ -827,7 +828,7 @@ dc1394_video_get_iso_channel(dc1394camer return DC1394_SUCCESS; } @@ -487,7 +491,7 @@ diff -urN libdc1394-2.2.1.orig/dc1394/control.c libdc1394-2.2.1/dc1394/control.c dc1394_video_set_iso_channel(dc1394camera_t *camera, uint32_t channel) { dc1394error_t err; -@@ -865,7 +866,7 @@ +@@ -865,7 +866,7 @@ dc1394_video_set_iso_channel(dc1394camer return err; } @@ -496,7 +500,7 @@ diff -urN libdc1394-2.2.1.orig/dc1394/control.c libdc1394-2.2.1/dc1394/control.c dc1394_video_get_operation_mode(dc1394camera_t *camera, dc1394operation_mode_t *mode) { dc1394error_t err; -@@ -888,7 +889,7 @@ +@@ -888,7 +889,7 @@ dc1394_video_get_operation_mode(dc1394ca } @@ -505,7 +509,7 @@ diff -urN libdc1394-2.2.1.orig/dc1394/control.c libdc1394-2.2.1/dc1394/control.c dc1394_video_set_operation_mode(dc1394camera_t *camera, dc1394operation_mode_t mode) { dc1394error_t err; -@@ -918,7 +919,7 @@ +@@ -918,7 +919,7 @@ dc1394_video_set_operation_mode(dc1394ca } @@ -514,7 +518,7 @@ diff -urN libdc1394-2.2.1.orig/dc1394/control.c libdc1394-2.2.1/dc1394/control.c dc1394_camera_set_power(dc1394camera_t *camera, dc1394switch_t pwr) { dc1394error_t err; -@@ -938,7 +939,7 @@ +@@ -938,7 +939,7 @@ dc1394_camera_set_power(dc1394camera_t * return err; } @@ -523,7 +527,7 @@ diff -urN libdc1394-2.2.1.orig/dc1394/control.c libdc1394-2.2.1/dc1394/control.c dc1394_video_set_transmission(dc1394camera_t *camera, dc1394switch_t pwr) { dc1394error_t err; -@@ -956,7 +957,7 @@ +@@ -956,7 +957,7 @@ dc1394_video_set_transmission(dc1394came return err; } @@ -532,7 +536,7 @@ diff -urN libdc1394-2.2.1.orig/dc1394/control.c libdc1394-2.2.1/dc1394/control.c dc1394_video_get_transmission(dc1394camera_t *camera, dc1394switch_t *is_on) { dc1394error_t err; -@@ -968,7 +969,7 @@ +@@ -968,7 +969,7 @@ dc1394_video_get_transmission(dc1394came return err; } @@ -541,7 +545,7 @@ diff -urN libdc1394-2.2.1.orig/dc1394/control.c libdc1394-2.2.1/dc1394/control.c dc1394_video_set_one_shot(dc1394camera_t *camera, dc1394switch_t pwr) { dc1394error_t err; -@@ -988,7 +989,7 @@ +@@ -988,7 +989,7 @@ dc1394_video_set_one_shot(dc1394camera_t return err; } @@ -550,7 +554,7 @@ diff -urN libdc1394-2.2.1.orig/dc1394/control.c libdc1394-2.2.1/dc1394/control.c dc1394_video_get_one_shot(dc1394camera_t *camera, dc1394bool_t *is_on) { uint32_t value; -@@ -998,7 +999,7 @@ +@@ -998,7 +999,7 @@ dc1394_video_get_one_shot(dc1394camera_t return err; } @@ -559,7 +563,7 @@ diff -urN libdc1394-2.2.1.orig/dc1394/control.c libdc1394-2.2.1/dc1394/control.c dc1394_video_get_multi_shot(dc1394camera_t *camera, dc1394bool_t *is_on, uint32_t *numFrames) { uint32_t value; -@@ -1010,7 +1011,7 @@ +@@ -1010,7 +1011,7 @@ dc1394_video_get_multi_shot(dc1394camera return err; } @@ -568,7 +572,7 @@ diff -urN libdc1394-2.2.1.orig/dc1394/control.c libdc1394-2.2.1/dc1394/control.c dc1394_video_set_multi_shot(dc1394camera_t *camera, uint32_t numFrames, dc1394switch_t pwr) { dc1394error_t err; -@@ -1030,7 +1031,7 @@ +@@ -1030,7 +1031,7 @@ dc1394_video_set_multi_shot(dc1394camera return err; } @@ -577,7 +581,7 @@ diff -urN libdc1394-2.2.1.orig/dc1394/control.c libdc1394-2.2.1/dc1394/control.c dc1394_feature_whitebalance_get_value(dc1394camera_t *camera, uint32_t *u_b_value, uint32_t *v_r_value) { uint32_t value; -@@ -1042,7 +1043,7 @@ +@@ -1042,7 +1043,7 @@ dc1394_feature_whitebalance_get_value(dc return err; } @@ -586,7 +590,7 @@ diff -urN libdc1394-2.2.1.orig/dc1394/control.c libdc1394-2.2.1/dc1394/control.c dc1394_feature_whitebalance_set_value(dc1394camera_t *camera, uint32_t u_b_value, uint32_t v_r_value) { uint32_t curval; -@@ -1056,7 +1057,7 @@ +@@ -1056,7 +1057,7 @@ dc1394_feature_whitebalance_set_value(dc return err; } @@ -595,7 +599,7 @@ diff -urN libdc1394-2.2.1.orig/dc1394/control.c libdc1394-2.2.1/dc1394/control.c dc1394_feature_temperature_get_value(dc1394camera_t *camera, uint32_t *target_temperature, uint32_t *temperature) { uint32_t value; -@@ -1067,7 +1068,7 @@ +@@ -1067,7 +1068,7 @@ dc1394_feature_temperature_get_value(dc1 return err; } @@ -604,7 +608,7 @@ diff -urN libdc1394-2.2.1.orig/dc1394/control.c libdc1394-2.2.1/dc1394/control.c dc1394_feature_temperature_set_value(dc1394camera_t *camera, uint32_t target_temperature) { dc1394error_t err; -@@ -1083,7 +1084,7 @@ +@@ -1083,7 +1084,7 @@ dc1394_feature_temperature_set_value(dc1 return err; } @@ -613,7 +617,7 @@ diff -urN libdc1394-2.2.1.orig/dc1394/control.c libdc1394-2.2.1/dc1394/control.c dc1394_feature_whiteshading_get_value(dc1394camera_t *camera, uint32_t *r_value, uint32_t *g_value, uint32_t *b_value) { uint32_t value; -@@ -1097,7 +1098,7 @@ +@@ -1097,7 +1098,7 @@ dc1394_feature_whiteshading_get_value(dc return err; } @@ -622,7 +626,7 @@ diff -urN libdc1394-2.2.1.orig/dc1394/control.c libdc1394-2.2.1/dc1394/control.c dc1394_feature_whiteshading_set_value(dc1394camera_t *camera, uint32_t r_value, uint32_t g_value, uint32_t b_value) { uint32_t curval; -@@ -1114,7 +1115,7 @@ +@@ -1114,7 +1115,7 @@ dc1394_feature_whiteshading_set_value(dc return err; } @@ -631,7 +635,7 @@ diff -urN libdc1394-2.2.1.orig/dc1394/control.c libdc1394-2.2.1/dc1394/control.c dc1394_external_trigger_get_mode(dc1394camera_t *camera, dc1394trigger_mode_t *mode) { uint32_t value; -@@ -1129,7 +1130,7 @@ +@@ -1129,7 +1130,7 @@ dc1394_external_trigger_get_mode(dc1394c return err; } @@ -640,7 +644,7 @@ diff -urN libdc1394-2.2.1.orig/dc1394/control.c libdc1394-2.2.1/dc1394/control.c dc1394_external_trigger_set_mode(dc1394camera_t *camera, dc1394trigger_mode_t mode) { dc1394error_t err; -@@ -1152,7 +1153,7 @@ +@@ -1152,7 +1153,7 @@ dc1394_external_trigger_set_mode(dc1394c } @@ -649,7 +653,7 @@ diff -urN libdc1394-2.2.1.orig/dc1394/control.c libdc1394-2.2.1/dc1394/control.c dc1394_external_trigger_get_supported_sources(dc1394camera_t *camera, dc1394trigger_sources_t *sources) { uint32_t value; -@@ -1176,7 +1177,7 @@ +@@ -1176,7 +1177,7 @@ dc1394_external_trigger_get_supported_so } @@ -658,7 +662,7 @@ diff -urN libdc1394-2.2.1.orig/dc1394/control.c libdc1394-2.2.1/dc1394/control.c dc1394_external_trigger_get_source(dc1394camera_t *camera, dc1394trigger_source_t *source) { uint32_t value; -@@ -1191,7 +1192,7 @@ +@@ -1191,7 +1192,7 @@ dc1394_external_trigger_get_source(dc139 return err; } @@ -667,7 +671,7 @@ diff -urN libdc1394-2.2.1.orig/dc1394/control.c libdc1394-2.2.1/dc1394/control.c dc1394_external_trigger_set_source(dc1394camera_t *camera, dc1394trigger_source_t source) { dc1394error_t err; -@@ -1213,7 +1214,7 @@ +@@ -1213,7 +1214,7 @@ dc1394_external_trigger_set_source(dc139 return err; } @@ -676,7 +680,7 @@ diff -urN libdc1394-2.2.1.orig/dc1394/control.c libdc1394-2.2.1/dc1394/control.c dc1394_feature_get_value(dc1394camera_t *camera, dc1394feature_t feature, uint32_t *value) { uint32_t quadval; -@@ -1239,7 +1240,7 @@ +@@ -1239,7 +1240,7 @@ dc1394_feature_get_value(dc1394camera_t return err; } @@ -685,7 +689,7 @@ diff -urN libdc1394-2.2.1.orig/dc1394/control.c libdc1394-2.2.1/dc1394/control.c dc1394_feature_set_value(dc1394camera_t *camera, dc1394feature_t feature, uint32_t value) { uint32_t quadval; -@@ -1266,7 +1267,7 @@ +@@ -1266,7 +1267,7 @@ dc1394_feature_set_value(dc1394camera_t return err; } @@ -694,7 +698,7 @@ diff -urN libdc1394-2.2.1.orig/dc1394/control.c libdc1394-2.2.1/dc1394/control.c dc1394_feature_is_present(dc1394camera_t *camera, dc1394feature_t feature, dc1394bool_t *value) { /* -@@ -1352,7 +1353,7 @@ +@@ -1352,7 +1353,7 @@ dc1394_feature_is_present(dc1394camera_t return err; } @@ -703,7 +707,7 @@ diff -urN libdc1394-2.2.1.orig/dc1394/control.c libdc1394-2.2.1/dc1394/control.c dc1394_feature_is_readable(dc1394camera_t *camera, dc1394feature_t feature, dc1394bool_t *value) { dc1394error_t err; -@@ -1372,7 +1373,7 @@ +@@ -1372,7 +1373,7 @@ dc1394_feature_is_readable(dc1394camera_ return err; } @@ -712,7 +716,7 @@ diff -urN libdc1394-2.2.1.orig/dc1394/control.c libdc1394-2.2.1/dc1394/control.c dc1394_feature_is_switchable(dc1394camera_t *camera, dc1394feature_t feature, dc1394bool_t *value) { dc1394error_t err; -@@ -1392,7 +1393,7 @@ +@@ -1392,7 +1393,7 @@ dc1394_feature_is_switchable(dc1394camer return err; } @@ -721,7 +725,7 @@ diff -urN libdc1394-2.2.1.orig/dc1394/control.c libdc1394-2.2.1/dc1394/control.c dc1394_feature_get_power(dc1394camera_t *camera, dc1394feature_t feature, dc1394switch_t *value) { dc1394error_t err; -@@ -1412,7 +1413,7 @@ +@@ -1412,7 +1413,7 @@ dc1394_feature_get_power(dc1394camera_t return err; } @@ -730,7 +734,7 @@ diff -urN libdc1394-2.2.1.orig/dc1394/control.c libdc1394-2.2.1/dc1394/control.c dc1394_feature_set_power(dc1394camera_t *camera, dc1394feature_t feature, dc1394switch_t value) { dc1394error_t err; -@@ -1442,7 +1443,7 @@ +@@ -1442,7 +1443,7 @@ dc1394_feature_set_power(dc1394camera_t } @@ -739,7 +743,7 @@ diff -urN libdc1394-2.2.1.orig/dc1394/control.c libdc1394-2.2.1/dc1394/control.c dc1394_feature_get_modes(dc1394camera_t *camera, dc1394feature_t feature, dc1394feature_modes_t *modes) { dc1394error_t err; -@@ -1480,7 +1481,7 @@ +@@ -1480,7 +1481,7 @@ dc1394_feature_get_modes(dc1394camera_t } @@ -748,7 +752,7 @@ diff -urN libdc1394-2.2.1.orig/dc1394/control.c libdc1394-2.2.1/dc1394/control.c dc1394_feature_get_mode(dc1394camera_t *camera, dc1394feature_t feature, dc1394feature_mode_t *mode) { dc1394error_t err; -@@ -1513,7 +1514,7 @@ +@@ -1513,7 +1514,7 @@ dc1394_feature_get_mode(dc1394camera_t * return err; } @@ -757,7 +761,7 @@ diff -urN libdc1394-2.2.1.orig/dc1394/control.c libdc1394-2.2.1/dc1394/control.c dc1394_feature_set_mode(dc1394camera_t *camera, dc1394feature_t feature, dc1394feature_mode_t mode) { dc1394error_t err; -@@ -1554,7 +1555,7 @@ +@@ -1554,7 +1555,7 @@ dc1394_feature_set_mode(dc1394camera_t * return err; } @@ -766,7 +770,7 @@ diff -urN libdc1394-2.2.1.orig/dc1394/control.c libdc1394-2.2.1/dc1394/control.c dc1394_feature_get_boundaries(dc1394camera_t *camera, dc1394feature_t feature, uint32_t *min, uint32_t *max) { dc1394error_t err; -@@ -1582,7 +1583,7 @@ +@@ -1582,7 +1583,7 @@ dc1394_feature_get_boundaries(dc1394came * Memory load/save functions */ @@ -775,7 +779,7 @@ diff -urN libdc1394-2.2.1.orig/dc1394/control.c libdc1394-2.2.1/dc1394/control.c dc1394_memory_busy(dc1394camera_t *camera, dc1394bool_t *value) { uint32_t quadlet; -@@ -1592,7 +1593,7 @@ +@@ -1592,7 +1593,7 @@ dc1394_memory_busy(dc1394camera_t *camer return err; } @@ -784,7 +788,7 @@ diff -urN libdc1394-2.2.1.orig/dc1394/control.c libdc1394-2.2.1/dc1394/control.c dc1394_memory_save(dc1394camera_t *camera, uint32_t channel) { dc1394error_t err=dc1394_set_control_register(camera, REG_CAMERA_MEM_SAVE_CH, (uint32_t)((channel & 0xFUL) << 28)); -@@ -1603,7 +1604,7 @@ +@@ -1603,7 +1604,7 @@ dc1394_memory_save(dc1394camera_t *camer return err; } @@ -793,7 +797,7 @@ diff -urN libdc1394-2.2.1.orig/dc1394/control.c libdc1394-2.2.1/dc1394/control.c dc1394_memory_load(dc1394camera_t *camera, uint32_t channel) { dc1394error_t err=dc1394_set_control_register(camera, REG_CAMERA_CUR_MEM_CH, (uint32_t)((channel & 0xFUL) << 28)); -@@ -1615,7 +1616,7 @@ +@@ -1615,7 +1616,7 @@ dc1394_memory_load(dc1394camera_t *camer * Trigger functions */ @@ -802,7 +806,7 @@ diff -urN libdc1394-2.2.1.orig/dc1394/control.c libdc1394-2.2.1/dc1394/control.c dc1394_external_trigger_set_polarity(dc1394camera_t *camera, dc1394trigger_polarity_t polarity) { dc1394error_t err; -@@ -1633,7 +1634,7 @@ +@@ -1633,7 +1634,7 @@ dc1394_external_trigger_set_polarity(dc1 return err; } @@ -811,7 +815,7 @@ diff -urN libdc1394-2.2.1.orig/dc1394/control.c libdc1394-2.2.1/dc1394/control.c dc1394_external_trigger_get_polarity(dc1394camera_t *camera, dc1394trigger_polarity_t *polarity) { uint32_t value; -@@ -1644,7 +1645,7 @@ +@@ -1644,7 +1645,7 @@ dc1394_external_trigger_get_polarity(dc1 return err; } @@ -820,7 +824,7 @@ diff -urN libdc1394-2.2.1.orig/dc1394/control.c libdc1394-2.2.1/dc1394/control.c dc1394_external_trigger_has_polarity(dc1394camera_t *camera, dc1394bool_t *polarity) { dc1394error_t err; -@@ -1661,7 +1662,7 @@ +@@ -1661,7 +1662,7 @@ dc1394_external_trigger_has_polarity(dc1 return err; } @@ -829,7 +833,7 @@ diff -urN libdc1394-2.2.1.orig/dc1394/control.c libdc1394-2.2.1/dc1394/control.c dc1394_external_trigger_set_power(dc1394camera_t *camera, dc1394switch_t pwr) { dc1394error_t err=dc1394_feature_set_power(camera, DC1394_FEATURE_TRIGGER, pwr); -@@ -1669,7 +1670,7 @@ +@@ -1669,7 +1670,7 @@ dc1394_external_trigger_set_power(dc1394 return err; } @@ -838,7 +842,7 @@ diff -urN libdc1394-2.2.1.orig/dc1394/control.c libdc1394-2.2.1/dc1394/control.c dc1394_external_trigger_get_power(dc1394camera_t *camera, dc1394switch_t *pwr) { dc1394error_t err=dc1394_feature_get_power(camera, DC1394_FEATURE_TRIGGER, pwr); -@@ -1677,7 +1678,7 @@ +@@ -1677,7 +1678,7 @@ dc1394_external_trigger_get_power(dc1394 return err; } @@ -847,7 +851,7 @@ diff -urN libdc1394-2.2.1.orig/dc1394/control.c libdc1394-2.2.1/dc1394/control.c dc1394_software_trigger_set_power(dc1394camera_t *camera, dc1394switch_t pwr) { dc1394error_t err; -@@ -1692,7 +1693,7 @@ +@@ -1692,7 +1693,7 @@ dc1394_software_trigger_set_power(dc1394 return err; } @@ -856,7 +860,7 @@ diff -urN libdc1394-2.2.1.orig/dc1394/control.c libdc1394-2.2.1/dc1394/control.c dc1394_software_trigger_get_power(dc1394camera_t *camera, dc1394switch_t *pwr) { uint32_t value; -@@ -1704,7 +1705,7 @@ +@@ -1704,7 +1705,7 @@ dc1394_software_trigger_get_power(dc1394 return err; } @@ -865,7 +869,7 @@ diff -urN libdc1394-2.2.1.orig/dc1394/control.c libdc1394-2.2.1/dc1394/control.c dc1394_video_get_data_depth(dc1394camera_t *camera, uint32_t *depth) { dc1394error_t err; -@@ -1740,7 +1741,7 @@ +@@ -1740,7 +1741,7 @@ dc1394_video_get_data_depth(dc1394camera return DC1394_SUCCESS; } @@ -874,7 +878,7 @@ diff -urN libdc1394-2.2.1.orig/dc1394/control.c libdc1394-2.2.1/dc1394/control.c dc1394_feature_get_absolute_control(dc1394camera_t *camera, dc1394feature_t feature, dc1394switch_t *pwr) { dc1394error_t err; -@@ -1760,7 +1761,7 @@ +@@ -1760,7 +1761,7 @@ dc1394_feature_get_absolute_control(dc13 return err; } @@ -883,7 +887,7 @@ diff -urN libdc1394-2.2.1.orig/dc1394/control.c libdc1394-2.2.1/dc1394/control.c dc1394_feature_set_absolute_control(dc1394camera_t *camera, dc1394feature_t feature, dc1394switch_t pwr) { dc1394error_t err; -@@ -1790,7 +1791,7 @@ +@@ -1790,7 +1791,7 @@ dc1394_feature_set_absolute_control(dc13 } @@ -892,7 +896,7 @@ diff -urN libdc1394-2.2.1.orig/dc1394/control.c libdc1394-2.2.1/dc1394/control.c dc1394_feature_has_absolute_control(dc1394camera_t *camera, dc1394feature_t feature, dc1394bool_t *value) { dc1394error_t err; -@@ -1811,7 +1812,7 @@ +@@ -1811,7 +1812,7 @@ dc1394_feature_has_absolute_control(dc13 } @@ -901,7 +905,7 @@ diff -urN libdc1394-2.2.1.orig/dc1394/control.c libdc1394-2.2.1/dc1394/control.c dc1394_video_get_bandwidth_usage(dc1394camera_t *camera, uint32_t *bandwidth) { uint32_t format, qpp; -@@ -1855,7 +1856,7 @@ +@@ -1855,7 +1856,7 @@ dc1394_video_get_bandwidth_usage(dc1394c return err; } @@ -910,7 +914,7 @@ diff -urN libdc1394-2.2.1.orig/dc1394/control.c libdc1394-2.2.1/dc1394/control.c dc1394_feature_get_absolute_boundaries(dc1394camera_t *camera, dc1394feature_t feature, float *min, float *max) { dc1394error_t err=DC1394_SUCCESS; -@@ -1873,7 +1874,7 @@ +@@ -1873,7 +1874,7 @@ dc1394_feature_get_absolute_boundaries(d } @@ -919,7 +923,7 @@ diff -urN libdc1394-2.2.1.orig/dc1394/control.c libdc1394-2.2.1/dc1394/control.c dc1394_feature_get_absolute_value(dc1394camera_t *camera, dc1394feature_t feature, float *value) { dc1394error_t err=DC1394_SUCCESS; -@@ -1888,7 +1889,7 @@ +@@ -1888,7 +1889,7 @@ dc1394_feature_get_absolute_value(dc1394 } @@ -928,7 +932,7 @@ diff -urN libdc1394-2.2.1.orig/dc1394/control.c libdc1394-2.2.1/dc1394/control.c dc1394_feature_set_absolute_value(dc1394camera_t *camera, dc1394feature_t feature, float value) { dc1394error_t err=DC1394_SUCCESS; -@@ -1907,7 +1908,7 @@ +@@ -1907,7 +1908,7 @@ dc1394_feature_set_absolute_value(dc1394 } @@ -937,7 +941,7 @@ diff -urN libdc1394-2.2.1.orig/dc1394/control.c libdc1394-2.2.1/dc1394/control.c dc1394_pio_set(dc1394camera_t *camera, uint32_t value) { dc1394error_t err=DC1394_SUCCESS; -@@ -1919,7 +1920,7 @@ +@@ -1919,7 +1920,7 @@ dc1394_pio_set(dc1394camera_t *camera, u } @@ -946,7 +950,7 @@ diff -urN libdc1394-2.2.1.orig/dc1394/control.c libdc1394-2.2.1/dc1394/control.c dc1394_pio_get(dc1394camera_t *camera, uint32_t *value) { dc1394error_t err=DC1394_SUCCESS; -@@ -1938,7 +1939,7 @@ +@@ -1938,7 +1939,7 @@ dc1394_pio_get(dc1394camera_t *camera, u /* Create a new dc1394 struct, which also initialises the library */ @@ -955,7 +959,7 @@ diff -urN libdc1394-2.2.1.orig/dc1394/control.c libdc1394-2.2.1/dc1394/control.c dc1394_new (void) { dc1394_t * d = calloc (1, sizeof (dc1394_t)); -@@ -1984,7 +1985,7 @@ +@@ -1984,7 +1985,7 @@ dc1394_new (void) /* Free a dc1394 struct, which also terminates the use of the library */ @@ -964,7 +968,7 @@ diff -urN libdc1394-2.2.1.orig/dc1394/control.c libdc1394-2.2.1/dc1394/control.c dc1394_free (dc1394_t * d) { free_enumeration (d); -@@ -1999,7 +2000,7 @@ +@@ -1999,7 +2000,7 @@ dc1394_free (dc1394_t * d) free (d); } @@ -973,7 +977,7 @@ diff -urN libdc1394-2.2.1.orig/dc1394/control.c libdc1394-2.2.1/dc1394/control.c const char * name) { if (!dispatch->platform_new || !dispatch->platform_free || -@@ -2020,7 +2021,7 @@ +@@ -2020,7 +2021,7 @@ void register_platform (dc1394_t * d, co d->num_platforms++; } @@ -982,7 +986,7 @@ diff -urN libdc1394-2.2.1.orig/dc1394/control.c libdc1394-2.2.1/dc1394/control.c get_leaf_string (platform_camera_t * pcam, const platform_dispatch_t * disp, uint32_t offset) { -@@ -2047,7 +2048,7 @@ +@@ -2047,7 +2048,7 @@ get_leaf_string (platform_camera_t * pca return str; } @@ -991,7 +995,7 @@ diff -urN libdc1394-2.2.1.orig/dc1394/control.c libdc1394-2.2.1/dc1394/control.c dc1394_camera_new_unit (dc1394_t * d, uint64_t guid, int unit) { int i; -@@ -2168,7 +2169,7 @@ +@@ -2168,7 +2169,7 @@ dc1394_camera_new_unit (dc1394_t * d, ui return NULL; } @@ -1000,7 +1004,7 @@ diff -urN libdc1394-2.2.1.orig/dc1394/control.c libdc1394-2.2.1/dc1394/control.c dc1394_camera_new (dc1394_t * d, uint64_t guid) { return dc1394_camera_new_unit (d, guid, -1); -@@ -2178,7 +2179,7 @@ +@@ -2178,7 +2179,7 @@ dc1394_camera_new (dc1394_t * d, uint64_ Free a camera structure as well as resources used by that camera (bandwidth, ISO channels, etc...) */ @@ -1009,11 +1013,12 @@ diff -urN libdc1394-2.2.1.orig/dc1394/control.c libdc1394-2.2.1/dc1394/control.c dc1394_camera_free(dc1394camera_t *camera) { dc1394camera_priv_t * cpriv = DC1394_CAMERA_PRIV (camera); -diff -urN libdc1394-2.2.1.orig/dc1394/conversions.c libdc1394-2.2.1/dc1394/conversions.c ---- libdc1394-2.2.1.orig/dc1394/conversions.c 2011-08-29 10:00:09.189211894 +0200 -+++ libdc1394-2.2.1/dc1394/conversions.c 2011-08-29 10:02:04.969014969 +0200 +Index: libdc1394-2.2.2/dc1394/conversions.c +=================================================================== +--- libdc1394-2.2.2.orig/dc1394/conversions.c ++++ libdc1394-2.2.2/dc1394/conversions.c @@ -25,6 +25,7 @@ - #define _XOPEN_SOURCE + #include #include #include "conversions.h" +#include "visibility.h" @@ -1029,7 +1034,7 @@ diff -urN libdc1394-2.2.1.orig/dc1394/conversions.c libdc1394-2.2.1/dc1394/conve dc1394_YUV422_to_YUV422(uint8_t *restrict src, uint8_t *restrict dest, uint32_t width, uint32_t height, uint32_t byte_order) { switch (byte_order) { -@@ -47,7 +48,7 @@ +@@ -47,7 +48,7 @@ dc1394_YUV422_to_YUV422(uint8_t *restric } } @@ -1038,7 +1043,7 @@ diff -urN libdc1394-2.2.1.orig/dc1394/conversions.c libdc1394-2.2.1/dc1394/conve dc1394_YUV411_to_YUV422(uint8_t *restrict src, uint8_t *restrict dest, uint32_t width, uint32_t height, uint32_t byte_order) { register int i=(width*height) + ((width*height) >> 1) -1; -@@ -101,7 +102,7 @@ +@@ -101,7 +102,7 @@ dc1394_YUV411_to_YUV422(uint8_t *restric } @@ -1047,7 +1052,7 @@ diff -urN libdc1394-2.2.1.orig/dc1394/conversions.c libdc1394-2.2.1/dc1394/conve dc1394_YUV444_to_YUV422(uint8_t *restrict src, uint8_t *restrict dest, uint32_t width, uint32_t height, uint32_t byte_order) { register int i = (width*height) + ((width*height) << 1)-1; -@@ -144,7 +145,7 @@ +@@ -144,7 +145,7 @@ dc1394_YUV444_to_YUV422(uint8_t *restric } } @@ -1056,7 +1061,7 @@ diff -urN libdc1394-2.2.1.orig/dc1394/conversions.c libdc1394-2.2.1/dc1394/conve dc1394_MONO8_to_YUV422(uint8_t *restrict src, uint8_t *restrict dest, uint32_t width, uint32_t height, uint32_t byte_order) { if ((width%2)==0) { -@@ -215,7 +216,7 @@ +@@ -215,7 +216,7 @@ dc1394_MONO8_to_YUV422(uint8_t *restrict } } @@ -1065,7 +1070,7 @@ diff -urN libdc1394-2.2.1.orig/dc1394/conversions.c libdc1394-2.2.1/dc1394/conve dc1394_MONO16_to_YUV422(uint8_t *restrict src, uint8_t *restrict dest, uint32_t width, uint32_t height, uint32_t byte_order, uint32_t bits) { register int i = ((width*height) << 1)-1; -@@ -253,7 +254,7 @@ +@@ -253,7 +254,7 @@ dc1394_MONO16_to_YUV422(uint8_t *restric } @@ -1074,7 +1079,7 @@ diff -urN libdc1394-2.2.1.orig/dc1394/conversions.c libdc1394-2.2.1/dc1394/conve dc1394_MONO16_to_MONO8(uint8_t *restrict src, uint8_t *restrict dest, uint32_t width, uint32_t height, uint32_t bits) { register int i = ((width*height)<<1)-1; -@@ -267,7 +268,7 @@ +@@ -267,7 +268,7 @@ dc1394_MONO16_to_MONO8(uint8_t *restrict return DC1394_SUCCESS; } @@ -1083,7 +1088,7 @@ diff -urN libdc1394-2.2.1.orig/dc1394/conversions.c libdc1394-2.2.1/dc1394/conve dc1394_RGB8_to_YUV422(uint8_t *restrict src, uint8_t *restrict dest, uint32_t width, uint32_t height, uint32_t byte_order) { register int i = (width*height) + ( (width*height) << 1 )-1; -@@ -313,7 +314,7 @@ +@@ -313,7 +314,7 @@ dc1394_RGB8_to_YUV422(uint8_t *restrict } } @@ -1092,7 +1097,7 @@ diff -urN libdc1394-2.2.1.orig/dc1394/conversions.c libdc1394-2.2.1/dc1394/conve dc1394_RGB16_to_YUV422(uint8_t *restrict src, uint8_t *restrict dest, uint32_t width, uint32_t height, uint32_t byte_order, uint32_t bits) { register int i = ( ((width*height) + ( (width*height) << 1 )) << 1 ) -1; -@@ -377,7 +378,7 @@ +@@ -377,7 +378,7 @@ dc1394_RGB16_to_YUV422(uint8_t *restrict * **********************************************************************/ @@ -1101,7 +1106,7 @@ diff -urN libdc1394-2.2.1.orig/dc1394/conversions.c libdc1394-2.2.1/dc1394/conve dc1394_RGB16_to_RGB8(uint8_t *restrict src, uint8_t *restrict dest, uint32_t width, uint32_t height, uint32_t bits) { register int i = (((width*height) + ( (width*height) << 1 )) << 1)-1; -@@ -399,7 +400,7 @@ +@@ -399,7 +400,7 @@ dc1394_RGB16_to_RGB8(uint8_t *restrict s } @@ -1110,7 +1115,7 @@ diff -urN libdc1394-2.2.1.orig/dc1394/conversions.c libdc1394-2.2.1/dc1394/conve dc1394_YUV444_to_RGB8(uint8_t *restrict src, uint8_t *restrict dest, uint32_t width, uint32_t height) { register int i = (width*height) + ( (width*height) << 1 ) -1; -@@ -419,7 +420,7 @@ +@@ -419,7 +420,7 @@ dc1394_YUV444_to_RGB8(uint8_t *restrict return DC1394_SUCCESS; } @@ -1119,7 +1124,7 @@ diff -urN libdc1394-2.2.1.orig/dc1394/conversions.c libdc1394-2.2.1/dc1394/conve dc1394_YUV422_to_RGB8(uint8_t *restrict src, uint8_t *restrict dest, uint32_t width, uint32_t height, uint32_t byte_order) { register int i = ((width*height) << 1)-1; -@@ -468,7 +469,7 @@ +@@ -468,7 +469,7 @@ dc1394_YUV422_to_RGB8(uint8_t *restrict } @@ -1128,7 +1133,7 @@ diff -urN libdc1394-2.2.1.orig/dc1394/conversions.c libdc1394-2.2.1/dc1394/conve dc1394_YUV411_to_RGB8(uint8_t *restrict src, uint8_t *restrict dest, uint32_t width, uint32_t height) { register int i = (width*height) + ( (width*height) >> 1 )-1; -@@ -504,7 +505,7 @@ +@@ -504,7 +505,7 @@ dc1394_YUV411_to_RGB8(uint8_t *restrict } @@ -1137,7 +1142,7 @@ diff -urN libdc1394-2.2.1.orig/dc1394/conversions.c libdc1394-2.2.1/dc1394/conve dc1394_MONO8_to_RGB8(uint8_t *restrict src, uint8_t *restrict dest, uint32_t width, uint32_t height) { register int i = (width*height)-1; -@@ -521,7 +522,7 @@ +@@ -521,7 +522,7 @@ dc1394_MONO8_to_RGB8(uint8_t *restrict s } @@ -1146,7 +1151,7 @@ diff -urN libdc1394-2.2.1.orig/dc1394/conversions.c libdc1394-2.2.1/dc1394/conve dc1394_MONO16_to_RGB8(uint8_t *restrict src, uint8_t *restrict dest, uint32_t width, uint32_t height, uint32_t bits) { register int i = ((width*height) << 1)-1; -@@ -541,7 +542,7 @@ +@@ -541,7 +542,7 @@ dc1394_MONO16_to_RGB8(uint8_t *restrict // change a 16bit stereo image (8bit/channel) into two 8bit images on top // of each other @@ -1155,7 +1160,7 @@ diff -urN libdc1394-2.2.1.orig/dc1394/conversions.c libdc1394-2.2.1/dc1394/conve dc1394_deinterlace_stereo(uint8_t *restrict src, uint8_t *restrict dest, uint32_t width, uint32_t height) { register int i = (width*height)-1; -@@ -556,7 +557,7 @@ +@@ -556,7 +557,7 @@ dc1394_deinterlace_stereo(uint8_t *restr } @@ -1164,7 +1169,7 @@ diff -urN libdc1394-2.2.1.orig/dc1394/conversions.c libdc1394-2.2.1/dc1394/conve dc1394_convert_to_YUV422(uint8_t *src, uint8_t *dest, uint32_t width, uint32_t height, uint32_t byte_order, dc1394color_coding_t source_coding, uint32_t bits) { -@@ -593,7 +594,7 @@ +@@ -593,7 +594,7 @@ dc1394_convert_to_YUV422(uint8_t *src, u } @@ -1173,7 +1178,7 @@ diff -urN libdc1394-2.2.1.orig/dc1394/conversions.c libdc1394-2.2.1/dc1394/conve dc1394_convert_to_MONO8(uint8_t *restrict src, uint8_t *restrict dest, uint32_t width, uint32_t height, uint32_t byte_order, dc1394color_coding_t source_coding, uint32_t bits) { -@@ -612,7 +613,7 @@ +@@ -612,7 +613,7 @@ dc1394_convert_to_MONO8(uint8_t *restric } @@ -1182,7 +1187,7 @@ diff -urN libdc1394-2.2.1.orig/dc1394/conversions.c libdc1394-2.2.1/dc1394/conve dc1394_convert_to_RGB8(uint8_t *restrict src, uint8_t *restrict dest, uint32_t width, uint32_t height, uint32_t byte_order, dc1394color_coding_t source_coding, uint32_t bits) { -@@ -647,7 +648,7 @@ +@@ -647,7 +648,7 @@ dc1394_convert_to_RGB8(uint8_t *restrict return DC1394_SUCCESS; } @@ -1191,7 +1196,7 @@ diff -urN libdc1394-2.2.1.orig/dc1394/conversions.c libdc1394-2.2.1/dc1394/conve Adapt_buffer_convert(dc1394video_frame_t *in, dc1394video_frame_t *out) { uint32_t bpp; -@@ -719,7 +720,7 @@ +@@ -719,7 +720,7 @@ Adapt_buffer_convert(dc1394video_frame_t return DC1394_MEMORY_ALLOCATION_FAILURE; } @@ -1200,7 +1205,7 @@ diff -urN libdc1394-2.2.1.orig/dc1394/conversions.c libdc1394-2.2.1/dc1394/conve dc1394_convert_frames(dc1394video_frame_t *in, dc1394video_frame_t *out) { -@@ -882,7 +883,7 @@ +@@ -882,7 +883,7 @@ dc1394_convert_frames(dc1394video_frame_ } @@ -1209,7 +1214,7 @@ diff -urN libdc1394-2.2.1.orig/dc1394/conversions.c libdc1394-2.2.1/dc1394/conve Adapt_buffer_stereo(dc1394video_frame_t *in, dc1394video_frame_t *out) { uint32_t bpp; -@@ -966,7 +967,7 @@ +@@ -966,7 +967,7 @@ Adapt_buffer_stereo(dc1394video_frame_t } @@ -1218,9 +1223,10 @@ diff -urN libdc1394-2.2.1.orig/dc1394/conversions.c libdc1394-2.2.1/dc1394/conve dc1394_deinterlace_stereo_frames(dc1394video_frame_t *in, dc1394video_frame_t *out, dc1394stereo_method_t method) { dc1394error_t err; -diff -urN libdc1394-2.2.1.orig/dc1394/enumeration.c libdc1394-2.2.1/dc1394/enumeration.c ---- libdc1394-2.2.1.orig/dc1394/enumeration.c 2011-08-29 09:58:17.275211906 +0200 -+++ libdc1394-2.2.1/dc1394/enumeration.c 2011-08-29 10:01:52.567014987 +0200 +Index: libdc1394-2.2.2/dc1394/enumeration.c +=================================================================== +--- libdc1394-2.2.2.orig/dc1394/enumeration.c ++++ libdc1394-2.2.2/dc1394/enumeration.c @@ -27,6 +27,7 @@ #include "internal.h" #include "platform.h" @@ -1229,7 +1235,7 @@ diff -urN libdc1394-2.2.1.orig/dc1394/enumeration.c libdc1394-2.2.1/dc1394/enume static void destroy_camera_info (camera_info_t * info) -@@ -224,7 +225,7 @@ +@@ -224,7 +225,7 @@ identify_camera (dc1394_t * d, platform_ return 0; } @@ -1238,7 +1244,7 @@ diff -urN libdc1394-2.2.1.orig/dc1394/enumeration.c libdc1394-2.2.1/dc1394/enume free_enumeration (dc1394_t * d) { int i; -@@ -242,7 +243,7 @@ +@@ -242,7 +243,7 @@ free_enumeration (dc1394_t * d) d->cameras = NULL; } @@ -1247,7 +1253,7 @@ diff -urN libdc1394-2.2.1.orig/dc1394/enumeration.c libdc1394-2.2.1/dc1394/enume refresh_enumeration (dc1394_t * d) { free_enumeration (d); -@@ -274,7 +275,7 @@ +@@ -274,7 +275,7 @@ refresh_enumeration (dc1394_t * d) return 0; } @@ -1256,7 +1262,7 @@ diff -urN libdc1394-2.2.1.orig/dc1394/enumeration.c libdc1394-2.2.1/dc1394/enume dc1394_camera_enumerate (dc1394_t * d, dc1394camera_list_t **list) { if (refresh_enumeration (d) < 0) -@@ -302,7 +303,7 @@ +@@ -302,7 +303,7 @@ dc1394_camera_enumerate (dc1394_t * d, d /* Free a list of cameras returned by dc1394_enumerate_cameras() */ @@ -1265,18 +1271,19 @@ diff -urN libdc1394-2.2.1.orig/dc1394/enumeration.c libdc1394-2.2.1/dc1394/enume dc1394_camera_free_list (dc1394camera_list_t *list) { if (list) -diff -urN libdc1394-2.2.1.orig/dc1394/format7.c libdc1394-2.2.1/dc1394/format7.c ---- libdc1394-2.2.1.orig/dc1394/format7.c 2011-08-29 09:58:17.275211906 +0200 -+++ libdc1394-2.2.1/dc1394/format7.c 2011-08-29 10:01:52.567014987 +0200 +Index: libdc1394-2.2.2/dc1394/format7.c +=================================================================== +--- libdc1394-2.2.2.orig/dc1394/format7.c ++++ libdc1394-2.2.2/dc1394/format7.c @@ -34,6 +34,7 @@ #include "utils.h" #include "config.h" #include "log.h" +#include "visibility.h" - /*========================================================================== - * This function implements the handshaking available (and sometimes required) -@@ -41,7 +42,7 @@ + #ifdef __MINGW32__ + #include +@@ -45,7 +46,7 @@ * Onishi for his feedback and info. *==========================================================================*/ @@ -1285,7 +1292,7 @@ diff -urN libdc1394-2.2.1.orig/dc1394/format7.c libdc1394-2.2.1/dc1394/format7.c dc1394_format7_get_value_setting(dc1394camera_t *camera, dc1394video_mode_t video_mode, uint32_t *present, uint32_t *setting1, uint32_t *err_flag1, uint32_t *err_flag2) -@@ -68,7 +69,7 @@ +@@ -72,7 +73,7 @@ dc1394_format7_get_value_setting(dc1394c return err; } @@ -1294,7 +1301,7 @@ diff -urN libdc1394-2.2.1.orig/dc1394/format7.c libdc1394-2.2.1/dc1394/format7.c dc1394_format7_set_value_setting(dc1394camera_t *camera, dc1394video_mode_t video_mode) { int err; -@@ -82,7 +83,7 @@ +@@ -86,7 +87,7 @@ dc1394_format7_set_value_setting(dc1394c return err; } @@ -1303,7 +1310,7 @@ diff -urN libdc1394-2.2.1.orig/dc1394/format7.c libdc1394-2.2.1/dc1394/format7.c _dc1394_v130_handshake(dc1394camera_t *camera, dc1394video_mode_t video_mode) { uint32_t setting_1, err_flag1, err_flag2, v130handshake; -@@ -135,7 +136,7 @@ +@@ -139,7 +140,7 @@ _dc1394_v130_handshake(dc1394camera_t *c return err; } @@ -1312,7 +1319,7 @@ diff -urN libdc1394-2.2.1.orig/dc1394/format7.c libdc1394-2.2.1/dc1394/format7.c _dc1394_format7_set_image_position(dc1394camera_t *camera, dc1394video_mode_t video_mode, uint32_t left, uint32_t top) -@@ -153,7 +154,7 @@ +@@ -157,7 +158,7 @@ _dc1394_format7_set_image_position(dc139 return err; } @@ -1321,7 +1328,7 @@ diff -urN libdc1394-2.2.1.orig/dc1394/format7.c libdc1394-2.2.1/dc1394/format7.c _dc1394_format7_set_image_size(dc1394camera_t *camera, dc1394video_mode_t video_mode, uint32_t width, uint32_t height) -@@ -173,7 +174,7 @@ +@@ -177,7 +178,7 @@ _dc1394_format7_set_image_size(dc1394cam return err; } @@ -1330,7 +1337,7 @@ diff -urN libdc1394-2.2.1.orig/dc1394/format7.c libdc1394-2.2.1/dc1394/format7.c _dc1394_format7_set_color_coding(dc1394camera_t *camera, dc1394video_mode_t video_mode, dc1394color_coding_t color_coding) { -@@ -201,7 +202,7 @@ +@@ -205,7 +206,7 @@ _dc1394_format7_set_color_coding(dc1394c return err; } @@ -1339,7 +1346,7 @@ diff -urN libdc1394-2.2.1.orig/dc1394/format7.c libdc1394-2.2.1/dc1394/format7.c _dc1394_format7_set_packet_size(dc1394camera_t *camera, dc1394video_mode_t video_mode, uint32_t packet_size) -@@ -229,7 +230,7 @@ +@@ -233,7 +234,7 @@ _dc1394_format7_set_packet_size(dc1394ca /* External functions */ /**********************/ @@ -1348,7 +1355,7 @@ diff -urN libdc1394-2.2.1.orig/dc1394/format7.c libdc1394-2.2.1/dc1394/format7.c dc1394_format7_get_max_image_size(dc1394camera_t *camera, dc1394video_mode_t video_mode, uint32_t *horizontal_size, -@@ -250,7 +251,7 @@ +@@ -254,7 +255,7 @@ dc1394_format7_get_max_image_size(dc1394 return err; } @@ -1357,7 +1364,7 @@ diff -urN libdc1394-2.2.1.orig/dc1394/format7.c libdc1394-2.2.1/dc1394/format7.c dc1394_format7_get_unit_size(dc1394camera_t *camera, dc1394video_mode_t video_mode, uint32_t *horizontal_unit, -@@ -271,7 +272,7 @@ +@@ -275,7 +276,7 @@ dc1394_format7_get_unit_size(dc1394camer return err; } @@ -1366,7 +1373,7 @@ diff -urN libdc1394-2.2.1.orig/dc1394/format7.c libdc1394-2.2.1/dc1394/format7.c dc1394_format7_get_image_position(dc1394camera_t *camera, dc1394video_mode_t video_mode, uint32_t *left_position, -@@ -293,7 +294,7 @@ +@@ -297,7 +298,7 @@ dc1394_format7_get_image_position(dc1394 } @@ -1375,7 +1382,7 @@ diff -urN libdc1394-2.2.1.orig/dc1394/format7.c libdc1394-2.2.1/dc1394/format7.c dc1394_format7_get_image_size(dc1394camera_t *camera, dc1394video_mode_t video_mode, uint32_t *width, -@@ -314,7 +315,7 @@ +@@ -318,7 +319,7 @@ dc1394_format7_get_image_size(dc1394came return err; } @@ -1384,7 +1391,7 @@ diff -urN libdc1394-2.2.1.orig/dc1394/format7.c libdc1394-2.2.1/dc1394/format7.c dc1394_format7_get_color_coding(dc1394camera_t *camera, dc1394video_mode_t video_mode, dc1394color_coding_t *color_coding) -@@ -334,7 +335,7 @@ +@@ -338,7 +339,7 @@ dc1394_format7_get_color_coding(dc1394ca return err; } @@ -1393,7 +1400,7 @@ diff -urN libdc1394-2.2.1.orig/dc1394/format7.c libdc1394-2.2.1/dc1394/format7.c dc1394_format7_get_color_codings(dc1394camera_t *camera, dc1394video_mode_t video_mode, dc1394color_codings_t *color_codings) -@@ -360,7 +361,7 @@ +@@ -364,7 +365,7 @@ dc1394_format7_get_color_codings(dc1394c return err; } @@ -1402,7 +1409,7 @@ diff -urN libdc1394-2.2.1.orig/dc1394/format7.c libdc1394-2.2.1/dc1394/format7.c dc1394_format7_get_pixel_number(dc1394camera_t *camera, dc1394video_mode_t video_mode, uint32_t *pixnum) -@@ -379,7 +380,7 @@ +@@ -383,7 +384,7 @@ dc1394_format7_get_pixel_number(dc1394ca return err; } @@ -1411,7 +1418,7 @@ diff -urN libdc1394-2.2.1.orig/dc1394/format7.c libdc1394-2.2.1/dc1394/format7.c dc1394_format7_get_total_bytes(dc1394camera_t *camera, dc1394video_mode_t video_mode, uint64_t *total_bytes) -@@ -406,7 +407,7 @@ +@@ -410,7 +411,7 @@ dc1394_format7_get_total_bytes(dc1394cam return err; } @@ -1420,7 +1427,7 @@ diff -urN libdc1394-2.2.1.orig/dc1394/format7.c libdc1394-2.2.1/dc1394/format7.c dc1394_format7_get_packet_parameters(dc1394camera_t *camera, dc1394video_mode_t video_mode, uint32_t *unit_bytes, uint32_t *max_bytes) -@@ -426,7 +427,7 @@ +@@ -430,7 +431,7 @@ dc1394_format7_get_packet_parameters(dc1 return err; } @@ -1429,7 +1436,7 @@ diff -urN libdc1394-2.2.1.orig/dc1394/format7.c libdc1394-2.2.1/dc1394/format7.c dc1394_format7_get_packet_size(dc1394camera_t *camera, dc1394video_mode_t video_mode, uint32_t *packet_size) -@@ -449,7 +450,7 @@ +@@ -453,7 +454,7 @@ dc1394_format7_get_packet_size(dc1394cam return err; } @@ -1438,7 +1445,7 @@ diff -urN libdc1394-2.2.1.orig/dc1394/format7.c libdc1394-2.2.1/dc1394/format7.c dc1394_format7_set_image_position(dc1394camera_t *camera, dc1394video_mode_t video_mode, uint32_t left, uint32_t top) -@@ -465,7 +466,7 @@ +@@ -469,7 +470,7 @@ dc1394_format7_set_image_position(dc1394 } @@ -1447,7 +1454,7 @@ diff -urN libdc1394-2.2.1.orig/dc1394/format7.c libdc1394-2.2.1/dc1394/format7.c dc1394_format7_set_image_size(dc1394camera_t *camera, dc1394video_mode_t video_mode, uint32_t width, uint32_t height) -@@ -481,7 +482,7 @@ +@@ -485,7 +486,7 @@ dc1394_format7_set_image_size(dc1394came } @@ -1456,7 +1463,7 @@ diff -urN libdc1394-2.2.1.orig/dc1394/format7.c libdc1394-2.2.1/dc1394/format7.c dc1394_format7_set_color_coding(dc1394camera_t *camera, dc1394video_mode_t video_mode, dc1394color_coding_t color_coding) { -@@ -496,7 +497,7 @@ +@@ -500,7 +501,7 @@ dc1394_format7_set_color_coding(dc1394ca } @@ -1465,7 +1472,7 @@ diff -urN libdc1394-2.2.1.orig/dc1394/format7.c libdc1394-2.2.1/dc1394/format7.c dc1394_format7_set_packet_size(dc1394camera_t *camera, dc1394video_mode_t video_mode, uint32_t packet_bytes) -@@ -511,7 +512,7 @@ +@@ -515,7 +516,7 @@ dc1394_format7_set_packet_size(dc1394cam return err; } @@ -1474,7 +1481,7 @@ diff -urN libdc1394-2.2.1.orig/dc1394/format7.c libdc1394-2.2.1/dc1394/format7.c dc1394_format7_get_recommended_packet_size(dc1394camera_t *camera, dc1394video_mode_t video_mode, uint32_t *packet_size) { -@@ -529,7 +530,7 @@ +@@ -533,7 +534,7 @@ dc1394_format7_get_recommended_packet_si return err; } @@ -1483,7 +1490,7 @@ diff -urN libdc1394-2.2.1.orig/dc1394/format7.c libdc1394-2.2.1/dc1394/format7.c dc1394_format7_get_packets_per_frame(dc1394camera_t *camera, dc1394video_mode_t video_mode, uint32_t *ppf) { -@@ -574,7 +575,7 @@ +@@ -578,7 +579,7 @@ dc1394_format7_get_packets_per_frame(dc1 return DC1394_SUCCESS; } @@ -1492,7 +1499,7 @@ diff -urN libdc1394-2.2.1.orig/dc1394/format7.c libdc1394-2.2.1/dc1394/format7.c dc1394_format7_get_unit_position(dc1394camera_t *camera, dc1394video_mode_t video_mode, uint32_t *horizontal_pos, -@@ -602,7 +603,7 @@ +@@ -606,7 +607,7 @@ dc1394_format7_get_unit_position(dc1394c return err; } @@ -1501,7 +1508,7 @@ diff -urN libdc1394-2.2.1.orig/dc1394/format7.c libdc1394-2.2.1/dc1394/format7.c dc1394_format7_get_frame_interval(dc1394camera_t *camera, dc1394video_mode_t video_mode, float *interval) { dc1394error_t err; -@@ -619,7 +620,7 @@ +@@ -623,7 +624,7 @@ dc1394_format7_get_frame_interval(dc1394 return err; } @@ -1510,7 +1517,7 @@ diff -urN libdc1394-2.2.1.orig/dc1394/format7.c libdc1394-2.2.1/dc1394/format7.c dc1394_format7_get_data_depth(dc1394camera_t *camera, dc1394video_mode_t video_mode, uint32_t *data_depth) { dc1394error_t err; -@@ -652,7 +653,7 @@ +@@ -656,7 +657,7 @@ dc1394_format7_get_data_depth(dc1394came return DC1394_SUCCESS; } @@ -1519,7 +1526,7 @@ diff -urN libdc1394-2.2.1.orig/dc1394/format7.c libdc1394-2.2.1/dc1394/format7.c dc1394_format7_get_color_filter(dc1394camera_t *camera, dc1394video_mode_t video_mode, dc1394color_filter_t *color_filter) { dc1394error_t err; -@@ -671,7 +672,7 @@ +@@ -675,7 +676,7 @@ dc1394_format7_get_color_filter(dc1394ca return err; } @@ -1528,7 +1535,7 @@ diff -urN libdc1394-2.2.1.orig/dc1394/format7.c libdc1394-2.2.1/dc1394/format7.c dc1394_format7_get_mode_info(dc1394camera_t *camera, dc1394video_mode_t video_mode, dc1394format7mode_t *f7_mode) { dc1394error_t err=DC1394_SUCCESS; -@@ -737,7 +738,7 @@ +@@ -741,7 +742,7 @@ dc1394_format7_get_mode_info(dc1394camer return err; } @@ -1537,7 +1544,7 @@ diff -urN libdc1394-2.2.1.orig/dc1394/format7.c libdc1394-2.2.1/dc1394/format7.c dc1394_format7_get_modeset(dc1394camera_t *camera, dc1394format7modeset_t *info) { dc1394error_t err; -@@ -762,7 +763,7 @@ +@@ -766,7 +767,7 @@ dc1394_format7_get_modeset(dc1394camera_ return err; } @@ -1546,7 +1553,7 @@ diff -urN libdc1394-2.2.1.orig/dc1394/format7.c libdc1394-2.2.1/dc1394/format7.c dc1394_format7_set_roi(dc1394camera_t *camera, dc1394video_mode_t video_mode, dc1394color_coding_t color_coding, -@@ -932,7 +933,7 @@ +@@ -936,7 +937,7 @@ dc1394_format7_set_roi(dc1394camera_t *c } @@ -1555,9 +1562,10 @@ diff -urN libdc1394-2.2.1.orig/dc1394/format7.c libdc1394-2.2.1/dc1394/format7.c dc1394_format7_get_roi(dc1394camera_t *camera, dc1394video_mode_t video_mode, dc1394color_coding_t *color_coding, -diff -urN libdc1394-2.2.1.orig/dc1394/juju/control.c libdc1394-2.2.1/dc1394/juju/control.c ---- libdc1394-2.2.1.orig/dc1394/juju/control.c 2011-08-29 09:58:17.275211906 +0200 -+++ libdc1394-2.2.1/dc1394/juju/control.c 2011-08-29 10:01:52.568014987 +0200 +Index: libdc1394-2.2.2/dc1394/juju/control.c +=================================================================== +--- libdc1394-2.2.2.orig/dc1394/juju/control.c ++++ libdc1394-2.2.2/dc1394/juju/control.c @@ -35,6 +35,7 @@ #include "platform.h" #include "internal.h" @@ -1566,7 +1574,7 @@ diff -urN libdc1394-2.2.1.orig/dc1394/juju/control.c libdc1394-2.2.1/dc1394/juju #define ptr_to_u64(p) ((__u64)(unsigned long)(p)) #define u64_to_ptr(p) ((void *)(unsigned long)(p)) -@@ -552,7 +553,7 @@ +@@ -554,7 +555,7 @@ dc1394_juju_get_broadcast(platform_camer return DC1394_SUCCESS; } @@ -1575,7 +1583,7 @@ diff -urN libdc1394-2.2.1.orig/dc1394/juju/control.c libdc1394-2.2.1/dc1394/juju juju_iso_allocate (platform_camera_t *cam, uint64_t allowed_channels, int bandwidth_units, juju_iso_info **out) { -@@ -595,7 +596,7 @@ +@@ -601,7 +602,7 @@ juju_iso_allocate (platform_camera_t *ca return DC1394_SUCCESS; } @@ -1583,8 +1591,8 @@ diff -urN libdc1394-2.2.1.orig/dc1394/juju/control.c libdc1394-2.2.1/dc1394/juju +DLL_LOCAL dc1394error_t juju_iso_deallocate (platform_camera_t *cam, juju_iso_info * res) { - if (res->got_dealloc) { -@@ -677,7 +678,7 @@ + // Check kernel ABI version for ISO allocation support +@@ -689,7 +690,7 @@ juju_dispatch = { //.iso_allocate_channel = dc1394_juju_iso_allocate_channel, }; @@ -1593,9 +1601,10 @@ diff -urN libdc1394-2.2.1.orig/dc1394/juju/control.c libdc1394-2.2.1/dc1394/juju juju_init(dc1394_t * d) { register_platform (d, &juju_dispatch, "juju"); -diff -urN libdc1394-2.2.1.orig/dc1394/linux/capture.c libdc1394-2.2.1/dc1394/linux/capture.c ---- libdc1394-2.2.1.orig/dc1394/linux/capture.c 2011-08-29 09:58:17.276211906 +0200 -+++ libdc1394-2.2.1/dc1394/linux/capture.c 2011-08-29 10:01:52.568014987 +0200 +Index: libdc1394-2.2.2/dc1394/linux/capture.c +=================================================================== +--- libdc1394-2.2.2.orig/dc1394/linux/capture.c ++++ libdc1394-2.2.2/dc1394/linux/capture.c @@ -43,13 +43,14 @@ #include "kernel-video1394.h" #include "linux.h" @@ -1612,7 +1621,7 @@ diff -urN libdc1394-2.2.1.orig/dc1394/linux/capture.c libdc1394-2.2.1/dc1394/lin open_dma_device(platform_camera_t * craw) { char filename[64]; -@@ -191,7 +192,7 @@ +@@ -191,7 +192,7 @@ capture_linux_setup(platform_camera_t * /* This function allows you to specify the DMA device filename manually. */ @@ -1621,7 +1630,7 @@ diff -urN libdc1394-2.2.1.orig/dc1394/linux/capture.c libdc1394-2.2.1/dc1394/lin dc1394_capture_set_device_filename(dc1394camera_t* camera, char *filename) { dc1394camera_priv_t * cpriv = DC1394_CAMERA_PRIV (camera); -@@ -207,7 +208,7 @@ +@@ -207,7 +208,7 @@ dc1394_capture_set_device_filename(dc139 return DC1394_SUCCESS; } @@ -1630,7 +1639,7 @@ diff -urN libdc1394-2.2.1.orig/dc1394/linux/capture.c libdc1394-2.2.1/dc1394/lin dc1394_linux_capture_setup(platform_camera_t *craw, uint32_t num_dma_buffers, uint32_t flags) { -@@ -305,7 +306,7 @@ +@@ -305,7 +306,7 @@ dc1394_linux_capture_setup(platform_came CAPTURE_STOP *****************************************************/ @@ -1639,7 +1648,7 @@ diff -urN libdc1394-2.2.1.orig/dc1394/linux/capture.c libdc1394-2.2.1/dc1394/lin dc1394_linux_capture_stop(platform_camera_t *craw) { dc1394camera_t * camera = craw->camera; -@@ -371,7 +372,7 @@ +@@ -371,7 +372,7 @@ dc1394_linux_capture_stop(platform_camer } @@ -1648,7 +1657,7 @@ diff -urN libdc1394-2.2.1.orig/dc1394/linux/capture.c libdc1394-2.2.1/dc1394/lin dc1394_linux_capture_dequeue (platform_camera_t * craw, dc1394capture_policy_t policy, dc1394video_frame_t **frame) -@@ -430,7 +431,7 @@ +@@ -430,7 +431,7 @@ dc1394_linux_capture_dequeue (platform_c return DC1394_SUCCESS; } @@ -1657,7 +1666,7 @@ diff -urN libdc1394-2.2.1.orig/dc1394/linux/capture.c libdc1394-2.2.1/dc1394/lin dc1394_linux_capture_enqueue (platform_camera_t * craw, dc1394video_frame_t * frame) { -@@ -455,7 +456,7 @@ +@@ -455,7 +456,7 @@ dc1394_linux_capture_enqueue (platform_c return DC1394_SUCCESS; } @@ -1666,9 +1675,10 @@ diff -urN libdc1394-2.2.1.orig/dc1394/linux/capture.c libdc1394-2.2.1/dc1394/lin dc1394_linux_capture_get_fileno (platform_camera_t * craw) { return craw->capture.dma_fd; -diff -urN libdc1394-2.2.1.orig/dc1394/linux/control.c libdc1394-2.2.1/dc1394/linux/control.c ---- libdc1394-2.2.1.orig/dc1394/linux/control.c 2011-08-29 09:58:17.275211906 +0200 -+++ libdc1394-2.2.1/dc1394/linux/control.c 2011-08-29 10:01:52.568014987 +0200 +Index: libdc1394-2.2.2/dc1394/linux/control.c +=================================================================== +--- libdc1394-2.2.2.orig/dc1394/linux/control.c ++++ libdc1394-2.2.2/dc1394/linux/control.c @@ -40,6 +40,7 @@ #include "linux.h" #include "offsets.h" @@ -1677,7 +1687,7 @@ diff -urN libdc1394-2.2.1.orig/dc1394/linux/control.c libdc1394-2.2.1/dc1394/lin static int is_device_available (const char * filename) -@@ -487,7 +488,7 @@ +@@ -489,7 +490,7 @@ linux_dispatch = { .iso_release_bandwidth = dc1394_linux_iso_release_bandwidth, }; @@ -1686,9 +1696,10 @@ diff -urN libdc1394-2.2.1.orig/dc1394/linux/control.c libdc1394-2.2.1/dc1394/lin linux_init(dc1394_t * d) { register_platform (d, &linux_dispatch, "linux"); -diff -urN libdc1394-2.2.1.orig/dc1394/log.c libdc1394-2.2.1/dc1394/log.c ---- libdc1394-2.2.1.orig/dc1394/log.c 2011-08-29 09:58:17.277211906 +0200 -+++ libdc1394-2.2.1/dc1394/log.c 2011-08-29 10:01:52.568014987 +0200 +Index: libdc1394-2.2.2/dc1394/log.c +=================================================================== +--- libdc1394-2.2.2.orig/dc1394/log.c ++++ libdc1394-2.2.2/dc1394/log.c @@ -24,6 +24,7 @@ #include "log.h" #include @@ -1697,7 +1708,7 @@ diff -urN libdc1394-2.2.1.orig/dc1394/log.c libdc1394-2.2.1/dc1394/log.c static void default_errorlog_handler(dc1394log_t type, const char *message, void* user) -@@ -59,7 +60,7 @@ +@@ -59,7 +60,7 @@ static void *errorlog_data = NULL; static void *warninglog_data = NULL; static void *debuglog_data = NULL; @@ -1706,7 +1717,7 @@ diff -urN libdc1394-2.2.1.orig/dc1394/log.c libdc1394-2.2.1/dc1394/log.c dc1394_log_register_handler(dc1394log_t type, void(*log_handler)(dc1394log_t type, const char *message, void* user), void* user) { switch (type) { case DC1394_LOG_ERROR: -@@ -79,7 +80,7 @@ +@@ -79,7 +80,7 @@ dc1394_log_register_handler(dc1394log_t } } @@ -1715,7 +1726,7 @@ diff -urN libdc1394-2.2.1.orig/dc1394/log.c libdc1394-2.2.1/dc1394/log.c dc1394_log_set_default_handler(dc1394log_t type) { switch (type) { case DC1394_LOG_ERROR: -@@ -100,7 +101,7 @@ +@@ -100,7 +101,7 @@ dc1394_log_set_default_handler(dc1394log } @@ -1724,7 +1735,7 @@ diff -urN libdc1394-2.2.1.orig/dc1394/log.c libdc1394-2.2.1/dc1394/log.c { char string[1024]; if (system_errorlog_handler != NULL) { -@@ -112,7 +113,7 @@ +@@ -112,7 +113,7 @@ void dc1394_log_error(const char *format } @@ -1733,7 +1744,7 @@ diff -urN libdc1394-2.2.1.orig/dc1394/log.c libdc1394-2.2.1/dc1394/log.c { char string[1024]; if (system_warninglog_handler != NULL) { -@@ -124,7 +125,7 @@ +@@ -124,7 +125,7 @@ void dc1394_log_warning(const char *form } @@ -1742,9 +1753,10 @@ diff -urN libdc1394-2.2.1.orig/dc1394/log.c libdc1394-2.2.1/dc1394/log.c { char string[1024]; if (system_debuglog_handler != NULL) { -diff -urN libdc1394-2.2.1.orig/dc1394/register.c libdc1394-2.2.1/dc1394/register.c ---- libdc1394-2.2.1.orig/dc1394/register.c 2011-08-29 09:58:17.277211906 +0200 -+++ libdc1394-2.2.1/dc1394/register.c 2011-08-29 10:01:52.568014987 +0200 +Index: libdc1394-2.2.2/dc1394/register.c +=================================================================== +--- libdc1394-2.2.2.orig/dc1394/register.c ++++ libdc1394-2.2.2/dc1394/register.c @@ -27,6 +27,7 @@ #include "register.h" #include "utils.h" @@ -1762,7 +1774,7 @@ diff -urN libdc1394-2.2.1.orig/dc1394/register.c libdc1394-2.2.1/dc1394/register dc1394_get_registers (dc1394camera_t *camera, uint64_t offset, uint32_t *value, uint32_t num_regs) { -@@ -73,7 +74,7 @@ +@@ -73,7 +74,7 @@ dc1394_get_registers (dc1394camera_t *ca num_regs); } @@ -1771,7 +1783,7 @@ diff -urN libdc1394-2.2.1.orig/dc1394/register.c libdc1394-2.2.1/dc1394/register dc1394_set_registers (dc1394camera_t *camera, uint64_t offset, const uint32_t *value, uint32_t num_regs) { -@@ -90,7 +91,7 @@ +@@ -90,7 +91,7 @@ dc1394_set_registers (dc1394camera_t *ca /********************************************************************************/ /* Get/Set Command Registers */ /********************************************************************************/ @@ -1780,7 +1792,7 @@ diff -urN libdc1394-2.2.1.orig/dc1394/register.c libdc1394-2.2.1/dc1394/register dc1394_get_control_registers (dc1394camera_t *camera, uint64_t offset, uint32_t *value, uint32_t num_regs) { -@@ -98,7 +99,7 @@ +@@ -98,7 +99,7 @@ dc1394_get_control_registers (dc1394came camera->command_registers_base + offset, value, num_regs); } @@ -1789,7 +1801,7 @@ diff -urN libdc1394-2.2.1.orig/dc1394/register.c libdc1394-2.2.1/dc1394/register dc1394_set_control_registers (dc1394camera_t *camera, uint64_t offset, const uint32_t *value, uint32_t num_regs) { -@@ -109,7 +110,7 @@ +@@ -109,7 +110,7 @@ dc1394_set_control_registers (dc1394came /********************************************************************************/ /* Get/Set Advanced Features Registers */ /********************************************************************************/ @@ -1798,7 +1810,7 @@ diff -urN libdc1394-2.2.1.orig/dc1394/register.c libdc1394-2.2.1/dc1394/register dc1394_get_adv_control_registers (dc1394camera_t *camera, uint64_t offset, uint32_t *value, uint32_t num_regs) { -@@ -117,7 +118,7 @@ +@@ -117,7 +118,7 @@ dc1394_get_adv_control_registers (dc1394 camera->advanced_features_csr + offset, value, num_regs); } @@ -1807,7 +1819,7 @@ diff -urN libdc1394-2.2.1.orig/dc1394/register.c libdc1394-2.2.1/dc1394/register dc1394_set_adv_control_registers (dc1394camera_t *camera, uint64_t offset, const uint32_t *value, uint32_t num_regs) { -@@ -129,7 +130,7 @@ +@@ -129,7 +130,7 @@ dc1394_set_adv_control_registers (dc1394 /* Get/Set Format_7 Registers */ /********************************************************************************/ @@ -1816,7 +1828,7 @@ diff -urN libdc1394-2.2.1.orig/dc1394/register.c libdc1394-2.2.1/dc1394/register QueryFormat7CSROffset(dc1394camera_t *camera, dc1394video_mode_t mode, uint64_t *offset) { int retval; -@@ -148,7 +149,7 @@ +@@ -148,7 +149,7 @@ QueryFormat7CSROffset(dc1394camera_t *ca } @@ -1825,7 +1837,7 @@ diff -urN libdc1394-2.2.1.orig/dc1394/register.c libdc1394-2.2.1/dc1394/register dc1394_get_format7_register(dc1394camera_t *camera, unsigned int mode, uint64_t offset, uint32_t *value) { if (camera == NULL) -@@ -171,7 +172,7 @@ +@@ -171,7 +172,7 @@ dc1394_get_format7_register(dc1394camera } @@ -1834,7 +1846,7 @@ diff -urN libdc1394-2.2.1.orig/dc1394/register.c libdc1394-2.2.1/dc1394/register dc1394_set_format7_register(dc1394camera_t *camera, unsigned int mode, uint64_t offset, uint32_t value) { if (camera == NULL) -@@ -194,7 +195,7 @@ +@@ -194,7 +195,7 @@ dc1394_set_format7_register(dc1394camera /* Get/Set Absolute Control Registers */ /********************************************************************************/ @@ -1843,7 +1855,7 @@ diff -urN libdc1394-2.2.1.orig/dc1394/register.c libdc1394-2.2.1/dc1394/register QueryAbsoluteCSROffset(dc1394camera_t *camera, dc1394feature_t feature, uint64_t *offset) { int absoffset, retval; -@@ -211,7 +212,7 @@ +@@ -211,7 +212,7 @@ QueryAbsoluteCSROffset(dc1394camera_t *c } @@ -1852,7 +1864,7 @@ diff -urN libdc1394-2.2.1.orig/dc1394/register.c libdc1394-2.2.1/dc1394/register dc1394_get_absolute_register(dc1394camera_t *camera, unsigned int feature, uint64_t offset, uint32_t *value) { -@@ -224,7 +225,7 @@ +@@ -224,7 +225,7 @@ dc1394_get_absolute_register(dc1394camer return dc1394_get_registers (camera, absoffset + offset, value, 1); } @@ -1861,7 +1873,7 @@ diff -urN libdc1394-2.2.1.orig/dc1394/register.c libdc1394-2.2.1/dc1394/register dc1394_set_absolute_register(dc1394camera_t *camera, unsigned int feature, uint64_t offset, uint32_t value) { -@@ -241,14 +242,14 @@ +@@ -241,14 +242,14 @@ dc1394_set_absolute_register(dc1394camer /* Get/Set PIO Feature Registers */ /********************************************************************************/ @@ -1878,7 +1890,7 @@ diff -urN libdc1394-2.2.1.orig/dc1394/register.c libdc1394-2.2.1/dc1394/register dc1394_set_PIO_register(dc1394camera_t *camera, uint64_t offset, uint32_t value) { return dc1394_set_registers (camera, camera->PIO_control_csr + offset, -@@ -260,14 +261,14 @@ +@@ -260,14 +261,14 @@ dc1394_set_PIO_register(dc1394camera_t * /* Get/Set SIO Feature Registers */ /********************************************************************************/ @@ -1895,7 +1907,7 @@ diff -urN libdc1394-2.2.1.orig/dc1394/register.c libdc1394-2.2.1/dc1394/register dc1394_set_SIO_register(dc1394camera_t *camera, uint64_t offset, uint32_t value) { return dc1394_set_registers (camera, camera->SIO_control_csr + offset, -@@ -278,7 +279,7 @@ +@@ -278,7 +279,7 @@ dc1394_set_SIO_register(dc1394camera_t * /********************************************************************************/ /* Get/Set Strobe Feature Registers */ /********************************************************************************/ @@ -1904,7 +1916,7 @@ diff -urN libdc1394-2.2.1.orig/dc1394/register.c libdc1394-2.2.1/dc1394/register dc1394_get_strobe_register(dc1394camera_t *camera, uint64_t offset, uint32_t *value) { -@@ -286,7 +287,7 @@ +@@ -286,7 +287,7 @@ dc1394_get_strobe_register(dc1394camera_ value, 1); } @@ -1913,18 +1925,19 @@ diff -urN libdc1394-2.2.1.orig/dc1394/register.c libdc1394-2.2.1/dc1394/register dc1394_set_strobe_register(dc1394camera_t *camera, uint64_t offset, uint32_t value) { -diff -urN libdc1394-2.2.1.orig/dc1394/usb/capture.c libdc1394-2.2.1/dc1394/usb/capture.c ---- libdc1394-2.2.1.orig/dc1394/usb/capture.c 2011-08-29 09:58:17.276211906 +0200 -+++ libdc1394-2.2.1/dc1394/usb/capture.c 2011-08-29 10:01:52.568014987 +0200 -@@ -28,6 +28,7 @@ - #include - +Index: libdc1394-2.2.2/dc1394/usb/capture.c +=================================================================== +--- libdc1394-2.2.2.orig/dc1394/usb/capture.c ++++ libdc1394-2.2.2/dc1394/usb/capture.c +@@ -30,6 +30,7 @@ + #include + #endif #include "usb/usb.h" +#include "visibility.h" - /* Callback whenever a bulk transfer finishes. */ - static void -@@ -101,7 +102,7 @@ + // LIBUSB_CALL only defined for latest libusb versions. + #ifndef LIBUSB_CALL +@@ -121,7 +122,7 @@ init_frame(platform_camera_t *craw, int return DC1394_SUCCESS; } @@ -1933,7 +1946,7 @@ diff -urN libdc1394-2.2.1.orig/dc1394/usb/capture.c libdc1394-2.2.1/dc1394/usb/c dc1394_usb_capture_setup(platform_camera_t *craw, uint32_t num_dma_buffers, uint32_t flags) { -@@ -226,7 +227,7 @@ +@@ -267,7 +268,7 @@ dc1394_usb_capture_setup(platform_camera return DC1394_SUCCESS; } @@ -1942,7 +1955,7 @@ diff -urN libdc1394-2.2.1.orig/dc1394/usb/capture.c libdc1394-2.2.1/dc1394/usb/c dc1394_usb_capture_stop(platform_camera_t *craw) { dc1394camera_t * camera = craw->camera; -@@ -299,7 +300,7 @@ +@@ -358,7 +359,7 @@ dc1394_usb_capture_stop(platform_camera_ #define NEXT_BUFFER(c,i) (((i) == -1) ? 0 : ((i)+1)%(c)->num_frames) @@ -1951,7 +1964,7 @@ diff -urN libdc1394-2.2.1.orig/dc1394/usb/capture.c libdc1394-2.2.1/dc1394/usb/c dc1394_usb_capture_dequeue (platform_camera_t * craw, dc1394capture_policy_t policy, dc1394video_frame_t **frame_return) { -@@ -351,7 +352,7 @@ +@@ -410,7 +411,7 @@ dc1394_usb_capture_dequeue (platform_cam return DC1394_SUCCESS; } @@ -1960,7 +1973,7 @@ diff -urN libdc1394-2.2.1.orig/dc1394/usb/capture.c libdc1394-2.2.1/dc1394/usb/c dc1394_usb_capture_enqueue (platform_camera_t * craw, dc1394video_frame_t * frame) { -@@ -377,7 +378,7 @@ +@@ -436,7 +437,7 @@ dc1394_usb_capture_enqueue (platform_cam return DC1394_SUCCESS; } @@ -1969,7 +1982,7 @@ diff -urN libdc1394-2.2.1.orig/dc1394/usb/capture.c libdc1394-2.2.1/dc1394/usb/c dc1394_usb_capture_get_fileno (platform_camera_t * craw) { if (craw->notify_pipe[0] == 0 && craw->notify_pipe[1] == 0) -@@ -386,7 +387,7 @@ +@@ -445,7 +446,7 @@ dc1394_usb_capture_get_fileno (platform_ return craw->notify_pipe[0]; } @@ -1978,9 +1991,10 @@ diff -urN libdc1394-2.2.1.orig/dc1394/usb/capture.c libdc1394-2.2.1/dc1394/usb/c dc1394_usb_capture_is_frame_corrupt (platform_camera_t * craw, dc1394video_frame_t * frame) { -diff -urN libdc1394-2.2.1.orig/dc1394/usb/control.c libdc1394-2.2.1/dc1394/usb/control.c ---- libdc1394-2.2.1.orig/dc1394/usb/control.c 2011-08-29 09:58:17.276211906 +0200 -+++ libdc1394-2.2.1/dc1394/usb/control.c 2011-08-29 10:01:52.569014987 +0200 +Index: libdc1394-2.2.2/dc1394/usb/control.c +=================================================================== +--- libdc1394-2.2.2.orig/dc1394/usb/control.c ++++ libdc1394-2.2.2/dc1394/usb/control.c @@ -29,7 +29,7 @@ #include "platform.h" #include "internal.h" @@ -1990,8 +2004,8 @@ diff -urN libdc1394-2.2.1.orig/dc1394/usb/control.c libdc1394-2.2.1/dc1394/usb/c static platform_t * dc1394_usb_new (void) -@@ -379,7 +379,7 @@ - .capture_is_frame_corrupt = dc1394_usb_capture_is_frame_corrupt, +@@ -392,7 +392,7 @@ usb_dispatch = { + #endif }; -void @@ -1999,9 +2013,10 @@ diff -urN libdc1394-2.2.1.orig/dc1394/usb/control.c libdc1394-2.2.1/dc1394/usb/c dc1394_usb_init(dc1394_t * d) { register_platform (d, &usb_dispatch, "usb"); -diff -urN libdc1394-2.2.1.orig/dc1394/utils.c libdc1394-2.2.1/dc1394/utils.c ---- libdc1394-2.2.1.orig/dc1394/utils.c 2011-08-29 09:58:17.274211906 +0200 -+++ libdc1394-2.2.1/dc1394/utils.c 2011-08-29 10:01:52.569014987 +0200 +Index: libdc1394-2.2.2/dc1394/utils.c +=================================================================== +--- libdc1394-2.2.2.orig/dc1394/utils.c ++++ libdc1394-2.2.2/dc1394/utils.c @@ -21,6 +21,7 @@ */ @@ -2010,7 +2025,7 @@ diff -urN libdc1394-2.2.1.orig/dc1394/utils.c libdc1394-2.2.1/dc1394/utils.c const char *dc1394_feature_desc[DC1394_FEATURE_NUM] = { "Brightness", -@@ -90,7 +91,7 @@ +@@ -90,7 +91,7 @@ const char *dc1394_error_strings[DC1394_ "Basler error: unknown SFF chunk" }; @@ -2019,7 +2034,7 @@ diff -urN libdc1394-2.2.1.orig/dc1394/utils.c libdc1394-2.2.1/dc1394/utils.c dc1394_get_image_size_from_video_mode(dc1394camera_t *camera, dc1394video_mode_t video_mode, uint32_t *w, uint32_t *h) { dc1394error_t err; -@@ -160,7 +161,7 @@ +@@ -160,7 +161,7 @@ dc1394_get_image_size_from_video_mode(dc } @@ -2028,7 +2043,7 @@ diff -urN libdc1394-2.2.1.orig/dc1394/utils.c libdc1394-2.2.1/dc1394/utils.c dc1394_framerate_as_float(dc1394framerate_t framerate_enum, float *framerate) { switch(framerate_enum) { -@@ -192,7 +193,7 @@ +@@ -192,7 +193,7 @@ dc1394_framerate_as_float(dc1394framerat return DC1394_INVALID_FRAMERATE; } @@ -2037,7 +2052,7 @@ diff -urN libdc1394-2.2.1.orig/dc1394/utils.c libdc1394-2.2.1/dc1394/utils.c dc1394_is_color(dc1394color_coding_t color_coding, dc1394bool_t *is_color) { switch(color_coding) { -@@ -215,7 +216,7 @@ +@@ -215,7 +216,7 @@ dc1394_is_color(dc1394color_coding_t col return DC1394_INVALID_COLOR_CODING; } @@ -2046,7 +2061,7 @@ diff -urN libdc1394-2.2.1.orig/dc1394/utils.c libdc1394-2.2.1/dc1394/utils.c dc1394_get_color_coding_data_depth(dc1394color_coding_t color_coding, uint32_t * bits) { switch(color_coding) { -@@ -239,7 +240,7 @@ +@@ -239,7 +240,7 @@ dc1394_get_color_coding_data_depth(dc139 return DC1394_INVALID_COLOR_CODING; } @@ -2055,7 +2070,7 @@ diff -urN libdc1394-2.2.1.orig/dc1394/utils.c libdc1394-2.2.1/dc1394/utils.c dc1394_get_color_coding_bit_size(dc1394color_coding_t color_coding, uint32_t* bits) { switch(color_coding) { -@@ -268,7 +269,7 @@ +@@ -268,7 +269,7 @@ dc1394_get_color_coding_bit_size(dc1394c return DC1394_INVALID_COLOR_CODING; } @@ -2064,7 +2079,7 @@ diff -urN libdc1394-2.2.1.orig/dc1394/utils.c libdc1394-2.2.1/dc1394/utils.c dc1394_get_color_coding_from_video_mode(dc1394camera_t *camera, dc1394video_mode_t video_mode, dc1394color_coding_t *color_coding) { dc1394error_t err; -@@ -334,25 +335,25 @@ +@@ -334,25 +335,25 @@ dc1394_get_color_coding_from_video_mode( return DC1394_FAILURE; } @@ -2094,7 +2109,7 @@ diff -urN libdc1394-2.2.1.orig/dc1394/utils.c libdc1394-2.2.1/dc1394/utils.c dc1394_feature_get_string(dc1394feature_t feature) { if ((feature>DC1394_FEATURE_MAX)||(feature #include @@ -2132,7 +2148,7 @@ diff -urN libdc1394-2.2.1.orig/dc1394/vendor/avt.c libdc1394-2.2.1/dc1394/vendor dc1394_avt_get_version(dc1394camera_t *camera, uint32_t *UCType, uint32_t *Version, uint32_t *Camera_ID, uint32_t *FPGA_Version) -@@ -127,7 +128,7 @@ +@@ -127,7 +128,7 @@ dc1394_avt_get_version(dc1394camera_t *c /************************************************************************/ /* Get Advanced feature inquiry */ /************************************************************************/ @@ -2141,7 +2157,7 @@ diff -urN libdc1394-2.2.1.orig/dc1394/vendor/avt.c libdc1394-2.2.1/dc1394/vendor dc1394_avt_get_advanced_feature_inquiry(dc1394camera_t *camera, dc1394_avt_adv_feature_info_t *adv_feature) { -@@ -207,7 +208,7 @@ +@@ -207,7 +208,7 @@ dc1394_avt_get_advanced_feature_inquiry( /************************************************************************/ /* Print Advanced features */ /************************************************************************/ @@ -2150,7 +2166,7 @@ diff -urN libdc1394-2.2.1.orig/dc1394/vendor/avt.c libdc1394-2.2.1/dc1394/vendor dc1394_avt_print_advanced_feature(dc1394_avt_adv_feature_info_t *adv_feature) { -@@ -271,7 +272,7 @@ +@@ -271,7 +272,7 @@ dc1394_avt_print_advanced_feature(dc1394 /************************************************************************/ /* Get shading mode */ /************************************************************************/ @@ -2159,7 +2175,7 @@ diff -urN libdc1394-2.2.1.orig/dc1394/vendor/avt.c libdc1394-2.2.1/dc1394/vendor dc1394_avt_get_shading(dc1394camera_t *camera, dc1394bool_t *on_off, dc1394bool_t *compute, dc1394bool_t *show, uint32_t *frame_nb) -@@ -307,7 +308,7 @@ +@@ -307,7 +308,7 @@ dc1394_avt_get_shading(dc1394camera_t *c /************************************************************************/ /* Set shading mode */ /************************************************************************/ @@ -2168,7 +2184,7 @@ diff -urN libdc1394-2.2.1.orig/dc1394/vendor/avt.c libdc1394-2.2.1/dc1394/vendor dc1394_avt_set_shading(dc1394camera_t *camera, dc1394bool_t on_off, dc1394bool_t compute, dc1394bool_t show, uint32_t frame_nb) -@@ -343,7 +344,7 @@ +@@ -343,7 +344,7 @@ dc1394_avt_set_shading(dc1394camera_t *c /************************************************************************/ /* Get shading mem ctrl */ /************************************************************************/ @@ -2177,7 +2193,7 @@ diff -urN libdc1394-2.2.1.orig/dc1394/vendor/avt.c libdc1394-2.2.1/dc1394/vendor dc1394_avt_get_shading_mem_ctrl(dc1394camera_t *camera, dc1394bool_t *en_write, dc1394bool_t *en_read, uint32_t *addroffset) { -@@ -373,7 +374,7 @@ +@@ -373,7 +374,7 @@ dc1394_avt_get_shading_mem_ctrl(dc1394ca /************************************************************************/ /* Set shading mem ctrl */ /************************************************************************/ @@ -2186,7 +2202,7 @@ diff -urN libdc1394-2.2.1.orig/dc1394/vendor/avt.c libdc1394-2.2.1/dc1394/vendor dc1394_avt_set_shading_mem_ctrl(dc1394camera_t *camera, dc1394bool_t en_write, dc1394bool_t en_read, uint32_t addroffset) { -@@ -403,7 +404,7 @@ +@@ -403,7 +404,7 @@ dc1394_avt_set_shading_mem_ctrl(dc1394ca /************************************************************************/ /* Get shading info */ /************************************************************************/ @@ -2195,7 +2211,7 @@ diff -urN libdc1394-2.2.1.orig/dc1394/vendor/avt.c libdc1394-2.2.1/dc1394/vendor dc1394_avt_get_shading_info(dc1394camera_t *camera, uint32_t *MaxImageSize) { dc1394error_t err; -@@ -424,7 +425,7 @@ +@@ -424,7 +425,7 @@ dc1394_avt_get_shading_info(dc1394camera /************************************************************************/ /* Get Multiple slope parameters (HDR) */ /************************************************************************/ @@ -2204,7 +2220,7 @@ diff -urN libdc1394-2.2.1.orig/dc1394/vendor/avt.c libdc1394-2.2.1/dc1394/vendor dc1394_avt_get_multiple_slope(dc1394camera_t *camera, dc1394bool_t *on_off, uint32_t *points_nb,uint32_t *kneepoint1, uint32_t *kneepoint2, uint32_t *kneepoint3) -@@ -458,7 +459,7 @@ +@@ -458,7 +459,7 @@ dc1394_avt_get_multiple_slope(dc1394came /************************************************************************/ /* Set Multiple slope parameters */ /************************************************************************/ @@ -2213,7 +2229,7 @@ diff -urN libdc1394-2.2.1.orig/dc1394/vendor/avt.c libdc1394-2.2.1/dc1394/vendor dc1394_avt_set_multiple_slope(dc1394camera_t *camera, dc1394bool_t on_off, uint32_t points_nb, uint32_t kneepoint1, uint32_t kneepoint2, uint32_t kneepoint3) -@@ -495,7 +496,7 @@ +@@ -495,7 +496,7 @@ dc1394_avt_set_multiple_slope(dc1394came /************************************************************************/ /* Get Shutter Timebase */ /************************************************************************/ @@ -2222,7 +2238,7 @@ diff -urN libdc1394-2.2.1.orig/dc1394/vendor/avt.c libdc1394-2.2.1/dc1394/vendor dc1394_avt_get_timebase(dc1394camera_t *camera, uint32_t *timebase_id) { dc1394error_t err; -@@ -515,7 +516,7 @@ +@@ -515,7 +516,7 @@ dc1394_avt_get_timebase(dc1394camera_t * /************************************************************************/ /* Set Shutter Timebase (acquisition must be stopped) */ /************************************************************************/ @@ -2231,7 +2247,7 @@ diff -urN libdc1394-2.2.1.orig/dc1394/vendor/avt.c libdc1394-2.2.1/dc1394/vendor dc1394_avt_set_timebase(dc1394camera_t *camera, uint32_t timebase_id) { dc1394error_t err; -@@ -538,7 +539,7 @@ +@@ -538,7 +539,7 @@ dc1394_avt_set_timebase(dc1394camera_t * /************************************************************************/ /* Get Extented Shutter */ /************************************************************************/ @@ -2240,7 +2256,7 @@ diff -urN libdc1394-2.2.1.orig/dc1394/vendor/avt.c libdc1394-2.2.1/dc1394/vendor dc1394_avt_get_extented_shutter(dc1394camera_t *camera, uint32_t *timebase_id) { dc1394error_t err; -@@ -559,7 +560,7 @@ +@@ -559,7 +560,7 @@ dc1394_avt_get_extented_shutter(dc1394ca /************************************************************************/ /* Set Extented shutter */ /************************************************************************/ @@ -2249,7 +2265,7 @@ diff -urN libdc1394-2.2.1.orig/dc1394/vendor/avt.c libdc1394-2.2.1/dc1394/vendor dc1394_avt_set_extented_shutter(dc1394camera_t *camera, uint32_t timebase_id) { dc1394error_t err; -@@ -583,7 +584,7 @@ +@@ -583,7 +584,7 @@ dc1394_avt_set_extented_shutter(dc1394ca /************************************************************************/ /* Get MaxResolution (Read Only) */ /************************************************************************/ @@ -2258,7 +2274,7 @@ diff -urN libdc1394-2.2.1.orig/dc1394/vendor/avt.c libdc1394-2.2.1/dc1394/vendor dc1394_avt_get_MaxResolution(dc1394camera_t *camera, uint32_t *MaxHeight, uint32_t *MaxWidth) { dc1394error_t err; -@@ -605,7 +606,7 @@ +@@ -605,7 +606,7 @@ dc1394_avt_get_MaxResolution(dc1394camer /************************************************************************/ /* Get Auto Shutter */ /************************************************************************/ @@ -2267,7 +2283,7 @@ diff -urN libdc1394-2.2.1.orig/dc1394/vendor/avt.c libdc1394-2.2.1/dc1394/vendor dc1394_avt_get_auto_shutter(dc1394camera_t *camera, uint32_t *MinValue, uint32_t *MaxValue) { dc1394error_t err; -@@ -630,7 +631,7 @@ +@@ -630,7 +631,7 @@ dc1394_avt_get_auto_shutter(dc1394camera /************************************************************************/ /* Set Auto shutter */ /************************************************************************/ @@ -2276,7 +2292,7 @@ diff -urN libdc1394-2.2.1.orig/dc1394/vendor/avt.c libdc1394-2.2.1/dc1394/vendor dc1394_avt_set_auto_shutter(dc1394camera_t *camera, uint32_t MinValue, uint32_t MaxValue) { dc1394error_t err; -@@ -649,7 +650,7 @@ +@@ -649,7 +650,7 @@ dc1394_avt_set_auto_shutter(dc1394camera /************************************************************************/ /* Get Auto Gain */ /************************************************************************/ @@ -2285,7 +2301,7 @@ diff -urN libdc1394-2.2.1.orig/dc1394/vendor/avt.c libdc1394-2.2.1/dc1394/vendor dc1394_avt_get_auto_gain(dc1394camera_t *camera, uint32_t *MinValue, uint32_t *MaxValue) { dc1394error_t err; -@@ -671,7 +672,7 @@ +@@ -671,7 +672,7 @@ dc1394_avt_get_auto_gain(dc1394camera_t /************************************************************************/ /* Set Auto gain */ /************************************************************************/ @@ -2294,7 +2310,7 @@ diff -urN libdc1394-2.2.1.orig/dc1394/vendor/avt.c libdc1394-2.2.1/dc1394/vendor dc1394_avt_set_auto_gain(dc1394camera_t *camera, uint32_t MinValue, uint32_t MaxValue) { dc1394error_t err; -@@ -691,7 +692,7 @@ +@@ -691,7 +692,7 @@ dc1394_avt_set_auto_gain(dc1394camera_t /************************************************************************/ /* Get Trigger delay */ /************************************************************************/ @@ -2303,7 +2319,7 @@ diff -urN libdc1394-2.2.1.orig/dc1394/vendor/avt.c libdc1394-2.2.1/dc1394/vendor dc1394_avt_get_trigger_delay(dc1394camera_t *camera, dc1394bool_t *on_off, uint32_t *DelayTime) { dc1394error_t err; -@@ -714,7 +715,7 @@ +@@ -714,7 +715,7 @@ dc1394_avt_get_trigger_delay(dc1394camer /************************************************************************/ /* Set Trigger delay */ /************************************************************************/ @@ -2312,7 +2328,7 @@ diff -urN libdc1394-2.2.1.orig/dc1394/vendor/avt.c libdc1394-2.2.1/dc1394/vendor dc1394_avt_set_trigger_delay(dc1394camera_t *camera, dc1394bool_t on_off, uint32_t DelayTime) { dc1394error_t err; -@@ -741,7 +742,7 @@ +@@ -741,7 +742,7 @@ dc1394_avt_set_trigger_delay(dc1394camer /************************************************************************/ /* Get Mirror */ /************************************************************************/ @@ -2321,7 +2337,7 @@ diff -urN libdc1394-2.2.1.orig/dc1394/vendor/avt.c libdc1394-2.2.1/dc1394/vendor dc1394_avt_get_mirror(dc1394camera_t *camera, dc1394bool_t *on_off) { dc1394error_t err; -@@ -760,7 +761,7 @@ +@@ -760,7 +761,7 @@ dc1394_avt_get_mirror(dc1394camera_t *ca /************************************************************************/ /* Set Mirror */ /************************************************************************/ @@ -2330,7 +2346,7 @@ diff -urN libdc1394-2.2.1.orig/dc1394/vendor/avt.c libdc1394-2.2.1/dc1394/vendor dc1394_avt_set_mirror(dc1394camera_t *camera, dc1394bool_t on_off) { dc1394error_t err; -@@ -779,7 +780,7 @@ +@@ -779,7 +780,7 @@ dc1394_avt_set_mirror(dc1394camera_t *ca /************************************************************************/ /* Get DSNU */ /************************************************************************/ @@ -2339,7 +2355,7 @@ diff -urN libdc1394-2.2.1.orig/dc1394/vendor/avt.c libdc1394-2.2.1/dc1394/vendor dc1394_avt_get_dsnu(dc1394camera_t *camera, dc1394bool_t *on_off,uint32_t *frame_nb) { dc1394error_t err; -@@ -800,7 +801,7 @@ +@@ -800,7 +801,7 @@ dc1394_avt_get_dsnu(dc1394camera_t *came /************************************************************************/ /* Set DSNU */ /************************************************************************/ @@ -2348,7 +2364,7 @@ diff -urN libdc1394-2.2.1.orig/dc1394/vendor/avt.c libdc1394-2.2.1/dc1394/vendor dc1394_avt_set_dsnu(dc1394camera_t *camera, dc1394bool_t on_off, dc1394bool_t compute, uint32_t frame_nb) { -@@ -838,7 +839,7 @@ +@@ -838,7 +839,7 @@ dc1394_avt_set_dsnu(dc1394camera_t *came /************************************************************************/ /* Get BLEMISH */ /************************************************************************/ @@ -2357,7 +2373,7 @@ diff -urN libdc1394-2.2.1.orig/dc1394/vendor/avt.c libdc1394-2.2.1/dc1394/vendor dc1394_avt_get_blemish(dc1394camera_t *camera, dc1394bool_t *on_off, uint32_t *frame_nb) { dc1394error_t err; -@@ -859,7 +860,7 @@ +@@ -859,7 +860,7 @@ dc1394_avt_get_blemish(dc1394camera_t *c /************************************************************************/ /* Set BLEMISH */ /************************************************************************/ @@ -2366,7 +2382,7 @@ diff -urN libdc1394-2.2.1.orig/dc1394/vendor/avt.c libdc1394-2.2.1/dc1394/vendor dc1394_avt_set_blemish(dc1394camera_t *camera, dc1394bool_t on_off, dc1394bool_t compute, uint32_t frame_nb) { -@@ -900,7 +901,7 @@ +@@ -900,7 +901,7 @@ dc1394_avt_set_blemish(dc1394camera_t *c /************************************************************************/ /* Get IO REG_CAMERA_AVT_IO_INP_CTRLx or REG_CAMERA_AVT_IO_OUTP_CTRLx */ /************************************************************************/ @@ -2375,7 +2391,7 @@ diff -urN libdc1394-2.2.1.orig/dc1394/vendor/avt.c libdc1394-2.2.1/dc1394/vendor dc1394_avt_get_io(dc1394camera_t *camera, uint32_t IO, dc1394bool_t *polarity, uint32_t *mode, dc1394bool_t *pinstate) { -@@ -926,7 +927,7 @@ +@@ -926,7 +927,7 @@ dc1394_avt_get_io(dc1394camera_t *camera /************************************************************************/ /* Set IO REG_CAMERA_AVT_IO_INP_CTRLx or REG_CAMERA_AVT_IO_OUTP_CTRLx */ /************************************************************************/ @@ -2384,7 +2400,7 @@ diff -urN libdc1394-2.2.1.orig/dc1394/vendor/avt.c libdc1394-2.2.1/dc1394/vendor dc1394_avt_set_io(dc1394camera_t *camera,uint32_t IO, dc1394bool_t polarity, uint32_t mode, dc1394bool_t pinstate) { -@@ -957,7 +958,7 @@ +@@ -957,7 +958,7 @@ dc1394_avt_set_io(dc1394camera_t *camera /************************************************************************/ /* BusReset IEEE1394 */ /************************************************************************/ @@ -2393,7 +2409,7 @@ diff -urN libdc1394-2.2.1.orig/dc1394/vendor/avt.c libdc1394-2.2.1/dc1394/vendor dc1394_avt_reset(dc1394camera_t *camera) { dc1394error_t err; -@@ -975,7 +976,7 @@ +@@ -975,7 +976,7 @@ dc1394_avt_reset(dc1394camera_t *camera) /************************************************************************/ /* Get Lookup Tables (LUT) */ /************************************************************************/ @@ -2402,7 +2418,7 @@ diff -urN libdc1394-2.2.1.orig/dc1394/vendor/avt.c libdc1394-2.2.1/dc1394/vendor dc1394_avt_get_lut(dc1394camera_t *camera, dc1394bool_t *on_off, uint32_t *lutnb) { dc1394error_t err; -@@ -998,7 +999,7 @@ +@@ -998,7 +999,7 @@ dc1394_avt_get_lut(dc1394camera_t *camer /************************************************************************/ /* Set Lookup Tables (LUT) */ /************************************************************************/ @@ -2411,7 +2427,7 @@ diff -urN libdc1394-2.2.1.orig/dc1394/vendor/avt.c libdc1394-2.2.1/dc1394/vendor dc1394_avt_set_lut(dc1394camera_t *camera, dc1394bool_t on_off, uint32_t lutnb) { dc1394error_t err; -@@ -1025,7 +1026,7 @@ +@@ -1025,7 +1026,7 @@ dc1394_avt_set_lut(dc1394camera_t *camer /************************************************************************/ /* Get LUT ctrl */ /************************************************************************/ @@ -2420,7 +2436,7 @@ diff -urN libdc1394-2.2.1.orig/dc1394/vendor/avt.c libdc1394-2.2.1/dc1394/vendor dc1394_avt_get_lut_mem_ctrl(dc1394camera_t *camera, dc1394bool_t *en_write, uint32_t * AccessLutNo,uint32_t *addroffset) { -@@ -1052,7 +1053,7 @@ +@@ -1052,7 +1053,7 @@ dc1394_avt_get_lut_mem_ctrl(dc1394camera /************************************************************************/ /* Set LUT ctrl */ /************************************************************************/ @@ -2429,7 +2445,7 @@ diff -urN libdc1394-2.2.1.orig/dc1394/vendor/avt.c libdc1394-2.2.1/dc1394/vendor dc1394_avt_set_lut_mem_ctrl(dc1394camera_t *camera, dc1394bool_t en_write, uint32_t AccessLutNo, uint32_t addroffset) { -@@ -1083,7 +1084,7 @@ +@@ -1083,7 +1084,7 @@ dc1394_avt_set_lut_mem_ctrl(dc1394camera /************************************************************************/ /* Get LUT info */ /************************************************************************/ @@ -2438,7 +2454,7 @@ diff -urN libdc1394-2.2.1.orig/dc1394/vendor/avt.c libdc1394-2.2.1/dc1394/vendor dc1394_avt_get_lut_info(dc1394camera_t *camera, uint32_t *NumOfLuts, uint32_t *MaxLutSize) { dc1394error_t err; -@@ -1106,7 +1107,7 @@ +@@ -1106,7 +1107,7 @@ dc1394_avt_get_lut_info(dc1394camera_t * /************************************************************************/ /* Get Automatic white balance with Area Of Interest AOI */ /************************************************************************/ @@ -2447,7 +2463,7 @@ diff -urN libdc1394-2.2.1.orig/dc1394/vendor/avt.c libdc1394-2.2.1/dc1394/vendor dc1394_avt_get_aoi(dc1394camera_t *camera, dc1394bool_t *on_off, int *left, int *top, int *width, int *height) { -@@ -1144,7 +1145,7 @@ +@@ -1144,7 +1145,7 @@ dc1394_avt_get_aoi(dc1394camera_t *camer /************************************************************************/ /* Set Automatic white balance with Area Of Interest AOI */ /************************************************************************/ @@ -2456,7 +2472,7 @@ diff -urN libdc1394-2.2.1.orig/dc1394/vendor/avt.c libdc1394-2.2.1/dc1394/vendor dc1394_avt_set_aoi(dc1394camera_t *camera, dc1394bool_t on_off,int left, int top, int width, int height) { -@@ -1172,7 +1173,7 @@ +@@ -1172,7 +1173,7 @@ dc1394_avt_set_aoi(dc1394camera_t *camer /************************************************************************/ /* Get test_images */ /************************************************************************/ @@ -2465,7 +2481,7 @@ diff -urN libdc1394-2.2.1.orig/dc1394/vendor/avt.c libdc1394-2.2.1/dc1394/vendor dc1394_avt_get_test_images(dc1394camera_t *camera, uint32_t *image_no) { dc1394error_t err; -@@ -1192,7 +1193,7 @@ +@@ -1192,7 +1193,7 @@ dc1394_avt_get_test_images(dc1394camera_ /************************************************************************/ /* Set test_images */ /************************************************************************/ @@ -2474,7 +2490,7 @@ diff -urN libdc1394-2.2.1.orig/dc1394/vendor/avt.c libdc1394-2.2.1/dc1394/vendor dc1394_avt_set_test_images(dc1394camera_t *camera, uint32_t image_no) { dc1394error_t err; -@@ -1216,7 +1217,7 @@ +@@ -1216,7 +1217,7 @@ dc1394_avt_set_test_images(dc1394camera_ /************************************************************************/ /* Get frame info */ /************************************************************************/ @@ -2483,7 +2499,7 @@ diff -urN libdc1394-2.2.1.orig/dc1394/vendor/avt.c libdc1394-2.2.1/dc1394/vendor dc1394_avt_get_frame_info(dc1394camera_t *camera, uint32_t *framecounter) { dc1394error_t err; -@@ -1236,7 +1237,7 @@ +@@ -1236,7 +1237,7 @@ dc1394_avt_get_frame_info(dc1394camera_t /************************************************************************/ /* Reset frame info */ /************************************************************************/ @@ -2492,7 +2508,7 @@ diff -urN libdc1394-2.2.1.orig/dc1394/vendor/avt.c libdc1394-2.2.1/dc1394/vendor dc1394_avt_reset_frame_info(dc1394camera_t *camera) { dc1394error_t err; -@@ -1250,7 +1251,7 @@ +@@ -1250,7 +1251,7 @@ dc1394_avt_reset_frame_info(dc1394camera /************************************************************************/ /* Get Deferred image transport */ /************************************************************************/ @@ -2501,7 +2517,7 @@ diff -urN libdc1394-2.2.1.orig/dc1394/vendor/avt.c libdc1394-2.2.1/dc1394/vendor dc1394_avt_get_deferred_trans(dc1394camera_t *camera, dc1394bool_t *HoldImage, dc1394bool_t * FastCapture, uint32_t *FifoSize, uint32_t *NumOfImages ) -@@ -1281,7 +1282,7 @@ +@@ -1281,7 +1282,7 @@ dc1394_avt_get_deferred_trans(dc1394came /************************************************************************/ /* Set Deferred image transport */ /************************************************************************/ @@ -2510,7 +2526,7 @@ diff -urN libdc1394-2.2.1.orig/dc1394/vendor/avt.c libdc1394-2.2.1/dc1394/vendor dc1394_avt_set_deferred_trans(dc1394camera_t *camera, dc1394bool_t HoldImage, dc1394bool_t FastCapture, uint32_t FifoSize, uint32_t NumOfImages, -@@ -1321,7 +1322,7 @@ +@@ -1321,7 +1322,7 @@ dc1394_avt_set_deferred_trans(dc1394came /************************************************************************/ /* Get GPData info */ /************************************************************************/ @@ -2519,7 +2535,7 @@ diff -urN libdc1394-2.2.1.orig/dc1394/vendor/avt.c libdc1394-2.2.1/dc1394/vendor dc1394_avt_get_gpdata_info(dc1394camera_t *camera, uint32_t *BufferSize) { dc1394error_t err; -@@ -1371,7 +1372,7 @@ +@@ -1371,7 +1372,7 @@ static void gpdata_io_common(uint32_t *b /************************************************************************/ /* Read size number of bytes from GPData buffer */ /************************************************************************/ @@ -2528,7 +2544,7 @@ diff -urN libdc1394-2.2.1.orig/dc1394/vendor/avt.c libdc1394-2.2.1/dc1394/vendor dc1394_avt_read_gpdata(dc1394camera_t *camera, unsigned char *buf, uint32_t size) { uint32_t gpdata_numquads, gpdata_bufsize; -@@ -1423,7 +1424,7 @@ +@@ -1423,7 +1424,7 @@ dc1394_avt_read_gpdata(dc1394camera_t *c /************************************************************************/ /* Write size number of bytes to GPData buffer */ /************************************************************************/ @@ -2537,7 +2553,7 @@ diff -urN libdc1394-2.2.1.orig/dc1394/vendor/avt.c libdc1394-2.2.1/dc1394/vendor dc1394_avt_write_gpdata(dc1394camera_t *camera, unsigned char *buf, uint32_t size) { uint32_t gpdata_bufsize, gpdata_numquads; -@@ -1475,7 +1476,7 @@ +@@ -1475,7 +1476,7 @@ dc1394_avt_write_gpdata(dc1394camera_t * /************************************************************************/ /* Read shading image from camera into buffer */ /************************************************************************/ @@ -2546,7 +2562,7 @@ diff -urN libdc1394-2.2.1.orig/dc1394/vendor/avt.c libdc1394-2.2.1/dc1394/vendor dc1394_avt_read_shading_img(dc1394camera_t *camera, unsigned char *buf, uint32_t size) { -@@ -1506,7 +1507,7 @@ +@@ -1506,7 +1507,7 @@ dc1394_avt_read_shading_img(dc1394camera /************************************************************************/ /* Write shading image from buffer to camera */ /************************************************************************/ @@ -2555,7 +2571,7 @@ diff -urN libdc1394-2.2.1.orig/dc1394/vendor/avt.c libdc1394-2.2.1/dc1394/vendor dc1394_avt_write_shading_img(dc1394camera_t *camera, unsigned char *buf, uint32_t size) { -@@ -1536,7 +1537,7 @@ +@@ -1536,7 +1537,7 @@ dc1394_avt_write_shading_img(dc1394camer /************************************************************************/ /* Read channel adjust (AVT Pike) */ /************************************************************************/ @@ -2564,7 +2580,7 @@ diff -urN libdc1394-2.2.1.orig/dc1394/vendor/avt.c libdc1394-2.2.1/dc1394/vendor { dc1394error_t err; uint32_t value; -@@ -1554,7 +1555,7 @@ +@@ -1554,7 +1555,7 @@ dc1394error_t dc1394_avt_get_channel_adj /************************************************************************/ /* Write channel adjust (AVT Pike) */ /************************************************************************/ @@ -2573,7 +2589,7 @@ diff -urN libdc1394-2.2.1.orig/dc1394/vendor/avt.c libdc1394-2.2.1/dc1394/vendor { dc1394error_t err; -@@ -1569,7 +1570,7 @@ +@@ -1569,7 +1570,7 @@ dc1394error_t dc1394_avt_set_channel_adj /* Set Color Correction + Coefficients */ /************************************************************************/ @@ -2582,7 +2598,7 @@ diff -urN libdc1394-2.2.1.orig/dc1394/vendor/avt.c libdc1394-2.2.1/dc1394/vendor { dc1394error_t err; uint32_t curval; -@@ -1628,7 +1629,7 @@ +@@ -1628,7 +1629,7 @@ dc1394error_t dc1394_avt_set_color_corr( /* Get Color Correction + Coefficients */ /************************************************************************/ @@ -2591,7 +2607,7 @@ diff -urN libdc1394-2.2.1.orig/dc1394/vendor/avt.c libdc1394-2.2.1/dc1394/vendor { dc1394error_t err; uint32_t value; -@@ -1677,7 +1678,7 @@ +@@ -1677,7 +1678,7 @@ dc1394error_t dc1394_avt_get_color_corr( /* Get HSNR */ /************************************************************************/ @@ -2600,7 +2616,7 @@ diff -urN libdc1394-2.2.1.orig/dc1394/vendor/avt.c libdc1394-2.2.1/dc1394/vendor { dc1394error_t err; uint32_t value; -@@ -1700,7 +1701,7 @@ +@@ -1700,7 +1701,7 @@ dc1394error_t dc1394_avt_get_hsnr(dc1394 /* Set HSNR */ /************************************************************************/ @@ -2609,9 +2625,10 @@ diff -urN libdc1394-2.2.1.orig/dc1394/vendor/avt.c libdc1394-2.2.1/dc1394/vendor { dc1394error_t err; uint32_t curval; -diff -urN libdc1394-2.2.1.orig/dc1394/vendor/basler.c libdc1394-2.2.1/dc1394/vendor/basler.c ---- libdc1394-2.2.1.orig/dc1394/vendor/basler.c 2011-08-29 09:58:17.276211906 +0200 -+++ libdc1394-2.2.1/dc1394/vendor/basler.c 2011-08-29 10:01:52.569014987 +0200 +Index: libdc1394-2.2.2/dc1394/vendor/basler.c +=================================================================== +--- libdc1394-2.2.2.orig/dc1394/vendor/basler.c ++++ libdc1394-2.2.2/dc1394/vendor/basler.c @@ -30,6 +30,7 @@ #include "../control.h" #include "basler.h" @@ -2629,7 +2646,7 @@ diff -urN libdc1394-2.2.1.orig/dc1394/vendor/basler.c libdc1394-2.2.1/dc1394/ven get_sff_address_from_csr_guid (dc1394camera_t* camera, const dc1394basler_sff_guid_t* feature_guid, uint64_t* address) { dc1394error_t err; -@@ -96,7 +97,7 @@ +@@ -96,7 +97,7 @@ get_sff_address_from_csr_guid (dc1394cam /* * Tests whether the camera supports Basler SFF */ @@ -2638,7 +2655,7 @@ diff -urN libdc1394-2.2.1.orig/dc1394/vendor/basler.c libdc1394-2.2.1/dc1394/ven dc1394_basler_sff_is_available (dc1394camera_t* camera, dc1394bool_t *available) { uint32_t data; -@@ -137,7 +138,7 @@ +@@ -137,7 +138,7 @@ dc1394_basler_sff_is_available (dc1394ca /** * Tests whether the camera supports the specified SFF feature */ @@ -2647,7 +2664,7 @@ diff -urN libdc1394-2.2.1.orig/dc1394/vendor/basler.c libdc1394-2.2.1/dc1394/ven dc1394_basler_sff_feature_is_available (dc1394camera_t* camera, dc1394basler_sff_feature_t feature_id, dc1394bool_t *available) { const sff_feature *feature_desc = NULL; -@@ -177,7 +178,7 @@ +@@ -177,7 +178,7 @@ dc1394_basler_sff_feature_is_available ( /* * enables a specific SFF feature */ @@ -2656,7 +2673,7 @@ diff -urN libdc1394-2.2.1.orig/dc1394/vendor/basler.c libdc1394-2.2.1/dc1394/ven dc1394_basler_sff_feature_enable (dc1394camera_t* camera, dc1394basler_sff_feature_t feature_id, dc1394switch_t on_off) { const sff_feature *feature_desc = NULL; -@@ -246,7 +247,7 @@ +@@ -246,7 +247,7 @@ dc1394_basler_sff_feature_enable (dc1394 /* * check if a feature is enabled or not */ @@ -2665,7 +2682,7 @@ diff -urN libdc1394-2.2.1.orig/dc1394/vendor/basler.c libdc1394-2.2.1/dc1394/ven dc1394_basler_sff_feature_is_enabled (dc1394camera_t* camera, dc1394basler_sff_feature_t feature_id, dc1394bool_t *is_enabled) { const sff_feature *feature_desc = NULL; -@@ -290,7 +291,7 @@ +@@ -290,7 +291,7 @@ dc1394_basler_sff_feature_is_enabled (dc /* * print a feature */ @@ -2674,7 +2691,7 @@ diff -urN libdc1394-2.2.1.orig/dc1394/vendor/basler.c libdc1394-2.2.1/dc1394/ven dc1394_basler_sff_feature_print (dc1394camera_t* camera, dc1394basler_sff_feature_t feature_id, FILE *fd) { dc1394error_t err; -@@ -355,7 +356,7 @@ +@@ -355,7 +356,7 @@ dc1394_basler_sff_feature_print (dc1394c return DC1394_SUCCESS; } @@ -2683,7 +2700,7 @@ diff -urN libdc1394-2.2.1.orig/dc1394/vendor/basler.c libdc1394-2.2.1/dc1394/ven { uint32_t i = DC1394_BASLER_SFF_FEATURE_MIN; while (i < DC1394_BASLER_SFF_FEATURE_MAX) { -@@ -366,7 +367,7 @@ +@@ -366,7 +367,7 @@ dc1394error_t dc1394_basler_sff_feature_ return DC1394_SUCCESS; } @@ -2692,7 +2709,7 @@ diff -urN libdc1394-2.2.1.orig/dc1394/vendor/basler.c libdc1394-2.2.1/dc1394/ven { uint32_t current_crc, desired_crc; -@@ -381,7 +382,7 @@ +@@ -381,7 +382,7 @@ dc1394bool_t dc1394_basler_sff_check_crc /* * Initializes the struct for iterating */ @@ -2701,7 +2718,7 @@ diff -urN libdc1394-2.2.1.orig/dc1394/vendor/basler.c libdc1394-2.2.1/dc1394/ven { if (chunk == NULL || frame_buffer == NULL || frame_size == 0) return DC1394_FAILURE; -@@ -403,7 +404,7 @@ +@@ -403,7 +404,7 @@ dc1394error_t dc1394_basler_sff_chunk_it /** * Iterates over the available SFF chunks in the frame buffer */ @@ -2710,7 +2727,7 @@ diff -urN libdc1394-2.2.1.orig/dc1394/vendor/basler.c libdc1394-2.2.1/dc1394/ven { dc1394basler_sff_chunk_tail_t* tail; const sff_feature* feature_desc; -@@ -446,7 +447,7 @@ +@@ -446,7 +447,7 @@ dc1394error_t dc1394_basler_sff_chunk_it /** * Finds a specific SFF chunk in the frame buffer */ @@ -2719,9 +2736,10 @@ diff -urN libdc1394-2.2.1.orig/dc1394/vendor/basler.c libdc1394-2.2.1/dc1394/ven { dc1394basler_sff_t chunk; dc1394bool_t found = DC1394_FALSE; -diff -urN libdc1394-2.2.1.orig/dc1394/visibility.h libdc1394-2.2.1/dc1394/visibility.h ---- libdc1394-2.2.1.orig/dc1394/visibility.h 1970-01-01 01:00:00.000000000 +0100 -+++ libdc1394-2.2.1/dc1394/visibility.h 2011-08-29 10:01:52.570014987 +0200 +Index: libdc1394-2.2.2/dc1394/visibility.h +=================================================================== +--- /dev/null ++++ libdc1394-2.2.2/dc1394/visibility.h @@ -0,0 +1,31 @@ + +#ifndef __DC1394_VISIBILITY_H__ diff --git a/libdc1394.ac.patch b/libdc1394.ac.patch index e51330e..3c0ab79 100644 --- a/libdc1394.ac.patch +++ b/libdc1394.ac.patch @@ -1,7 +1,9 @@ ---- a/libdc1394-2.2.1/configure.in 2009-11-23 10:11:16.000000000 +0300 -+++ b/libdc1394-2.2.1/configure.in 2009-11-23 10:11:51.000000000 +0300 -@@ -6,12 +6,6 @@ - +Index: libdc1394-2.2.2/configure.ac +=================================================================== +--- libdc1394-2.2.2.orig/configure.ac ++++ libdc1394-2.2.2/configure.ac +@@ -8,12 +8,6 @@ m4_include([ax_check_framework.m4]) + AC_CANONICAL_SYSTEM -case "$host" in @@ -13,7 +15,12 @@ # DX_HTML_FEATURE(OFF) DX_CHM_FEATURE(OFF) -@@ -28,6 +22,7 @@ +@@ -26,11 +20,11 @@ DX_PS_FEATURE(OFF) + # + DX_INIT_DOXYGEN([libdc1394], [Doxyfile.in]) + # +-AM_PROG_AR + AM_INIT_AUTOMAKE([--warnings=all 1.9.6]) AC_CONFIG_HEADERS([config.h]) AC_PROG_CC @@ -21,3 +28,10 @@ AC_PROG_LIBTOOL AM_PROG_CC_C_O +@@ -242,4 +236,4 @@ if test "x$EXAMPLESMSG" = xYes; then + Build V4L examples: ${VIDEXAMPLESMSG}" + fi + dnl extra newline: +-echo "" +\ No newline at end of file ++echo "" diff --git a/libdc1394.changes b/libdc1394.changes index 0bf4742..ec02b00 100644 --- a/libdc1394.changes +++ b/libdc1394.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Mar 7 16:00:17 UTC 2014 - matwey.kornilov@gmail.com + +- Update to 2.2.2 + - several product IDs have been added for Point Grey USB/IIDC cameras + ------------------------------------------------------------------- Tue Jan 29 14:27:01 UTC 2013 - matwey.kornilov@gmail.com diff --git a/libdc1394.no-x11.patch b/libdc1394.no-x11.patch index 06d38a1..c0c7f88 100644 --- a/libdc1394.no-x11.patch +++ b/libdc1394.no-x11.patch @@ -1,7 +1,9 @@ ---- a/libdc1394-2.2.1/configure.in -+++ b/libdc1394-2.2.1/configure.in -@@ -102,21 +102,30 @@ - +Index: libdc1394-2.2.2/configure.ac +=================================================================== +--- libdc1394-2.2.2.orig/configure.ac ++++ libdc1394-2.2.2/configure.ac +@@ -107,21 +107,30 @@ AM_CONDITIONAL(MAKE_EXAMPLES, test x$bui + # check for Xv extensions (necessary for examples/dc1394_multiview) # imported from Coriander +AC_ARG_ENABLE([xv], @@ -44,4 +46,4 @@ + AM_CONDITIONAL(HAVE_XV, test x$xv = xyes) ]) AC_CHECK_XV - + diff --git a/libdc1394.spec b/libdc1394.spec index 906a965..3d4c94b 100644 --- a/libdc1394.spec +++ b/libdc1394.spec @@ -1,7 +1,7 @@ # # spec file for package libdc1394 # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -33,7 +33,7 @@ BuildRequires: pkg-config %if 0%{?suse_version} >= 1210 BuildRequires: libv4l-devel >= 0.8.4 %endif -Version: 2.2.1 +Version: 2.2.2 Release: 0 Summary: 1394-Based Digital Camera Control Library License: LGPL-2.1+ @@ -78,9 +78,9 @@ programs using the dc1394 library. %prep %setup -q -%patch0 -p2 -%patch1 -p2 -%patch2 -p2 +%patch0 -p1 +%patch1 -p1 +%patch2 -p1 %if 0%{?suse_version} >= 1210 %patch3 -p1 %endif