[UFRaw-CVS] ufraw Makefile.am, 1.33, 1.34 configure.ac, 1.64, 1.65 ufraw-gimp.c, 1.30, 1.31

[Niels K. B. J. <nk...@us...>]

Update of /cvsroot/ufraw/ufraw
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv1340

Modified Files:
	Makefile.am configure.ac ufraw-gimp.c 
Log Message:
Rename the CinePaint plug-in to be consistent with the GIMP plug-in. Fix call to gimp_layer_new().

Index: configure.ac
===================================================================
RCS file: /cvsroot/ufraw/ufraw/configure.ac,v
retrieving revision 1.64
retrieving revision 1.65
diff -C2 -d -r1.64 -r1.65
*** configure.ac	18 Mar 2007 12:56:07 -0000	1.64
--- configure.ac	22 Mar 2007 15:08:30 -0000	1.65
***************
*** 87,91 ****
      CINEPAINT_LIBDIR=`$pkg_prefix --variable=cinepaintlibdir cinepaint-gtk` ],
    [ have_cinepaint=no
!     CINEPAINT_LIBIR=
      AC_MSG_RESULT($CINEPAINT_PKG_ERRORS) ] )
  AM_CONDITIONAL(MAKE_CINEPAINT, test $have_cinepaint = yes)
--- 87,91 ----
      CINEPAINT_LIBDIR=`$pkg_prefix --variable=cinepaintlibdir cinepaint-gtk` ],
    [ have_cinepaint=no
!     CINEPAINT_LIBDIR=
      AC_MSG_RESULT($CINEPAINT_PKG_ERRORS) ] )
  AM_CONDITIONAL(MAKE_CINEPAINT, test $have_cinepaint = yes)

Index: Makefile.am
===================================================================
RCS file: /cvsroot/ufraw/ufraw/Makefile.am,v
retrieving revision 1.33
retrieving revision 1.34
diff -C2 -d -r1.33 -r1.34
*** Makefile.am	18 Mar 2007 12:56:05 -0000	1.33
--- Makefile.am	22 Mar 2007 15:08:29 -0000	1.34
***************
*** 15,19 ****
  
  if MAKE_CINEPAINT
!   cinepaintbin_PROGRAMS = cinepaint-ufraw
    cinepaintbindir = $(CINEPAINT_LIBDIR)/plug-ins
  endif
--- 15,19 ----
  
  if MAKE_CINEPAINT
!   cinepaintbin_PROGRAMS = ufraw-cinepaint
    cinepaintbindir = $(CINEPAINT_LIBDIR)/plug-ins
  endif
***************
*** 75,82 ****
  
  if MAKE_CINEPAINT
!   cinepaint_ufraw_SOURCES = ufraw-gimp.c
!   cinepaint_ufraw_CPPFLAGS = $(AM_CPPFLAGS) $(CINEPAINT_CFLAGS) \
  				-DUFRAW_CINEPAINT
!   cinepaint_ufraw_LDADD = $(LDADD) $(CINEPAINT_LIBS) $(GTK_LIBS)
  endif
  
--- 75,82 ----
  
  if MAKE_CINEPAINT
!   ufraw_cinepaint_SOURCES = ufraw-gimp.c
!   ufraw_cinepaint_CPPFLAGS = $(AM_CPPFLAGS) $(CINEPAINT_CFLAGS) \
  				-DUFRAW_CINEPAINT
!   ufraw_cinepaint_LDADD = $(LDADD) $(CINEPAINT_LIBS) $(GTK_LIBS)
  endif
  

Index: ufraw-gimp.c
===================================================================
RCS file: /cvsroot/ufraw/ufraw/ufraw-gimp.c,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -d -r1.30 -r1.31
*** ufraw-gimp.c	19 Mar 2007 20:00:25 -0000	1.30
--- ufraw-gimp.c	22 Mar 2007 15:08:30 -0000	1.31
***************
*** 313,319 ****
  
      /* Create the "background" layer to hold the image... */
!     layer = gimp_layer_new(uf->gimpImage, "Background", width,
  	    height, depth==3 ? GIMP_RGB_IMAGE : U16_RGB_IMAGE,
! 	    100, GIMP_NORMAL_MODE);
      gimp_image_add_layer(uf->gimpImage, layer, 0);
  
--- 313,319 ----
  
      /* Create the "background" layer to hold the image... */
!     layer = gimp_layer_new(uf->gimpImage, _("Background"), width,
  	    height, depth==3 ? GIMP_RGB_IMAGE : U16_RGB_IMAGE,
! 	    100.0, GIMP_NORMAL_MODE);
      gimp_image_add_layer(uf->gimpImage, layer, 0);