[Wavelet-commit] Wavelet MagickInter.cc, 1.4, 1.5 avilib.c, 1.8, 1.9 configure.in, 1.6, 1.7

[Herbert M. D. <he...@us...>]

Update of /cvsroot/wavelet/Wavelet
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv28789

Modified Files:
	MagickInter.cc avilib.c configure.in 
Log Message:
Ubuntu fixes, repaired check for GraphicsMagick headers.


Index: MagickInter.cc
===================================================================
RCS file: /cvsroot/wavelet/Wavelet/MagickInter.cc,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** MagickInter.cc	16 Oct 2009 11:08:47 -0000	1.4
--- MagickInter.cc	19 Oct 2009 12:37:01 -0000	1.5
***************
*** 425,429 ****
          }
  
!       if ((fd = open (fname, O_CREAT | O_EXCL)) > 0)
          {
            break;
--- 425,429 ----
          }
  
!       if ((fd = open (fname, O_CREAT | O_EXCL, S_IRWXU)) > 0)
          {
            break;

Index: avilib.c
===================================================================
RCS file: /cvsroot/wavelet/Wavelet/avilib.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** avilib.c	15 Aug 2005 16:24:23 -0000	1.8
--- avilib.c	19 Oct 2009 12:37:01 -0000	1.9
***************
*** 2445,2449 ****
  
      // read header
!     fgets(data, 100, fd);
  
      if ( strncasecmp(data, "AVIIDX1", 7) != 0) {
--- 2445,2449 ----
  
      // read header
!     (void)fgets(data, 100, fd);
  
      if ( strncasecmp(data, "AVIIDX1", 7) != 0) {
***************
*** 2453,2457 ****
  
      // read comment
!     fgets(data, 100, fd);
      f_pos = ftell(fd);
      while (fgets(data, 100, fd)) {
--- 2453,2457 ----
  
      // read comment
!     (void)fgets(data, 100, fd);
      f_pos = ftell(fd);
      while (fgets(data, 100, fd)) {
***************
*** 3604,3608 ****
        if ( (ret = avi_read(AVI->fdes,audbuf+nr,todo)) != todo)
        {
! 	 fprintf(stderr, "XXX pos = %lld, ret = %lld, todo = %ld\n", pos, ret, todo);
           AVI_errno = AVI_ERR_READ;
           return -1;
--- 3604,3608 ----
        if ( (ret = avi_read(AVI->fdes,audbuf+nr,todo)) != todo)
        {
! 	 fprintf(stderr, "XXX pos = %lld, ret = %lld, todo = %ld\n", (long long)pos, (long long)ret, todo);
           AVI_errno = AVI_ERR_READ;
           return -1;

Index: configure.in
===================================================================
RCS file: /cvsroot/wavelet/Wavelet/configure.in,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** configure.in	16 Oct 2009 11:08:48 -0000	1.6
--- configure.in	19 Oct 2009 12:37:01 -0000	1.7
***************
*** 124,127 ****
--- 124,130 ----
  
  AC_LANG_PUSH(C++)
+ CPPFLAGS_ORG=$CPPFLAGS
+ CPPFLAGS="-I/usr/include/GraphicsMagick $CPPFLAGS"
+ export CPPFLAGS
  AC_CHECK_HEADER(GraphicsMagick/Magick++.h,
      MAGICK_INTER_DEF="-I/usr/include/GraphicsMagick -DMAGICK_INTER"
***************
*** 130,133 ****
--- 133,138 ----
      MAGICK_INTER_LIB=""
  )
+ CPPFLAGS=$CPPFLAGS_ORG
+ unset CPPFLAGS
  if test -z "$MAGICK_INTER_DEF"; then
  AC_CHECK_HEADER(Magick++.h,