* [plugs]: cinepaint-0.25-oy_api_0_5.patch

We have as well some lesser debugging output.
archont00 · Jun 12, 2012 · e9020dd · e9020dd
1 parent cb3af9a
commit e9020dd
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 9 deletions.
diff --git a/app/gdisplay_cmds.c b/app/gdisplay_cmds.c
@@ -207,7 +207,7 @@ gdisplay_active_invoker (Argument *args)
 
   success = ((gdisp = gdisplay_active ()) != NULL);
 
-# ifdef DEBUG
+# ifdef DEBUG_
   printf("%s:%d %s() disp %d success %d\n", __FILE__,__LINE__,__func__,(intptr_t)gdisp, success);
   if(gdisp)
     printf("%s:%d %s() disp->ID %d\n", __FILE__,__LINE__,__func__,gdisp->ID);

diff --git a/cinepaint-gtk.pc b/cinepaint-gtk.pc
@@ -11,6 +11,6 @@ datadir=${datarootdir}
 Name: cinepaint-gtk
 Description: Cinepaint Plug-In Library Using GTK+
 Version: 0.25
-Libs: -L${libdir} -lcinepaint -lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0 -lgio-2.0 -lpangoft2-1.0 -lgdk_pixbuf-2.0 -lpangocairo-1.0 -lcairo -lpango-1.0 -lfreetype -lfontconfig -lgobject-2.0 -lgmodule-2.0 -lglib-2.0  
-Cflags: -I${includedir} -I/usr/include/gtk-2.0 -I/usr/lib64/gtk-2.0/include -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/glib-2.0 -I/usr/lib64/glib-2.0/include -I/usr/include/pixman-1 -I/usr/include/freetype2 -I/usr/include/libpng12  
+Libs: -L${libdir} -lcinepaint -pthread -lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0 -lgio-2.0 -lpangoft2-1.0 -lpangocairo-1.0 -lgdk_pixbuf-2.0 -lm -lcairo -lpng14 -lpango-1.0 -lfreetype -lfontconfig -lgobject-2.0 -lgmodule-2.0 -lgthread-2.0 -lrt -lglib-2.0  
+Cflags: -I${includedir} -pthread -I/usr/include/gtk-2.0 -I/usr/lib64/gtk-2.0/include -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/pango-1.0 -I/usr/include/glib-2.0 -I/usr/lib64/glib-2.0/include -I/usr/include/pixman-1 -I/usr/include/freetype2 -I/usr/include/libpng14  
 
diff --git a/cinepaint.spec b/cinepaint.spec
@@ -101,7 +101,7 @@ rm -rf %{buildroot}
 %{_datadir}/%{name}/%{version}.%{release}/palettes/
 %{_datadir}/%{name}/%{version}.%{release}/patterns/
 %{_datadir}/%{name}/%{version}.%{release}/scripts/
-%{_prefix}/%{_lib}/python2.6/site-packages
+%{_prefix}/%{_lib}/python2.7/site-packages
 
 %files devel
 %defattr(-, root, root)

diff --git a/lib/display.c b/lib/display.c
@@ -85,15 +85,15 @@ gimp_display_active ()
   return_vals = gimp_run_procedure ("gimp_display_active",
                                     &nreturn_vals,
                                     PARAM_END);
-#ifdef DEBUG
+#ifdef DEBUG_
   printf("%s:%d %s() %d  0x%x|%d\n",__FILE__,__LINE__,__func__,
         display_ID, return_vals[1].data.d_display, return_vals[1].data.d_int32);
 #endif
   display_ID = -1;
   if (return_vals[0].data.d_status == STATUS_SUCCESS)
     display_ID = return_vals[1].data.d_display;
 
-#ifdef DEBUG
+#ifdef DEBUG_
   printf("%s:%d %s() %d:%d ID:%d  0x%x|%d\n",__FILE__,__LINE__,__func__,
          return_vals[0].data.d_status, STATUS_SUCCESS, display_ID,
          return_vals[1].data.d_display, return_vals[1].data.d_int32);

diff --git a/plug-ins/lraw/lraw.c b/plug-ins/lraw/lraw.c
@@ -62,7 +62,7 @@ oyConversion_s * oyConversion_FromImageFileName  (
   /* add a file name argument */
   /* get the options of the input node */
   if(in)
-  options = oyFilterNode_OptionsGet( in, OY_SELECT_FILTER );
+  options = oyFilterNode_GetOptions( in, OY_SELECT_FILTER );
   /* add a new option with the appropriate value */
   error = oyOptions_SetFromText( &options, "//" OY_TYPE_STD "/file_read/filename",
                                  file_name, OY_CREATE_NEW );
@@ -258,7 +258,7 @@ static gint32 load_image (gchar *filename)
 
   w = oy_image->width;
   h = oy_image->height;
-  if(oyToDataType_m(oyImage_PixelLayoutGet(oy_image)) == oyUINT16)
+  if(oyToDataType_m(oyImage_GetPixelLayout(oy_image)) == oyUINT16)
   {
     image_type = U16_RGB;
     layer_type = U16_RGB_IMAGE;
@@ -302,7 +302,7 @@ static gint32 load_image (gchar *filename)
   }
 
   gimp_progress_update( .9 );
-  p = oyImage_ProfileGet( oy_image );
+  p = oyImage_GetProfile( oy_image );
   /* fallback */
   if(!p)
     p = oyProfile_FromStd( oyASSUMED_RGB, 0 );